commit 392c08b84d8bbf658a946a5d2e1fe4146f9597ce
Author: Jakub Bogusz <[email protected]>
Date: Mon Jun 8 18:42:06 2015 +0200
- updated to 0.13.1
- updated link patch
hiredis.spec | 28 +++++++++++++++-------------
link.patch | 24 ++++++++++++------------
2 files changed, 27 insertions(+), 25 deletions(-)
---
diff --git a/hiredis.spec b/hiredis.spec
index 32e54d3..37d53c9 100644
--- a/hiredis.spec
+++ b/hiredis.spec
@@ -1,12 +1,12 @@
Summary: A minimalistic C client library for Redis
Summary(pl.UTF-8): Minimalistyczna biblioteka C klienta Redisa
Name: hiredis
-Version: 0.11.0
-Release: 2
+Version: 0.13.1
+Release: 1
License: BSD
Group: Libraries
-Source0:
https://github.com/redis/hiredis/tarball/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: a78e34702c6e34cc44126b178ed82225
+Source0:
https://github.com/redis/hiredis/archive/v%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: 4226dda52dbe08304e3b6027b4d6c74d
Patch0: link.patch
URL: https://github.com/redis/hiredis/
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -44,26 +44,28 @@ Static hiredis library.
Statyczna biblioteka hiredis.
%prep
-%setup -qc
-mv *-%{name}-*/* .
+%setup -q
%patch0 -p1
%build
%{__make} \
CC="%{__cc}" \
DEBUG="" \
- LDFLAGS="-L. %{rpmldflags}" \
- OPTIMIZATION="%{rpmcflags} %{rpmcppflags}"
+ LDFLAGS="%{rpmldflags}" \
+ OPTIMIZATION="%{rpmcflags} %{rpmcppflags}" \
+ PREFIX=%{_prefix} \
+ LIBRARY_PATH=%{_lib}
%install
rm -rf $RPM_BUILD_ROOT
%{__make} install \
INSTALL="cp -a" \
- PREFIX=$RPM_BUILD_ROOT%{_prefix} \
- INSTALL_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}
+ DESTDIR=$RPM_BUILD_ROOT \
+ PREFIX=%{_prefix} \
+ LIBRARY_PATH=%{_lib}
install -d $RPM_BUILD_ROOT%{_bindir}
-install -p hiredis-example hiredis-test $RPM_BUILD_ROOT%{_bindir}
+install -p hiredis-test $RPM_BUILD_ROOT%{_bindir}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -74,7 +76,6 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
%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.*.*
%attr(755,root,root) %ghost %{_libdir}/libhiredis.so.0
@@ -82,7 +83,8 @@ rm -rf $RPM_BUILD_ROOT
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libhiredis.so
-%{_includedir}/%{name}
+%{_includedir}/hiredis
+%{_pkgconfigdir}/hiredis.pc
%files static
%defattr(644,root,root,755)
diff --git a/link.patch b/link.patch
index dd6effe..f25be31 100644
--- a/link.patch
+++ b/link.patch
@@ -1,6 +1,6 @@
---- 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
-@@ -23,7 +23,7 @@
+--- hiredis-0.13.1/Makefile.orig 2015-05-03 22:58:11.000000000 +0200
++++ hiredis-0.13.1/Makefile 2015-06-08 18:05:58.081044826 +0200
+@@ -47,7 +47,7 @@
DYLIB_MINOR_NAME=$(LIBNAME).$(DYLIBSUFFIX).$(HIREDIS_MAJOR).$(HIREDIS_MINOR)
DYLIB_MAJOR_NAME=$(LIBNAME).$(DYLIBSUFFIX).$(HIREDIS_MAJOR)
DYLIBNAME=$(LIBNAME).$(DYLIBSUFFIX)
@@ -9,23 +9,23 @@
STLIBNAME=$(LIBNAME).$(STLIBSUFFIX)
STLIB_MAKE_CMD=ar rcs $(STLIBNAME)
-@@ -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
+@@ -120,8 +120,8 @@
+
+ hiredis-test: test.o $(STLIBNAME)
-hiredis-%: %.o $(STLIBNAME)
-- $(CC) -o $@ $(REAL_LDFLAGS) $< $(STLIBNAME)
+- $(CC) $(REAL_CFLAGS) -o $@ $(REAL_LDFLAGS) $< $(STLIBNAME)
+hiredis-%: %.o $(DYLIBNAME)
-+ $(CC) -o $@ $(REAL_LDFLAGS) $< -l$(subst lib,,$(LIBNAME))
++ $(CC) $(REAL_CFLAGS) -o $@ $(REAL_LDFLAGS) $< -L. -l$(subst
lib,,$(LIBNAME))
test: hiredis-test
./hiredis-test
-@@ -121,7 +121,7 @@
- $(INSTALL) hiredis.h async.h adapters $(INSTALL_INCLUDE_PATH)
+@@ -165,7 +165,7 @@
+ $(INSTALL) hiredis.h async.h read.h sds.h adapters
$(INSTALL_INCLUDE_PATH)
$(INSTALL) $(DYLIBNAME) $(INSTALL_LIBRARY_PATH)/$(DYLIB_MINOR_NAME)
cd $(INSTALL_LIBRARY_PATH) && ln -sf $(DYLIB_MINOR_NAME)
$(DYLIB_MAJOR_NAME)
- cd $(INSTALL_LIBRARY_PATH) && ln -sf $(DYLIB_MAJOR_NAME) $(DYLIBNAME)
+ cd $(INSTALL_LIBRARY_PATH) && ln -sf $(DYLIB_MINOR_NAME) $(DYLIBNAME)
$(INSTALL) $(STLIBNAME) $(INSTALL_LIBRARY_PATH)
-
- 32bit:
+ mkdir -p $(INSTALL_PKGCONF_PATH)
+ $(INSTALL) $(PKGCONFNAME) $(INSTALL_PKGCONF_PATH)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/hiredis.git/commitdiff/392c08b84d8bbf658a946a5d2e1fe4146f9597ce
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
