scm-commits November 2017

scm-commits@lists.fedoraproject.org

1 participants
13642 discussions

pwalter uploaded libgit2-glib-0.26.2.tar.xz for rpms/libgit2-glib
by notifications＠fedoraproject.org 30 Nov '17

30 Nov '17

35fb3ec7a3757212f53cc884760f69725beff8462018b8e716fad389ba57d1acba99ece0fcd148ff40dc63e1fc7e7d566fe84759bd88d3a0ff9fdf970b0a5563 libgit2-glib-0.26.2.tar.xz https://src.fedoraproject.org/lookaside/pkgs/rpms/libgit2-glib/libgit2-glib…

1 0

nathans pushed to redis (f26). "avoid duplicate file in redis and redis-doc"
by notifications＠fedoraproject.org 30 Nov '17

30 Nov '17

From d23b1d45355fa06c6d95a68a0b78a2f3931b8c92 Mon Sep 17 00:00:00 2001 From: Remi Collet <remi(a)fedoraproject.org> Date: Nov 21 2017 11:59:30 +0000 Subject: avoid duplicate file in redis and redis-doc --- diff --git a/redis.spec b/redis.spec index 7cc9497..beda006 100644 --- a/redis.spec +++ b/redis.spec @@ -325,7 +325,7 @@ fi %files %{!?_licensedir:%global license %%doc} %license COPYING -%doc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README.md +%doc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO %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 https://src.fedoraproject.org/rpms/redis/c/d23b1d45355fa06c6d95a68a0b78a2f3…

1 0

nathans pushed to redis (f27). "drop duplicated documentation from main package (..more)"
by notifications＠fedoraproject.org 30 Nov '17

30 Nov '17

From 72f15713c36f0025c4bfeba2280677da7b8e804c Mon Sep 17 00:00:00 2001 From: Remi Collet <remi(a)fedoraproject.org> Date: Nov 30 2017 14:21:36 +0000 Subject: drop duplicated documentation from main package keep man in main page --- diff --git a/redis.spec b/redis.spec index beda006..41ba17a 100644 --- a/redis.spec +++ b/redis.spec @@ -256,8 +256,11 @@ 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 markdown and html pages +# Install documentation 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 @@ -325,7 +328,6 @@ fi %files %{!?_licensedir:%global license %%doc} %license COPYING -%doc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO %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 @@ -338,10 +340,11 @@ fi %endif %exclude %{macrosdir} %exclude %{_includedir} -%exclude %{_mandir} %exclude %{_docdir}/%{name}/* %{_bindir}/%{name}-* %{_libexecdir}/%{name}-* +%{_mandir}/man1/%{name}* +%{_mandir}/man5/%{name}* %if 0%{?with_systemd} %{_unitdir}/%{name}.service %{_unitdir}/%{name}-sentinel.service @@ -363,8 +366,6 @@ fi %{macrosdir}/* %files doc -%{_mandir}/man1/%{name}* -%{_mandir}/man5/%{name}* %docdir %{_docdir}/%{name} %{_docdir}/%{name} @@ -382,6 +383,8 @@ fi - 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(a)redhat.com> - 4.0.2-2 - Install the base modules directories, owned by the main package. https://src.fedoraproject.org/rpms/redis/c/72f15713c36f0025c4bfeba2280677da…

1 0

nathans pushed to redis (f26). "v4.0.3"
by notifications＠fedoraproject.org 30 Nov '17

30 Nov '17

From abd53794203deebb8590cb16831356d99c5f5045 Mon Sep 17 00:00:00 2001 From: Remi Collet <remi(a)fedoraproject.org> Date: Nov 30 2017 14:22:36 +0000 Subject: v4.0.3 --- diff --git a/redis.spec b/redis.spec index 41ba17a..74af30e 100644 --- a/redis.spec +++ b/redis.spec @@ -38,8 +38,8 @@ %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) Name: redis -Version: 4.0.2 -Release: 3%{?dist} +Version: 4.0.3 +Release: 1%{?dist} Summary: A persistent key-value database License: BSD URL: http://redis.io @@ -377,7 +377,8 @@ fi %changelog -* Tue Nov 21 2017 Remi Collet <remi(a)remirepo.net> - 4.0.2-3 +* Thu Nov 30 2017 Remi Collet <remi(a)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 https://src.fedoraproject.org/rpms/redis/c/abd53794203deebb8590cb16831356d9…

1 0

nathans pushed to redis (f26). "drop duplicated documentation from main package (..more)"
by notifications＠fedoraproject.org 30 Nov '17

30 Nov '17

1 0

nathans pushed to redis (f26). "fix ownership of /usr/share/doc/redis (..more)"
by notifications＠fedoraproject.org 30 Nov '17

30 Nov '17

From c5eb5af91879f51cc4cfc5ab85aaca527fbd6c01 Mon Sep 17 00:00:00 2001 From: Remi Collet <remi(a)fedoraproject.org> Date: Nov 21 2017 11:09:54 +0000 Subject: 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 --- diff --git a/redis.spec b/redis.spec index af81254..936c145 100644 --- a/redis.spec +++ b/redis.spec @@ -1,3 +1,11 @@ +# +# 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 @@ -26,9 +34,12 @@ %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.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A persistent key-value database License: BSD URL: http://redis.io @@ -256,14 +267,18 @@ for page in $(find doc -name \*.md | sed -e 's|.md$||g'); do done # Install rpm macros for redis modules -mkdir -p %{buildroot}%{rpmmacrodir} -install -pDm644 %{S:9} %{buildroot}%{rpmmacrodir}/macros.%{name} +mkdir -p %{buildroot}%{macrosdir} +install -pDm644 %{S:9} %{buildroot}%{macrosdir}/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 test ||: -make test-sentinel ||: +taskset -c 1 make %{make_flags} test +make %{make_flags} test-sentinel %endif %pre @@ -318,14 +333,13 @@ fi %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 %{rpmmacrodir} +%exclude %{macrosdir} %exclude %{_includedir} %exclude %{_mandir} -%exclude %{_docdir} +%exclude %{_docdir}/%{name}/* %{_bindir}/%{name}-* %{_libexecdir}/%{name}-* %if 0%{?with_systemd} @@ -335,16 +349,18 @@ 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 -%{rpmmacrodir}/* +%{macrosdir}/* %files doc %{_mandir}/man1/%{name}* @@ -360,6 +376,13 @@ fi %changelog +* Tue Nov 21 2017 Remi Collet <remi(a)remirepo.net> - 4.0.2-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 + * Fri Nov 17 2017 Nathan Scott <nathans(a)redhat.com> - 4.0.2-2 - Install the base modules directories, owned by the main package. https://src.fedoraproject.org/rpms/redis/c/c5eb5af91879f51cc4cfc5ab85aaca52…

1 0

nathans pushed to redis (f27). "v4.0.4 and latest redis-doc"
by notifications＠fedoraproject.org 30 Nov '17

30 Nov '17

From 6314fdc7a69ee1f6b6ab914a7734c432fba73b86 Mon Sep 17 00:00:00 2001 From: Nathan Scott <nathans(a)redhat.com> Date: Nov 30 2017 23:44:30 +0000 Subject: v4.0.4 and latest redis-doc --- diff --git a/.gitignore b/.gitignore index 34c6d8e..a4f8a1c 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,5 @@ 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 diff --git a/redis.spec b/redis.spec index 74af30e..b010a13 100644 --- a/redis.spec +++ b/redis.spec @@ -31,14 +31,14 @@ # Commit IDs for the (unversioned) redis-doc repository # https://fedoraproject.org/wiki/Packaging:SourceURL "Commit Revision" -%global doc_commit 69a5512ae6a4ec77d7b1d0af6aac2224e8e83f95 +%global doc_commit dc402c61da3c015e49eb6fd00e4a0564d122d645 %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.3 +Version: 4.0.4 Release: 1%{?dist} Summary: A persistent key-value database License: BSD @@ -377,6 +377,11 @@ fi %changelog +* Fri Dec 01 2017 Nathan Scott <nathans(a)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(a)remirepo.net> - 4.0.3-1 - Redis 4.0.3 - fix ownership of /usr/share/doc/redis diff --git a/sources b/sources index af20ea9..c4b044f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (redis-4.0.2.tar.gz) = 1458909c6fc16cff8ca5e6dddff23b988ee1e447f2d0bccf5941553b22bab6abb851732b3fe53dafb8a69d6c0939c3ce7e0686d51e03be720fb018c038d3b1b4 -SHA512 (redis-doc-69a5512.tar.gz) = 0b5a8f48dbddafcc0322f7740180d760ad470bbfb2e1653195f4cb7af786795bf40bd43f39691a2905929addb8a4efa498963d70974a0f0b9ea6e84ccf039760 +SHA512 (redis-4.0.4.tar.gz) = 5874c4185df530299b8908478b034d322815bda4a9cef015c7a295a0c9ffc90259ab2650d54ee7d46a9517c8436a302c21deed77e51e4fc589cbb29a1a16f152 +SHA512 (redis-doc-dc402c6.tar.gz) = 1a37ce1ce598d2b1cb3200e74ee30e302c4174ac24cd9f6cdbc16183d0881ac32a2e1c003a6174607fc19286a75f52bc60e817490904f96f055a3a59aa7b92b7 https://src.fedoraproject.org/rpms/redis/c/6314fdc7a69ee1f6b6ab914a7734c432…

1 0

nathans pushed to redis (f27). "v4.0.3"
by notifications＠fedoraproject.org 30 Nov '17

30 Nov '17

1 0

nathans pushed to redis (f27). "fix ownership of /usr/share/doc/redis (..more)"
by notifications＠fedoraproject.org 30 Nov '17

30 Nov '17

1 0

nathans pushed to redis (f27). "fix ownership of /usr/share/doc/redis (when redis-doc installed without redis)"
by notifications＠fedoraproject.org 30 Nov '17

30 Nov '17

From fefcedab2cb453237a0818136382566e26330856 Mon Sep 17 00:00:00 2001 From: Remi Collet <remi(a)fedoraproject.org> Date: Nov 21 2017 11:44:52 +0000 Subject: fix ownership of /usr/share/doc/redis (when redis-doc installed without redis) --- diff --git a/redis.spec b/redis.spec index 936c145..7cc9497 100644 --- a/redis.spec +++ b/redis.spec @@ -366,7 +366,7 @@ fi %{_mandir}/man1/%{name}* %{_mandir}/man5/%{name}* %docdir %{_docdir}/%{name} -%{_docdir}/%{name}/* +%{_docdir}/%{name} %if 0%{?with_redistrib} %files trib https://src.fedoraproject.org/rpms/redis/c/fefcedab2cb453237a0818136382566e…

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

scm-commits November 2017