Compare commits
No commits in common. "master" and "private-nathans-redis4" have entirely different histories.
master
...
private-na
|
|
@ -37,11 +37,3 @@ clog
|
|||
/redis-3.2.11.tar.gz
|
||||
/redis-4.0.2.tar.gz
|
||||
/redis-doc-69a5512.tar.gz
|
||||
/redis-4.0.4.tar.gz
|
||||
/redis-doc-dc402c6.tar.gz
|
||||
/redis-4.0.5.tar.gz
|
||||
/redis-4.0.6.tar.gz
|
||||
/redis-4.0.7.tar.gz
|
||||
/redis-doc-38c2bd6.tar.gz
|
||||
/redis-4.0.8.tar.gz
|
||||
/redis-4.0.9.tar.gz
|
||||
|
|
|
|||
92
redis.spec
92
redis.spec
|
|
@ -1,11 +1,3 @@
|
|||
#
|
||||
# Fedora spec file for redis
|
||||
#
|
||||
# License: MIT
|
||||
# http://opensource.org/licenses/MIT
|
||||
#
|
||||
# Please preserve changelog entries
|
||||
#
|
||||
%global with_perftools 0
|
||||
|
||||
%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7
|
||||
|
|
@ -31,14 +23,11 @@
|
|||
|
||||
# Commit IDs for the (unversioned) redis-doc repository
|
||||
# https://fedoraproject.org/wiki/Packaging:SourceURL "Commit Revision"
|
||||
%global doc_commit 38c2bd6f5331aad382494b3c7833b0cc2b92222a
|
||||
%global doc_commit 69a5512ae6a4ec77d7b1d0af6aac2224e8e83f95
|
||||
%global short_doc_commit %(c=%{doc_commit}; echo ${c:0:7})
|
||||
|
||||
# %%{rpmmacrodir} not usable on EL-6
|
||||
%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
|
||||
|
||||
Name: redis
|
||||
Version: 4.0.9
|
||||
Version: 4.0.2
|
||||
Release: 1%{?dist}
|
||||
Summary: A persistent key-value database
|
||||
License: BSD
|
||||
|
|
@ -256,11 +245,8 @@ done
|
|||
ln -s redis-server.1 %{buildroot}%{_mandir}/man1/redis-sentinel.1
|
||||
ln -s redis.conf.5 %{buildroot}%{_mandir}/man5/redis-sentinel.conf.5
|
||||
|
||||
# Install documentation and html pages
|
||||
# Install markdown and html pages
|
||||
doc=$(echo %{buildroot}/%{_docdir}/%{name})
|
||||
for page in 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO; do
|
||||
install -Dpm644 $page $doc/$page
|
||||
done
|
||||
for page in $(find doc -name \*.md | sed -e 's|.md$||g'); do
|
||||
base=$(echo $page | sed -e 's|doc/||g')
|
||||
install -Dpm644 $page.md $doc/$base.md
|
||||
|
|
@ -270,18 +256,14 @@ for page in $(find doc -name \*.md | sed -e 's|.md$||g'); do
|
|||
done
|
||||
|
||||
# Install rpm macros for redis modules
|
||||
mkdir -p %{buildroot}%{macrosdir}
|
||||
install -pDm644 %{S:9} %{buildroot}%{macrosdir}/macros.%{name}
|
||||
mkdir -p %{buildroot}%{rpmmacrodir}
|
||||
install -pDm644 %{S:9} %{buildroot}%{rpmmacrodir}/macros.%{name}
|
||||
|
||||
%check
|
||||
%if 0%{?with_tests}
|
||||
# ERR Active defragmentation cannot be enabled: it requires a Redis server compiled
|
||||
# with a modified Jemalloc like the one shipped by default with the Redis source distribution
|
||||
sed -e '/memefficiency/d' -i tests/test_helper.tcl
|
||||
|
||||
# https://github.com/antirez/redis/issues/1417 (for "taskset -c 1")
|
||||
taskset -c 1 make %{make_flags} test
|
||||
make %{make_flags} test-sentinel
|
||||
taskset -c 1 make test ||:
|
||||
make test-sentinel ||:
|
||||
%endif
|
||||
|
||||
%pre
|
||||
|
|
@ -328,23 +310,22 @@ fi
|
|||
%files
|
||||
%{!?_licensedir:%global license %%doc}
|
||||
%license COPYING
|
||||
%doc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README.md
|
||||
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
|
||||
%attr(0640, redis, root) %config(noreplace) %{_sysconfdir}/%{name}.conf
|
||||
%attr(0640, redis, root) %config(noreplace) %{_sysconfdir}/%{name}-sentinel.conf
|
||||
%dir %attr(0750, redis, redis) %{_libdir}/%{name}
|
||||
%dir %attr(0750, redis, redis) %{redis_modules_dir}
|
||||
%dir %attr(0750, redis, redis) %{_sharedstatedir}/%{name}
|
||||
%dir %attr(0750, redis, redis) %{_localstatedir}/log/%{name}
|
||||
%dir %attr(0750, redis, redis) %ghost %{_localstatedir}/run/%{name}
|
||||
%if 0%{?with_redistrib}
|
||||
%exclude %{_bindir}/%{name}-trib
|
||||
%endif
|
||||
%exclude %{macrosdir}
|
||||
%exclude %{rpmmacrodir}
|
||||
%exclude %{_includedir}
|
||||
%exclude %{_docdir}/%{name}/*
|
||||
%exclude %{_mandir}
|
||||
%exclude %{_docdir}
|
||||
%{_bindir}/%{name}-*
|
||||
%{_libexecdir}/%{name}-*
|
||||
%{_mandir}/man1/%{name}*
|
||||
%{_mandir}/man5/%{name}*
|
||||
%if 0%{?with_systemd}
|
||||
%{_unitdir}/%{name}.service
|
||||
%{_unitdir}/%{name}-sentinel.service
|
||||
|
|
@ -352,22 +333,22 @@ fi
|
|||
%config(noreplace) %{_sysconfdir}/systemd/system/%{name}.service.d/limit.conf
|
||||
%dir %{_sysconfdir}/systemd/system/%{name}-sentinel.service.d
|
||||
%config(noreplace) %{_sysconfdir}/systemd/system/%{name}-sentinel.service.d/limit.conf
|
||||
%dir %attr(0755, redis, redis) %ghost %{_localstatedir}/run/%{name}
|
||||
%else
|
||||
%{_initrddir}/%{name}
|
||||
%{_initrddir}/%{name}-sentinel
|
||||
%config(noreplace) %{_sysconfdir}/security/limits.d/95-%{name}.conf
|
||||
%dir %attr(0755, redis, redis) %{_localstatedir}/run/%{name}
|
||||
%endif
|
||||
|
||||
%files devel
|
||||
%license COPYING
|
||||
%{_includedir}/%{name}module.h
|
||||
%{macrosdir}/*
|
||||
%{rpmmacrodir}/*
|
||||
|
||||
%files doc
|
||||
%{_mandir}/man1/%{name}*
|
||||
%{_mandir}/man5/%{name}*
|
||||
%docdir %{_docdir}/%{name}
|
||||
%{_docdir}/%{name}
|
||||
%{_docdir}/%{name}/*
|
||||
|
||||
%if 0%{?with_redistrib}
|
||||
%files trib
|
||||
|
|
@ -377,45 +358,6 @@ fi
|
|||
|
||||
|
||||
%changelog
|
||||
* Tue Mar 27 2018 Nathan Scott <nathans@redhat.com> - 4.0.9-1
|
||||
- Upstream 4.0.9 release.
|
||||
|
||||
* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 4.0.8-2
|
||||
- Escape macros in %%changelog
|
||||
|
||||
* Wed Feb 7 2018 Nathan Scott <nathans@redhat.com> - 4.0.8-1
|
||||
- Upstream 4.0.8 release.
|
||||
|
||||
* Wed Jan 31 2018 Nathan Scott <nathans@redhat.com> - 4.0.7-1
|
||||
- Upstream 4.0.7 release.
|
||||
|
||||
* Thu Dec 7 2017 Nathan Scott <nathans@redhat.com> - 4.0.6-1
|
||||
- Upstream 4.0.6 release.
|
||||
|
||||
* Fri Dec 1 2017 Remi Collet <remi@remirepo.net> - 4.0.5-1
|
||||
- Redis 4.0.5 - Released Thu Dec 1 16:03:32 CET 2017
|
||||
- Upgrade urgency CRITICAL: Redis 4.0.4 fix for PSYNC2 was broken,
|
||||
causing the slave to crash when receiving an RDB file from the
|
||||
master that contained a duplicated Lua script.
|
||||
|
||||
* Fri Dec 01 2017 Nathan Scott <nathans@redhat.com> - 4.0.4-1
|
||||
- Upstream 4.0.4 release.
|
||||
- Update to current upstream redis-doc also.
|
||||
- Fix man page issues (RHBZ #1513594 and RHBZ #1515417).
|
||||
|
||||
* Thu Nov 30 2017 Remi Collet <remi@remirepo.net> - 4.0.3-1
|
||||
- Redis 4.0.3
|
||||
- fix ownership of /usr/share/doc/redis
|
||||
- use make_flags for test to avoid rebuild and failure
|
||||
- fix rpm macro location on EL-6
|
||||
- add /var/run/redis on EL-6
|
||||
- add spec file license header
|
||||
- drop duplicated documentation from main package
|
||||
- keep man in main page
|
||||
|
||||
* Fri Nov 17 2017 Nathan Scott <nathans@redhat.com> - 4.0.2-2
|
||||
- Install the base modules directories, owned by the main package.
|
||||
|
||||
* Tue Oct 31 2017 Nathan Scott <nathans@redhat.com> - 4.0.2-1
|
||||
- Upstream 4.0.2 release. (RHBZ #1389592)
|
||||
- Add redis-devel for loadable module development.
|
||||
|
|
@ -444,7 +386,7 @@ fi
|
|||
* Mon May 29 2017 Nathan Scott <nathans@redhat.com> - 3.2.9-1
|
||||
- Upstream 3.2.9
|
||||
- Add RuntimeDirectory=redis to systemd unit file (RHBZ #1454700)
|
||||
- Mark rundir as %%ghost since it may disappear (tmpfs - #1454700)
|
||||
- Mark rundir as %ghost since it may disappear (tmpfs - #1454700)
|
||||
- Fix a shutdown failure with Unix domain sockets (RHBZ #1444988)
|
||||
|
||||
* Mon Feb 20 2017 Haïkel Guémar <hguemar@fedoraproject.org> - 3.2.8-1
|
||||
|
|
|
|||
4
sources
4
sources
|
|
@ -1,2 +1,2 @@
|
|||
SHA512 (redis-4.0.9.tar.gz) = a6cf63cb361f0a87da3955ba628190dc04cad342f7a664d18e44416ee67dd86ed6e3a46b9701e994f1417e56b819b3c6fc595f363c10bb4b83d5033919d29598
|
||||
SHA512 (redis-doc-38c2bd6.tar.gz) = b878e43e942c24b0bb195d36f50e0f7f3efc1aab339c8a7f9bd9c04318a13bfad41334a9f08e4e865c5708221b421a3e7a0f343a9fe728f3f9b4eb1404ef8517
|
||||
SHA512 (redis-4.0.2.tar.gz) = 1458909c6fc16cff8ca5e6dddff23b988ee1e447f2d0bccf5941553b22bab6abb851732b3fe53dafb8a69d6c0939c3ce7e0686d51e03be720fb018c038d3b1b4
|
||||
SHA512 (redis-doc-69a5512.tar.gz) = 0b5a8f48dbddafcc0322f7740180d760ad470bbfb2e1653195f4cb7af786795bf40bd43f39691a2905929addb8a4efa498963d70974a0f0b9ea6e84ccf039760
|
||||
|
|
|
|||
Loading…
Reference in New Issue