From 57c5b9799351bc70a451857e1468b4911e4c6a3d Mon Sep 17 00:00:00 2001
From: Rob Sanders <rsanders@forcepoint.com>
Date: Wed, 19 Sep 2018 12:20:29 -0400
Subject: [PATCH 1/4] Fix symlinks in RPM to be relative symlinks, not absolute

---
 libcli.spec | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libcli.spec b/libcli.spec
index 1db9b9d..f2b1506 100644
--- a/libcli.spec
+++ b/libcli.spec
@@ -42,8 +42,10 @@ install -p -m 644 libcli*.h %{buildroot}%{_includedir}/
 install -d -p %{buildroot}%{_libdir}
 install -p -m 755 libcli.so.%{version} %{buildroot}%{_libdir}/
 install -p -m 755 libcli.a %{buildroot}%{_libdir}/
-ln -s %{_libdir}/libcli.so.%{version} %{buildroot}%{_libdir}/libcli.so.%{verMajMin}
-ln -s %{_libdir}/libcli.so.%{verMajMin} %{buildroot}%{_libdir}/libcli.so
+
+cd %{buildroot}%{_libdir}
+ln -s libcli.so.%{version} libcli.so.%{verMajMin}
+ln -s libcli.so.%{verMajMin} libcli.so
 
 %post -p /sbin/ldconfig
 

From fa8c25cb25783126009eaeaf5fec3785d369a16a Mon Sep 17 00:00:00 2001
From: Rob Sanders <rsanders@forcepoint.com>
Date: Wed, 19 Sep 2018 12:31:31 -0400
Subject: [PATCH 2/4] Update changelog, tweak clean target in makefile

---
 Makefile    | 2 +-
 libcli.spec | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index b082edf..ff4e6e2 100644
--- a/Makefile
+++ b/Makefile
@@ -61,7 +61,7 @@ clitest.exe: clitest.c libcli.o
 	$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $< libcli.o -lws2_32
 
 clean:
-	rm -f *.o $(LIB)* $(LIB_STATIC) clitest libcli-$(MAJOR).$(MINOR).$(REVISION).tar.gz
+	rm -f *.o $(LIB)* $(LIB_STATIC) clitest libcli-$(MAJOR).$(MINOR).$(REVISION).tar.gz libcli-$(MAJOR).$(MINOR).$(REVISION)
 
 install: $(TARGET_LIBS)
 	install -d $(DESTDIR)$(PREFIX)/include $(DESTDIR)$(PREFIX)/lib
diff --git a/libcli.spec b/libcli.spec
index f2b1506..8eec3bf 100644
--- a/libcli.spec
+++ b/libcli.spec
@@ -67,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-, root, root)
 
 %changelog
+* Wed Sep 19 2018 Rob Sanders <rsanders@forcepoint.com> 1.9.8-4
+- Update spac file to use relative links for libcli.so symlinks 
+- Tweak clean target in Makefile
 * Tue Sep 18 2018 Rob Sanders <rsanders@forcepoint.com> 1.9.8-3
 - Update spec file similar to EPEL's for regular and devel pacakges
 - Update Makefile rpm target to build both regular and devel pacakges

From a50ffee339ae87e163ea616e1d64c705cf318ead Mon Sep 17 00:00:00 2001
From: Rob Sanders <rsanders@forcepoint.com>
Date: Wed, 19 Sep 2018 13:13:05 -0400
Subject: [PATCH 3/4] Revert makefile change, fix changelog

---
 Makefile    | 2 +-
 libcli.spec | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index ff4e6e2..b082edf 100644
--- a/Makefile
+++ b/Makefile
@@ -61,7 +61,7 @@ clitest.exe: clitest.c libcli.o
 	$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $< libcli.o -lws2_32
 
 clean:
-	rm -f *.o $(LIB)* $(LIB_STATIC) clitest libcli-$(MAJOR).$(MINOR).$(REVISION).tar.gz libcli-$(MAJOR).$(MINOR).$(REVISION)
+	rm -f *.o $(LIB)* $(LIB_STATIC) clitest libcli-$(MAJOR).$(MINOR).$(REVISION).tar.gz
 
 install: $(TARGET_LIBS)
 	install -d $(DESTDIR)$(PREFIX)/include $(DESTDIR)$(PREFIX)/lib
diff --git a/libcli.spec b/libcli.spec
index 8eec3bf..53780c6 100644
--- a/libcli.spec
+++ b/libcli.spec
@@ -69,7 +69,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Wed Sep 19 2018 Rob Sanders <rsanders@forcepoint.com> 1.9.8-4
 - Update spac file to use relative links for libcli.so symlinks 
-- Tweak clean target in Makefile
+
 * Tue Sep 18 2018 Rob Sanders <rsanders@forcepoint.com> 1.9.8-3
 - Update spec file similar to EPEL's for regular and devel pacakges
 - Update Makefile rpm target to build both regular and devel pacakges

From 3a9255058d278a85b6a04a81cce9db95ffc7ab4c Mon Sep 17 00:00:00 2001
From: Rob Sanders <rsanders@forcepoint.com>
Date: Wed, 19 Sep 2018 14:08:05 -0400
Subject: [PATCH 4/4] Fix 'release' number to match changelog

---
 libcli.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libcli.spec b/libcli.spec
index 53780c6..fd3daa5 100644
--- a/libcli.spec
+++ b/libcli.spec
@@ -1,7 +1,7 @@
 Version: 1.9.8
 Summary: Cisco-like telnet command-line library
 Name: libcli
-Release: 1
+Release: 4
 License: LGPL
 Group: Library/Communication
 Source: %{name}-%{version}.tar.gz