From 0cb1e9bb19d6bce8096566372d397083bba185c2 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sun, 13 Nov 2016 10:46:19 +0100 Subject: rename to hiredis-last for parallel installation --- Makefile | 4 ++ hiredis-last.spec | 169 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ hiredis.spec | 132 ------------------------------------------ 3 files changed, 173 insertions(+), 132 deletions(-) create mode 100644 Makefile create mode 100644 hiredis-last.spec delete mode 100644 hiredis.spec diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..1e65467 --- /dev/null +++ b/Makefile @@ -0,0 +1,4 @@ +SRCDIR := $(shell pwd) +NAME := $(shell basename $(SRCDIR)) +include ../common/Makefile + diff --git a/hiredis-last.spec b/hiredis-last.spec new file mode 100644 index 0000000..c9c0ec3 --- /dev/null +++ b/hiredis-last.spec @@ -0,0 +1,169 @@ +# remirepo spec file for hiredis-last +# renamed for parallel installation, from: +# +# Fedora spec file for hiredis +# +# License: MIT +# http://opensource.org/licenses/MIT +# +# Please, preserve the changelog entries +# +%global libname hiredis + +%if 0%{?fedora} >= 24 +Name: %{libname} +%else +Name: %{libname}-last +%endif +Version: 0.13.3 +Release: 1%{?dist} +Summary: Minimalistic C client library for Redis +Group: System Environment/Libraries +License: BSD +URL: https://github.com/redis/hiredis +Source0: https://github.com/redis/hiredis/archive/v%{version}.tar.gz#/%{libname}-%{version}.tar.gz + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: redis + +%description +Hiredis is a minimalistic C client library for the Redis database. +%if "%{name}" != "%{libname}" +This package could be installed beside official RPM of %{libname} +for applications requiring this library version. +%endif + +%package devel +Summary: Development files for %{name} +Group: Development/Libraries +Requires: %{name}%{?_isa} = %{version}-%{release} +%if "%{name}" != "%{libname}" +Conflicts: %{libname}-devel < %{version} +Provides: %{libname}-devel = %{version}-%{release} +Provides: %{libname}-devel%{?_isa} = %{version}-%{release} +%endif + +%description devel +This package contains libraries and header files for +developing applications that use %{name}. + +%prep +%setup -q -n %{libname}-%{version} + +%build +make %{?_smp_mflags} PREFIX="%{_prefix}" LIBRARY_PATH="%{_lib}" \ + DEBUG="%{optflags}" LDFLAGS="%{?__global_ldflags}" + +%install +rm -rf %{buildroot} +make install DESTDIR=%{buildroot} PREFIX="%{_prefix}" LIBRARY_PATH="%{_lib}" + +find %{buildroot} -name '*.a' -delete -print + + +%check +# TODO: Koji isolated environment may cause some tests fail to pass. +make check || true + + +%clean +rm -rf %{buildroot} + + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files +%defattr(-,root,root,-) +%doc COPYING +%{_libdir}/libhiredis.so.0.13 + +%files devel +%defattr(-,root,root,-) +%doc CHANGELOG.md README.md +%{_includedir}/%{libname}/ +%{_libdir}/libhiredis.so +%{_libdir}/pkgconfig/hiredis.pc + +%changelog +* Sun Nov 13 2016 Remi Collet - 0.13.3-1 +- rename to hiredis-last for parallel installation + +* Wed Feb 03 2016 Fedora Release Engineering - 0.13.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Sat Sep 19 2015 Christopher Meng - 0.13.3-1 +- Update to 0.13.3 + +* Thu Aug 27 2015 Christopher Meng - 0.13.2-1 +- Update to 0.13.2 + +* Fri Jul 31 2015 Christopher Meng - 0.13.1-1 +- Update to 0.13.1 + +* Wed Jun 17 2015 Fedora Release Engineering - 0.12.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Wed Feb 04 2015 Petr Machata - 0.12.1-2 +- Bump for rebuild. + +* Fri Jan 30 2015 Christopher Meng - 0.12.1-1 +- Update to 0.12.1 + +* Fri Jan 30 2015 Mamoru TASAKA - 0.12.0-4 +- Again build for f22-boost + +* Fri Jan 30 2015 Mamoru TASAKA - 0.12.0-3 +- Once build on f22 + +* Tue Jan 27 2015 David Tardon - 0.12.0-2 +- install all headers + +* Fri Jan 23 2015 Christopher Meng - 0.12.0-1 +- Update to 0.12.0 + +* Sat Aug 16 2014 Fedora Release Engineering - 0.11.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 0.11.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sat Aug 03 2013 Fedora Release Engineering - 0.11.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Feb 14 2013 Fedora Release Engineering - 0.11.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sat Sep 29 2012 Shakthi Kannan 0.11.0-1 +- Updated to 0.11.0 + +* Thu Jul 19 2012 Fedora Release Engineering - 0.10.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Fri Jan 20 2012 Shakthi Kannan 0.10.1-3 +- Removed Requires redis. + +* Fri Jan 13 2012 Fedora Release Engineering - 0.10.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Fri Dec 30 2011 Shakthi Kannan 0.10.1-1 +- Updated to upstream 0.10.1-28-gd5d8843. + +* Mon May 16 2011 Shakthi Kannan 0.10.0-3 +- Removed INSTALL_LIB from install target as we use INSTALL_LIBRARY_PATH. +- Use 'client library' in Summary. + +* Wed May 11 2011 Shakthi Kannan 0.10.0-2 +- Updated devel sub-package description. +- Added optimization flags. +- Remove manual installation of shared objects. +- Use upstream .tar.gz sources. + +* Tue May 10 2011 Shakthi Kannan 0.10.0-1.gitdf203bc328 +- Updated to upstream gitdf203bc328. +- Added TODO to the files. +- Updated to use libhiredis.so.0, libhiredis.so.0.10. + +* Fri Apr 29 2011 Shakthi Kannan 0.9.2-1 +- First release. diff --git a/hiredis.spec b/hiredis.spec deleted file mode 100644 index 498c6ee..0000000 --- a/hiredis.spec +++ /dev/null @@ -1,132 +0,0 @@ -Name: hiredis -Version: 0.13.3 -Release: 2%{?dist} -Summary: Minimalistic C client library for Redis -License: BSD -URL: https://github.com/redis/hiredis -Source0: https://github.com/redis/hiredis/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz -BuildRequires: redis - -%description -Hiredis is a minimalistic C client library for the Redis database. - -%package devel -Summary: Development files for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} - -%description devel -This package contains libraries and header files for -developing applications that use %{name}. - -%prep -%setup -q - -%build -%make_build PREFIX="%{_prefix}" LIBRARY_PATH="%{_lib}" \ - DEBUG="%{optflags}" LDFLAGS="%{?__global_ldflags}" - -%install -%make_install PREFIX="%{_prefix}" LIBRARY_PATH="%{_lib}" - -find %{buildroot} -name '*.a' -delete -print - -# I don't believe it's stable, so keep previous schema here. -cd %{buildroot}%{_libdir} && ln -sf libhiredis.so.0.13 libhiredis.so.0 - -%check -# TODO: Koji isolated environment may cause some tests fail to pass. -make check || true - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - -%files -%doc COPYING -%{_libdir}/libhiredis.so.0 -%{_libdir}/libhiredis.so.0.13 - -%files devel -%doc CHANGELOG.md README.md -%{_includedir}/%{name}/ -%{_libdir}/libhiredis.so -%{_libdir}/pkgconfig/hiredis.pc - -%changelog -* Wed Feb 03 2016 Fedora Release Engineering - 0.13.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Sat Sep 19 2015 Christopher Meng - 0.13.3-1 -- Update to 0.13.3 - -* Thu Aug 27 2015 Christopher Meng - 0.13.2-1 -- Update to 0.13.2 - -* Fri Jul 31 2015 Christopher Meng - 0.13.1-1 -- Update to 0.13.1 - -* Wed Jun 17 2015 Fedora Release Engineering - 0.12.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Wed Feb 04 2015 Petr Machata - 0.12.1-2 -- Bump for rebuild. - -* Fri Jan 30 2015 Christopher Meng - 0.12.1-1 -- Update to 0.12.1 - -* Fri Jan 30 2015 Mamoru TASAKA - 0.12.0-4 -- Again build for f22-boost - -* Fri Jan 30 2015 Mamoru TASAKA - 0.12.0-3 -- Once build on f22 - -* Tue Jan 27 2015 David Tardon - 0.12.0-2 -- install all headers - -* Fri Jan 23 2015 Christopher Meng - 0.12.0-1 -- Update to 0.12.0 - -* Sat Aug 16 2014 Fedora Release Engineering - 0.11.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 0.11.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sat Aug 03 2013 Fedora Release Engineering - 0.11.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu Feb 14 2013 Fedora Release Engineering - 0.11.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sat Sep 29 2012 Shakthi Kannan 0.11.0-1 -- Updated to 0.11.0 - -* Thu Jul 19 2012 Fedora Release Engineering - 0.10.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Fri Jan 20 2012 Shakthi Kannan 0.10.1-3 -- Removed Requires redis. - -* Fri Jan 13 2012 Fedora Release Engineering - 0.10.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Fri Dec 30 2011 Shakthi Kannan 0.10.1-1 -- Updated to upstream 0.10.1-28-gd5d8843. - -* Mon May 16 2011 Shakthi Kannan 0.10.0-3 -- Removed INSTALL_LIB from install target as we use INSTALL_LIBRARY_PATH. -- Use 'client library' in Summary. - -* Wed May 11 2011 Shakthi Kannan 0.10.0-2 -- Updated devel sub-package description. -- Added optimization flags. -- Remove manual installation of shared objects. -- Use upstream .tar.gz sources. - -* Tue May 10 2011 Shakthi Kannan 0.10.0-1.gitdf203bc328 -- Updated to upstream gitdf203bc328. -- Added TODO to the files. -- Updated to use libhiredis.so.0, libhiredis.so.0.10. - -* Fri Apr 29 2011 Shakthi Kannan 0.9.2-1 -- First release. -- cgit