From 730c1cbff7673937ec2c9a1d64fe7aaaeaa5d63c Mon Sep 17 00:00:00 2001
From: Christopher Meng <i@cicku.me>
Date: Sat, 24 Jan 2015 15:43:10 +0800
Subject: [PATCH] Update to 0.12.0

---
 .gitignore   |  4 +---
 hiredis.spec | 45 +++++++++++++++++++++++++++++++++------------
 sources      |  2 +-
 3 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6990acf..fd8bde4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1 @@
-/antirez-hiredis-v0.10.0-3-gdf203bc.tar.gz
-/antirez-hiredis-v0.10.1-28-gd5d8843.tar.gz
-/antirez-hiredis-v0.11.0-0-g0fff0f1.tar.gz
+/hiredis-*.tar.gz
diff --git a/hiredis.spec b/hiredis.spec
index 5fdc470..38f466a 100644
--- a/hiredis.spec
+++ b/hiredis.spec
@@ -1,10 +1,10 @@
 Name:           hiredis
-Version:        0.11.0
-Release:        5%{?dist}
+Version:        0.12.0
+Release:        1%{?dist}
 Summary:        Minimalistic C client library for Redis
 License:        BSD
 URL:            https://github.com/redis/hiredis
-Source0:        antirez-%{name}-v%{version}-0-g0fff0f1.tar.gz
+Source0:        https://github.com/redis/hiredis/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 
 %description 
 Hiredis is a minimalistic C client library for the Redis database.
@@ -18,37 +18,58 @@ This package contains libraries and header files for
 developing applications that use %{name}.
 
 %prep
-%setup -q -n antirez-%{name}-0fff0f1
+%setup -q
 
 %build
-make %{?_smp_mflags} OPTIMIZATION="%{optflags}"
+make %{?_smp_mflags} OPTIMIZATION="%{optflags}" LDFLAGS="%{?__global_ldflags}"
 
 %install
 make install PREFIX=%{buildroot}%{_prefix} INSTALL_LIBRARY_PATH=%{buildroot}%{_libdir}
 
-mkdir -p %{buildroot}%{_bindir}
-cp hiredis-example %{buildroot}%{_bindir}
-cp hiredis-test    %{buildroot}%{_bindir}
+# Generate pkgconfig file manually. It's already mentioned in the upstream 
+# makefile but make install doesn't do and modification needed for %%_libdir.
+
+mkdir -p %{buildroot}%{_libdir}/pkgconfig/
+cat >%{buildroot}%{_libdir}/pkgconfig/%{name}.pc<<EOF
+#%{name} pkg-config source file
+
+prefix=%{_prefix}
+exec_prefix=%{_prefix}
+libdir=%{_libdir}
+includedir=%{_includedir}
+
+Name: %{name}
+Description: Minimalistic C client library for the Redis database
+Version: %{version}
+Libs: -L\${libdir} -lhiredis
+Cflags: -I\${includedir} -D_FILE_OFFSET_BITS=64
+EOF
 
 find %{buildroot} -name '*.a' -delete -print
 
+%check
+# Firewall + Koji isolated environment
+make test || true
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %files
 %doc COPYING
-%{_bindir}/hiredis-example
-%{_bindir}/hiredis-test
-%{_libdir}/libhiredis.so.0.10
+%{_libdir}/libhiredis.so.0.12
 %{_libdir}/libhiredis.so.0
 
 %files devel
-%doc README.md
+%doc CHANGELOG.md README.md
 %{_includedir}/%{name}/
 %{_libdir}/libhiredis.so
+%{_libdir}/pkgconfig/hiredis.pc
 
 %changelog
+* Fri Jan 23 2015 Christopher Meng <rpm@cicku.me> - 0.12.0-1
+- Update to 0.12.0
+
 * Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.11.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
diff --git a/sources b/sources
index c3cffaf..4786c07 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5a42727ea95d3a12a782433199a7c0ba  antirez-hiredis-v0.11.0-0-g0fff0f1.tar.gz
+64dbbca014d0c20081ecbb8271e00a2d  hiredis-0.12.0.tar.gz