up to 1.1.0

diff --git a/hiredis.spec b/hiredis.spec
index 4514b070e0336e5ed746553a0c7eb00834fa3800..af1a7196438ad0e258255584ead29742236e6ec3 100644 (file)
--- a/hiredis.spec
+++ b/hiredis.spec
@@ -5,13 +5,13 @@
 Summary:       A minimalistic C client library for Redis
 Summary(pl.UTF-8):     Minimalistyczna biblioteka C klienta Redisa
 Name:          hiredis
-Version:       1.0.2
+Version:       1.1.0
 Release:       1
 License:       BSD
 Group:         Libraries
 #Source0Download: https://github.com/redis/hiredis/releases
 Source0:       https://github.com/redis/hiredis/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 58e8313188f66ed1be1c220d14a7752e
+# Source0-md5: 699faede056b6d5aea1c3f41f832e172
 Patch0:                link.patch
 URL:           https://github.com/redis/hiredis/
 %{?with_ssl:BuildRequires:     openssl-devel}
@@ -138,7 +138,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc CHANGELOG.md COPYING README.md
-%attr(755,root,root) %{_libdir}/libhiredis.so.1.0.0
+%attr(755,root,root) %{_libdir}/libhiredis.so.1.1.0
 
 %files devel
 %defattr(644,root,root,755)
@@ -150,6 +150,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/hiredis/hiredis.h
 %{_includedir}/hiredis/read.h
 %{_includedir}/hiredis/sds.h
+%{_includedir}/hiredis/sockcompat.h
 %{_pkgconfigdir}/hiredis.pc
 
 %files static
@@ -159,7 +160,7 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with ssl}
 %files ssl
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libhiredis_ssl.so.1.0.0
+%attr(755,root,root) %{_libdir}/libhiredis_ssl.so.1.1.0
 
 %files ssl-devel
 %defattr(644,root,root,755)

diff --git a/link.patch b/link.patch
index 2c76ac31e23743c9e93857f1ac8b2ec9d263cb24..cb5e3e533f3e8e883507dc7c513faf26e5bf41ea 100644 (file)
--- a/link.patch
+++ b/link.patch
@@ -1,23 +1,20 @@
 --- hiredis-1.0.0/Makefile.orig        2020-08-03 20:18:07.000000000 +0200
 +++ hiredis-1.0.0/Makefile     2020-09-05 09:50:31.097913070 +0200
 @@ -127,7 +127,7 @@
-       $(STLIB_MAKE_CMD) $(STLIBNAME) $(OBJ)
  
+ #################### SSL building rules start ####################
  $(SSL_DYLIBNAME): $(SSL_OBJ)
 -      $(SSL_DYLIB_MAKE_CMD) $(DYLIB_PLUGIN) -o $(SSL_DYLIBNAME) $(SSL_OBJ) $(REAL_LDFLAGS) $(LDFLAGS) $(SSL_LDFLAGS)
 +      $(SSL_DYLIB_MAKE_CMD) $(DYLIB_PLUGIN) -o $(SSL_DYLIBNAME) $(SSL_OBJ) $(DYLIBNAME) $(REAL_LDFLAGS) $(LDFLAGS) $(SSL_LDFLAGS)
  
  $(SSL_STLIBNAME): $(SSL_OBJ)
        $(STLIB_MAKE_CMD) $(SSL_STLIBNAME) $(SSL_OBJ)
-@@ -201,9 +201,9 @@
+@@ -201,7 +201,7 @@
  
  examples: $(EXAMPLES)
  
--TEST_LIBS = $(STLIBNAME)
-+TEST_LIBS = $(DYLIBNAME)
+-TEST_LIBS = $(STLIBNAME) $(SSL_STLIB)
++TEST_LIBS = $(DYLIBNAME) $(SSL_DYLIB)
+ TEST_LDFLAGS = $(SSL_LDFLAGS)
  ifeq ($(USE_SSL),1)
--    TEST_LIBS += $(SSL_STLIBNAME)
-+    TEST_LIBS += $(SSL_DYLIBNAME)
-     TEST_LDFLAGS = $(SSL_LDFLAGS) -lssl -lcrypto -lpthread
- endif
- 
+   TEST_LDFLAGS += -pthread