- new URLs, updated to 0.11.0

- updated link patch, package also static library

diff --git a/hiredis.spec b/hiredis.spec
index e73174f3d0d3528382750cb690a50ebddd7a6af5..f97fe5d30da1677690669fb1b61c578a1f21fb50 100644 (file)
--- a/hiredis.spec
+++ b/hiredis.spec
@@ -1,26 +1,47 @@
 Summary:       A minimalistic C client library for Redis
+Summary(pl.UTF-8):     Minimalistyczna biblioteka C klienta Redisa
 Name:          hiredis
-Version:       0.10.0
+Version:       0.11.0
 Release:       1
 License:       BSD
 Group:         Libraries
-URL:           https://github.com/antirez/hiredis
-Source0:       https://github.com/antirez/hiredis/tarball/v%{version}/%{name}-%{version}.tgz
-# Source0-md5: 66edb31cdc39c94978ddf98538259d72
+Source0:       https://github.com/redis/hiredis/tarball/v%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: a78e34702c6e34cc44126b178ed82225
 Patch0:                link.patch
+URL:           https://github.com/redis/hiredis/
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 Hiredis is a minimalistic C client library for the Redis database.
 
+%description -l pl.UTF-8
+Hiredis to minimalistyczna biblioteka C klienta bazy danych Redis.
+
 %package devel
-Summary:       Header files and libraries for hiredis C development
+Summary:       Header files for hiredis C development
+Summary(pl.UTF-8):     Pliki nagłówkowe do programowania w C z użyciem hiredisa
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 
 %description devel
-The %{name}-devel package contains the header files and libraries to
-develop applications using a Redis database.
+This package contains the header files to develop applications using a
+Redis database.
+
+%description devel -l pl.UTF-8
+Ten pakiet zawiera pliki nagłówkowe do tworzenia aplikacji
+wykorzystujących bazę danych Redis.
+
+%package static
+Summary:       Static hiredis library
+Summary(pl.UTF-8):     Statyczna biblioteka hiredis
+Group:         Development/Libraries
+Requires:      %{name}-devel = %{version}-%{release}
+
+%description static
+Static hiredis library.
+
+%description static -l pl.UTF-8
+Statyczna biblioteka hiredis.
 
 %prep
 %setup -qc
@@ -32,7 +53,7 @@ mv *-%{name}-*/* .
        CC="%{__cc}" \
        DEBUG="" \
        LDFLAGS="-L. %{rpmldflags}" \
-       OPTIMIZATION="%{rpmcflags}"
+       OPTIMIZATION="%{rpmcflags} %{rpmcppflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -44,8 +65,6 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_bindir}
 install -p hiredis-example hiredis-test $RPM_BUILD_ROOT%{_bindir}
 
-find $RPM_BUILD_ROOT -name *.a | xargs rm -v
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -54,14 +73,17 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc COPYING TODO
+%doc CHANGELOG.md COPYING README.md
 %attr(755,root,root) %{_bindir}/hiredis-example
 %attr(755,root,root) %{_bindir}/hiredis-test
-%attr(755,root,root) %{_libdir}/libhiredis.so.*.*.*
-%ghost %{_libdir}/libhiredis.so.0
+%attr(755,root,root) %{_libdir}/libhiredis.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libhiredis.so.0
 
 %files devel
 %defattr(644,root,root,755)
-%doc README.md
+%attr(755,root,root) %{_libdir}/libhiredis.so
 %{_includedir}/%{name}
-%{_libdir}/libhiredis.so
+
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libhiredis.a

diff --git a/link.patch b/link.patch
index 62a1a15a2b673a4684c4568505d306e7b57f5e3d..8ae7bd56102ad0fd321ef2a6b9a5eff1aa5017eb 100644 (file)
--- a/link.patch
+++ b/link.patch
@@ -1,36 +1,13 @@
---- hiredis-0.10.0/Makefile    2011-12-20 16:34:25.025574337 +0200
-+++ hiredis-0.10.0/Makefile    2011-12-20 16:38:47.294352952 +0200
-@@ -37,7 +37,9 @@
-   DYLIBSUFFIX=so
-   STLIBSUFFIX=a
-   DYLIBNAME?=$(LIBNAME).$(DYLIBSUFFIX)
--  DYLIB_MAKE_CMD?=gcc -shared -Wl,-soname,$(DYLIBNAME) -o $(DYLIBNAME)
-+  DYLIBSONAME?=$(DYLIBNAME).0
-+  LINKLIBNAME?=$(subst lib,,$(LIBNAME))
-+  DYLIB_MAKE_CMD?=$(CC) -shared -Wl,-soname,$(DYLIBSONAME) -o $(DYLIBNAME)
-   STLIBNAME?=$(LIBNAME).$(STLIBSUFFIX)
-   STLIB_MAKE_CMD?=ar rcs $(STLIBNAME)
- endif
-@@ -88,8 +90,8 @@
-       $(CC) -o $@ $(CCOPT) $(DEBUG) -I$(AE_DIR) $(LDFLAGS) $(STLIBNAME) example-ae.c $(AE_DIR)/ae.o $(AE_DIR)/zmalloc.o
+--- hiredis-0.11.0/Makefile.orig       2013-12-12 17:28:25.817204756 +0100
++++ hiredis-0.11.0/Makefile    2013-12-12 17:33:18.150525821 +0100
+@@ -76,8 +76,8 @@
+       $(CC) -o $@ $(REAL_CFLAGS) $(REAL_LDFLAGS) -I$(AE_DIR) $(AE_DIR)/ae.o $(AE_DIR)/zmalloc.o example-ae.c $(STLIBNAME)
  endif
  
 -hiredis-%: %.o $(STLIBNAME)
--      $(CC) -o $@ $(CCOPT) $(DEBUG) $(LDFLAGS) $(STLIBNAME) $<
+-      $(CC) -o $@ $(REAL_LDFLAGS) $< $(STLIBNAME)
 +hiredis-%: %.o $(DYLIBNAME)
-+      $(CC) -o $@ $(CCOPT) $(DEBUG) -l$(LINKLIBNAME) $(LDFLAGS) $<
++      $(CC) -o $@ $(REAL_LDFLAGS) $< -l$(subst lib,,$(LIBNAME))
  
  test: hiredis-test
        ./hiredis-test
-@@ -106,7 +108,10 @@
- install: $(DYLIBNAME) $(STLIBNAME)
-       mkdir -p $(INSTALL_INCLUDE_PATH) $(INSTALL_LIBRARY_PATH)
-       $(INSTALL) hiredis.h async.h adapters $(INSTALL_INCLUDE_PATH)
--      $(INSTALL) $(DYLIBNAME) $(STLIBNAME) $(INSTALL_LIBRARY_PATH)
-+      $(INSTALL) $(STLIBNAME) $(INSTALL_LIBRARY_PATH)
-+      $(INSTALL) $(DYLIBNAME) $(INSTALL_LIBRARY_PATH)/$(DYLIBNAME).0.0.0
-+      ln -s $(DYLIBNAME).0.0.0 $(INSTALL_LIBRARY_PATH)/$(DYLIBNAME).0
-+      ln -s $(DYLIBNAME).0.0.0 $(INSTALL_LIBRARY_PATH)/$(DYLIBNAME)
- 
- 32bit:
-       @echo ""