From 3e098cb3e4d5057fa1826d8d9709afd169eb3851 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 29 Sep 2009 20:15:14 +0000 Subject: [PATCH 001/128] Initialize branch F-12 for etckeeper --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..06de2d2 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-12 From b3b985e5a098c8e726a01e3565d726512a123c52 Mon Sep 17 00:00:00 2001 From: Bernie Innocenti Date: Wed, 30 Sep 2009 03:44:42 +0000 Subject: [PATCH 002/128] Initial import. --- .cvsignore | 1 + etckeeper.spec | 124 +++++++++++++++++++++++++++++++++++++++++++++++++ import.log | 1 + sources | 1 + 4 files changed, 127 insertions(+) create mode 100644 etckeeper.spec create mode 100644 import.log diff --git a/.cvsignore b/.cvsignore index e69de29..bb31498 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +etckeeper_0.41.tar.gz diff --git a/etckeeper.spec b/etckeeper.spec new file mode 100644 index 0000000..d1ff23c --- /dev/null +++ b/etckeeper.spec @@ -0,0 +1,124 @@ +%define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") + +Name: etckeeper +Version: 0.41 +Release: 1%{?dist} +Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) +Group: Applications/System +License: GPLv2+ +URL: http://kitenet.net/~joey/code/etckeeper/ +Source0: http://ftp.debian.org/debian/pool/main/e/etckeeper/%{name}_%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch +Requires: git >= 1.6 + +%description +The etckeeper program is a tool to let /etc be stored in a git, +mercurial, bzr or darcs repository. It hooks into yum to automatically +commit changes made to /etc during package upgrades. It tracks file +metadata that version control systems do not normally support, but that +is important for /etc, such as the permissions of /etc/shadow. It's +quite modular and configurable, while also being simple to use if you +understand the basics of working with version control. + +The default backend is git, if want to use a another backend please +install the appropriate tool (mercurial, darcs or bzr). +To use bzr as backend, please also install the %{name}-bzr package. + +To start using the package please read %{_docdir}/%{name}-%{version}/README + +%package bzr +Summary: Support for bzr with etckeeper +Group: Applications/System +Requires: %{name} = %{version}-%{release} bzr +BuildRequires: bzr +BuildRequires: python-devel + +%description bzr +This package provides a bzr backend for etckeeper, if you want to use +etckeeper with bzr backend, install this package. + +%prep +%setup -q -n %{name} +%{__perl} -pi -e ' + s|HIGHLEVEL_PACKAGE_MANAGER=apt|HIGHLEVEL_PACKAGE_MANAGER=yum|; + s|LOWLEVEL_PACKAGE_MANAGER=dpkg|LOWLEVEL_PACKAGE_MANAGER=rpm|; + ' etckeeper.conf +%{__sed} -i -e '1d' yum-etckeeper.py + +%build +make %{?_smp_mflags} + +%install +rm -rf %{buildroot} +make install DESTDIR=%{buildroot} INSTALL="%{__install} -p" +%{__install} -D -p debian/cron.daily %{buildroot}%{_sysconfdir}/cron.daily/%{name} +%{__install} -d %{buildroot}%{_localstatedir}/cache/%{name} +%{__sed} -i -e '1d' %{buildroot}%{python_sitelib}/bzrlib/plugins/%{name}/__init__.py + +%clean +rm -rf %{buildroot} + +# Users must study the README anyway. +#post +#{_sbindir}/%{name} init -d /etc/ + +%files +%defattr(-, root, root, -) +%doc GPL INSTALL TODO README +%{_sbindir}/%{name} +%{_mandir}/man8/%{name}.8* +%dir %{_sysconfdir}/%{name} +%dir %{_sysconfdir}/%{name}/*.d +%{_sysconfdir}/%{name}/*.d/ +%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf +%{_sysconfdir}/cron.daily/%{name} +%dir %{_sysconfdir}/bash_completion.d +%config(noreplace) %{_sysconfdir}/bash_completion.d/%{name} +%dir %{_prefix}/lib/yum-plugins +%{_prefix}/lib/yum-plugins/%{name}.* +%dir %{_sysconfdir}/yum/pluginconf.d +%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/%{name}.conf +%{_localstatedir}/cache/%{name} + +%files bzr +%defattr(-, root, root, -) +%doc GPL +%{python_sitelib}/bzrlib/plugins/%{name} +%{python_sitelib}/bzr_%{name}-*.egg-info + +%changelog +* Sat Sep 12 2009 Bernie Innocenti - 0.41-1 +- Updatte to 0.41 +- Add missing directory ownerships + +* Sat Sep 12 2009 Bernie Innocenti - 0.40-3 +- Make the bzr subpackage builddepend on python-devel + +* Wed Sep 09 2009 Terje Rosten - 0.40-2 +- Package is noarch +- Rpmlint clean +- Random cleanup +- Ship cache dir in package +- bzr subpackage +- Add bzr to buildreq + +* Sat Sep 05 2009 Bernie Innocenti - 0.40-1 +- Update to 0.40 + +* Sun Jun 14 2009 Bernie Innocenti - 0.37-1 +- Update to 0.37 +- Change license tag to GPLv2+ + +* Fri Feb 27 2009 Jimmy Tang - 0.33-4 +- fix up initial install to make directory in /var/cache/etckeeper +- install the etckeeper daily cron job +- define some config files that shouldn't be replaced, should the hooks +in commit.d, init.d etc... saved and not blown away? if so they can +defined as config files. etckeeper should record the changes anyway. + +* Wed Feb 25 2009 Jimmy Tang - 0.32-1 +- yum etckeeper plugin is now apart of this package + +* Tue Feb 24 2009 Jimmy Tang - 0.31-1 +- initial package diff --git a/import.log b/import.log new file mode 100644 index 0000000..feda826 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +etckeeper-0_41-1_fc12:HEAD:etckeeper-0.41-1.fc12.src.rpm:1254282233 diff --git a/sources b/sources index e69de29..bbdab18 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +d8929c79fcab4f3e57d7ebb03f20df63 etckeeper_0.41.tar.gz From 24c7caa7598880a48467d839a2f4fbc97a5171e0 Mon Sep 17 00:00:00 2001 From: Bernie Innocenti Date: Wed, 30 Sep 2009 03:54:04 +0000 Subject: [PATCH 003/128] Initial import. --- .cvsignore | 1 + etckeeper.spec | 124 +++++++++++++++++++++++++++++++++++++++++++++++++ import.log | 1 + sources | 1 + 4 files changed, 127 insertions(+) create mode 100644 etckeeper.spec create mode 100644 import.log diff --git a/.cvsignore b/.cvsignore index e69de29..bb31498 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +etckeeper_0.41.tar.gz diff --git a/etckeeper.spec b/etckeeper.spec new file mode 100644 index 0000000..d1ff23c --- /dev/null +++ b/etckeeper.spec @@ -0,0 +1,124 @@ +%define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") + +Name: etckeeper +Version: 0.41 +Release: 1%{?dist} +Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) +Group: Applications/System +License: GPLv2+ +URL: http://kitenet.net/~joey/code/etckeeper/ +Source0: http://ftp.debian.org/debian/pool/main/e/etckeeper/%{name}_%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch +Requires: git >= 1.6 + +%description +The etckeeper program is a tool to let /etc be stored in a git, +mercurial, bzr or darcs repository. It hooks into yum to automatically +commit changes made to /etc during package upgrades. It tracks file +metadata that version control systems do not normally support, but that +is important for /etc, such as the permissions of /etc/shadow. It's +quite modular and configurable, while also being simple to use if you +understand the basics of working with version control. + +The default backend is git, if want to use a another backend please +install the appropriate tool (mercurial, darcs or bzr). +To use bzr as backend, please also install the %{name}-bzr package. + +To start using the package please read %{_docdir}/%{name}-%{version}/README + +%package bzr +Summary: Support for bzr with etckeeper +Group: Applications/System +Requires: %{name} = %{version}-%{release} bzr +BuildRequires: bzr +BuildRequires: python-devel + +%description bzr +This package provides a bzr backend for etckeeper, if you want to use +etckeeper with bzr backend, install this package. + +%prep +%setup -q -n %{name} +%{__perl} -pi -e ' + s|HIGHLEVEL_PACKAGE_MANAGER=apt|HIGHLEVEL_PACKAGE_MANAGER=yum|; + s|LOWLEVEL_PACKAGE_MANAGER=dpkg|LOWLEVEL_PACKAGE_MANAGER=rpm|; + ' etckeeper.conf +%{__sed} -i -e '1d' yum-etckeeper.py + +%build +make %{?_smp_mflags} + +%install +rm -rf %{buildroot} +make install DESTDIR=%{buildroot} INSTALL="%{__install} -p" +%{__install} -D -p debian/cron.daily %{buildroot}%{_sysconfdir}/cron.daily/%{name} +%{__install} -d %{buildroot}%{_localstatedir}/cache/%{name} +%{__sed} -i -e '1d' %{buildroot}%{python_sitelib}/bzrlib/plugins/%{name}/__init__.py + +%clean +rm -rf %{buildroot} + +# Users must study the README anyway. +#post +#{_sbindir}/%{name} init -d /etc/ + +%files +%defattr(-, root, root, -) +%doc GPL INSTALL TODO README +%{_sbindir}/%{name} +%{_mandir}/man8/%{name}.8* +%dir %{_sysconfdir}/%{name} +%dir %{_sysconfdir}/%{name}/*.d +%{_sysconfdir}/%{name}/*.d/ +%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf +%{_sysconfdir}/cron.daily/%{name} +%dir %{_sysconfdir}/bash_completion.d +%config(noreplace) %{_sysconfdir}/bash_completion.d/%{name} +%dir %{_prefix}/lib/yum-plugins +%{_prefix}/lib/yum-plugins/%{name}.* +%dir %{_sysconfdir}/yum/pluginconf.d +%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/%{name}.conf +%{_localstatedir}/cache/%{name} + +%files bzr +%defattr(-, root, root, -) +%doc GPL +%{python_sitelib}/bzrlib/plugins/%{name} +%{python_sitelib}/bzr_%{name}-*.egg-info + +%changelog +* Sat Sep 12 2009 Bernie Innocenti - 0.41-1 +- Updatte to 0.41 +- Add missing directory ownerships + +* Sat Sep 12 2009 Bernie Innocenti - 0.40-3 +- Make the bzr subpackage builddepend on python-devel + +* Wed Sep 09 2009 Terje Rosten - 0.40-2 +- Package is noarch +- Rpmlint clean +- Random cleanup +- Ship cache dir in package +- bzr subpackage +- Add bzr to buildreq + +* Sat Sep 05 2009 Bernie Innocenti - 0.40-1 +- Update to 0.40 + +* Sun Jun 14 2009 Bernie Innocenti - 0.37-1 +- Update to 0.37 +- Change license tag to GPLv2+ + +* Fri Feb 27 2009 Jimmy Tang - 0.33-4 +- fix up initial install to make directory in /var/cache/etckeeper +- install the etckeeper daily cron job +- define some config files that shouldn't be replaced, should the hooks +in commit.d, init.d etc... saved and not blown away? if so they can +defined as config files. etckeeper should record the changes anyway. + +* Wed Feb 25 2009 Jimmy Tang - 0.32-1 +- yum etckeeper plugin is now apart of this package + +* Tue Feb 24 2009 Jimmy Tang - 0.31-1 +- initial package diff --git a/import.log b/import.log new file mode 100644 index 0000000..34e33b0 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +etckeeper-0_41-1_fc12:F-12:etckeeper-0.41-1.fc12.src.rpm:1254282824 diff --git a/sources b/sources index e69de29..bbdab18 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +d8929c79fcab4f3e57d7ebb03f20df63 etckeeper_0.41.tar.gz From d406a6945fada0ed2960e46b5410e1d3f0d8ca22 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:50:04 +0000 Subject: [PATCH 004/128] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index cc88086..cc3d0a6 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: etckeeper -# $Id$ +# $Id: Makefile,v 1.1 2009/09/29 20:15:12 kevin Exp $ NAME := etckeeper SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From e2809ca5da7ea7c076376e29f18e8176010303c2 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:25:30 +0000 Subject: [PATCH 005/128] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index cc88086..cc3d0a6 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: etckeeper -# $Id$ +# $Id: Makefile,v 1.1 2009/09/29 20:15:12 kevin Exp $ NAME := etckeeper SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From dff39b37d3d880f10017cc2fe2b9eaa778367d9b Mon Sep 17 00:00:00 2001 From: dmalcolm Date: Thu, 22 Jul 2010 01:16:10 +0000 Subject: [PATCH 006/128] - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild --- etckeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/etckeeper.spec b/etckeeper.spec index d1ff23c..b233b85 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -2,7 +2,7 @@ Name: etckeeper Version: 0.41 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) Group: Applications/System License: GPLv2+ @@ -88,6 +88,9 @@ rm -rf %{buildroot} %{python_sitelib}/bzr_%{name}-*.egg-info %changelog +* Wed Jul 21 2010 David Malcolm - 0.41-2 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + * Sat Sep 12 2009 Bernie Innocenti - 0.41-1 - Updatte to 0.41 - Add missing directory ownerships From b92e2a5f256ad95422a6ffd47a82d972f6a588c5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 13:56:42 +0000 Subject: [PATCH 007/128] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- import.log | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index cc3d0a6..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: etckeeper -# $Id: Makefile,v 1.1 2009/09/29 20:15:12 kevin Exp $ -NAME := etckeeper -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/import.log b/import.log deleted file mode 100644 index feda826..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -etckeeper-0_41-1_fc12:HEAD:etckeeper-0.41-1.fc12.src.rpm:1254282233 From d149a313e2b7d3c36ba92940fc02dc7c4522a8aa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 13:56:42 +0000 Subject: [PATCH 008/128] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 1 - 4 files changed, 23 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index cc3d0a6..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: etckeeper -# $Id: Makefile,v 1.1 2009/09/29 20:15:12 kevin Exp $ -NAME := etckeeper -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 06de2d2..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-12 diff --git a/import.log b/import.log deleted file mode 100644 index 34e33b0..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -etckeeper-0_41-1_fc12:F-12:etckeeper-0.41-1.fc12.src.rpm:1254282824 From 24ac1812f8e4cf90512288ba7b0dca8b77f08ccb Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Tue, 7 Sep 2010 01:25:24 +0200 Subject: [PATCH 009/128] - Update to 0.48. - Don't list /etc/etckeeper/*.d directories twice in %files. - Add patch from upstream that fixes bz 588086. --- .gitignore | 1 + etckeeper-0.48-fix_path.patch | 45 +++++++++++++++++++++++++++++++++++ etckeeper.spec | 15 ++++++++---- sources | 2 +- 4 files changed, 58 insertions(+), 5 deletions(-) create mode 100644 etckeeper-0.48-fix_path.patch diff --git a/.gitignore b/.gitignore index bb31498..458823f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ etckeeper_0.41.tar.gz +/etckeeper_0.48.tar.gz diff --git a/etckeeper-0.48-fix_path.patch b/etckeeper-0.48-fix_path.patch new file mode 100644 index 0000000..ae51274 --- /dev/null +++ b/etckeeper-0.48-fix_path.patch @@ -0,0 +1,45 @@ +From 60747c8dae14a12263124193572c7eb1177e475b Mon Sep 17 00:00:00 2001 +From: Joey Hess +Date: Sun, 25 Jul 2010 19:47:45 -0400 +Subject: [PATCH 1/1] Ensure that PATH contains the directory containing etckeeper, so that hook scripts that re-exec etckeeper are guaranteed to find it. + +--- + debian/changelog | 7 +++++++ + etckeeper | 6 ++++++ + 2 files changed, 13 insertions(+), 0 deletions(-) + +diff --git a/debian/changelog b/debian/changelog +index 58bdbd1..3ddc0b6 100644 +--- a/debian/changelog ++++ b/debian/changelog +@@ -1,3 +1,10 @@ ++etckeeper (0.49) UNRELEASED; urgency=low ++ ++ * Ensure that PATH contains the directory containing etckeeper, so ++ that hook scripts that re-exec etckeeper are guaranteed to find it. ++ ++ -- Joey Hess Sun, 25 Jul 2010 19:44:37 -0400 ++ + etckeeper (0.48) unstable; urgency=low + + * Fix backwards test for HGUSER. (Mike Rich) +diff --git a/etckeeper b/etckeeper +index 4c27005..d7b94a0 100755 +--- a/etckeeper ++++ b/etckeeper +@@ -25,6 +25,12 @@ export VCS + HOME=~root + export HOME + ++program_directory="${0%/*}" ++if [ -n "$program_directory" ]; then ++ PATH="$PATH:$program_directory" ++ export PATH ++fi ++ + if [ ! -z "$GIT_COMMIT_OPTIONS" ]; then + export GIT_COMMIT_OPTIONS + fi +-- +1.7.1 + diff --git a/etckeeper.spec b/etckeeper.spec index b233b85..d1d9aba 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -1,13 +1,15 @@ %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") Name: etckeeper -Version: 0.41 -Release: 2%{?dist} +Version: 0.48 +Release: 1%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) Group: Applications/System License: GPLv2+ URL: http://kitenet.net/~joey/code/etckeeper/ Source0: http://ftp.debian.org/debian/pool/main/e/etckeeper/%{name}_%{version}.tar.gz +# this is from rev 60747c8d, will be in 0.49. fixes bz 588086. +Patch0: etckeeper-0.48-fix_path.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: git >= 1.6 @@ -40,6 +42,7 @@ etckeeper with bzr backend, install this package. %prep %setup -q -n %{name} +%patch0 -p1 -b .path %{__perl} -pi -e ' s|HIGHLEVEL_PACKAGE_MANAGER=apt|HIGHLEVEL_PACKAGE_MANAGER=yum|; s|LOWLEVEL_PACKAGE_MANAGER=dpkg|LOWLEVEL_PACKAGE_MANAGER=rpm|; @@ -69,8 +72,7 @@ rm -rf %{buildroot} %{_sbindir}/%{name} %{_mandir}/man8/%{name}.8* %dir %{_sysconfdir}/%{name} -%dir %{_sysconfdir}/%{name}/*.d -%{_sysconfdir}/%{name}/*.d/ +%{_sysconfdir}/%{name}/*.d %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf %{_sysconfdir}/cron.daily/%{name} %dir %{_sysconfdir}/bash_completion.d @@ -88,6 +90,11 @@ rm -rf %{buildroot} %{python_sitelib}/bzr_%{name}-*.egg-info %changelog +* Fri Sep 3 2010 Thomas Moschny - 0.48-1 +- Update to 0.48. +- Don't list /etc/etckeeper/*.d directories twice in %%files. +- Add patch from upstream that fixes bz 588086. + * Wed Jul 21 2010 David Malcolm - 0.41-2 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild diff --git a/sources b/sources index bbdab18..1219a27 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d8929c79fcab4f3e57d7ebb03f20df63 etckeeper_0.41.tar.gz +c73e4a12d292bbb769da108d82dd1798 etckeeper_0.48.tar.gz From eb1d69569510fdd052d296c0a497a1e83f7d6047 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Wed, 15 Sep 2010 21:29:42 +0200 Subject: [PATCH 010/128] - Update to 0.49. - Remove obsolete patch. --- .gitignore | 1 + etckeeper.spec | 9 +++++---- sources | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 458823f..5dca881 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ etckeeper_0.41.tar.gz /etckeeper_0.48.tar.gz +/etckeeper_0.49.tar.gz diff --git a/etckeeper.spec b/etckeeper.spec index d1d9aba..b80ca6c 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -1,15 +1,13 @@ %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") Name: etckeeper -Version: 0.48 +Version: 0.49 Release: 1%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) Group: Applications/System License: GPLv2+ URL: http://kitenet.net/~joey/code/etckeeper/ Source0: http://ftp.debian.org/debian/pool/main/e/etckeeper/%{name}_%{version}.tar.gz -# this is from rev 60747c8d, will be in 0.49. fixes bz 588086. -Patch0: etckeeper-0.48-fix_path.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: git >= 1.6 @@ -42,7 +40,6 @@ etckeeper with bzr backend, install this package. %prep %setup -q -n %{name} -%patch0 -p1 -b .path %{__perl} -pi -e ' s|HIGHLEVEL_PACKAGE_MANAGER=apt|HIGHLEVEL_PACKAGE_MANAGER=yum|; s|LOWLEVEL_PACKAGE_MANAGER=dpkg|LOWLEVEL_PACKAGE_MANAGER=rpm|; @@ -90,6 +87,10 @@ rm -rf %{buildroot} %{python_sitelib}/bzr_%{name}-*.egg-info %changelog +* Wed Sep 15 2010 Thomas Moschny - 0.49-1 +- Update to 0.49. +- Remove obsolete patch. + * Fri Sep 3 2010 Thomas Moschny - 0.48-1 - Update to 0.48. - Don't list /etc/etckeeper/*.d directories twice in %%files. diff --git a/sources b/sources index 1219a27..aa655b0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c73e4a12d292bbb769da108d82dd1798 etckeeper_0.48.tar.gz +cf91c6b902b530eb57ce5d06502c620f etckeeper_0.49.tar.gz From a4fb2aefc884825017ed318afb69dfee9cd7fc56 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Fri, 17 Sep 2010 00:26:51 +0200 Subject: [PATCH 011/128] - Adjust minimum required version of GIT. - egg-info files are not created automatically on RHEL5. --- etckeeper.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/etckeeper.spec b/etckeeper.spec index b80ca6c..97299bd 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -2,7 +2,7 @@ Name: etckeeper Version: 0.49 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) Group: Applications/System License: GPLv2+ @@ -10,7 +10,7 @@ URL: http://kitenet.net/~joey/code/etckeeper/ Source0: http://ftp.debian.org/debian/pool/main/e/etckeeper/%{name}_%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: git >= 1.6 +Requires: git >= 1.5.4 %description The etckeeper program is a tool to let /etc be stored in a git, @@ -84,9 +84,15 @@ rm -rf %{buildroot} %defattr(-, root, root, -) %doc GPL %{python_sitelib}/bzrlib/plugins/%{name} +%if 0%{?fedora} || 0%{?rhel} > 5 %{python_sitelib}/bzr_%{name}-*.egg-info +%endif %changelog +* Fri Sep 17 2010 Thomas Moschny - 0.49-2 +- Adjust minimum required version of GIT. +- egg-info files are not created automatically on RHEL5. + * Wed Sep 15 2010 Thomas Moschny - 0.49-1 - Update to 0.49. - Remove obsolete patch. @@ -100,7 +106,7 @@ rm -rf %{buildroot} - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild * Sat Sep 12 2009 Bernie Innocenti - 0.41-1 -- Updatte to 0.41 +- Update to 0.41 - Add missing directory ownerships * Sat Sep 12 2009 Bernie Innocenti - 0.40-3 From 7a174a4c4620cbd8268654f16688171cb3fb701d Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Wed, 27 Oct 2010 09:08:32 +0200 Subject: [PATCH 012/128] - Update to 0.50. - Change %define -> %global. --- .gitignore | 1 + etckeeper.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 5dca881..5f3de35 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ etckeeper_0.41.tar.gz /etckeeper_0.48.tar.gz /etckeeper_0.49.tar.gz +/etckeeper_0.50.tar.gz diff --git a/etckeeper.spec b/etckeeper.spec index 97299bd..fdf1600 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -1,8 +1,8 @@ -%define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") +%global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") Name: etckeeper -Version: 0.49 -Release: 2%{?dist} +Version: 0.50 +Release: 1%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) Group: Applications/System License: GPLv2+ @@ -89,6 +89,10 @@ rm -rf %{buildroot} %endif %changelog +* Wed Oct 27 2010 Thomas Moschny - 0.50-1 +- Update to 0.50. +- Change %%define -> %%global. + * Fri Sep 17 2010 Thomas Moschny - 0.49-2 - Adjust minimum required version of GIT. - egg-info files are not created automatically on RHEL5. diff --git a/sources b/sources index aa655b0..98ea002 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cf91c6b902b530eb57ce5d06502c620f etckeeper_0.49.tar.gz +fd272274e38db517288ad0bcb7a9e66d etckeeper_0.50.tar.gz From 084c5ae7ddd41698f47e08d1722d5e9165e36c1a Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Mon, 3 Jan 2011 13:09:55 +0100 Subject: [PATCH 013/128] - Don't package INSTALL. --- etckeeper.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/etckeeper.spec b/etckeeper.spec index fdf1600..6552fe4 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -2,7 +2,7 @@ Name: etckeeper Version: 0.50 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) Group: Applications/System License: GPLv2+ @@ -65,7 +65,7 @@ rm -rf %{buildroot} %files %defattr(-, root, root, -) -%doc GPL INSTALL TODO README +%doc GPL TODO README %{_sbindir}/%{name} %{_mandir}/man8/%{name}.8* %dir %{_sysconfdir}/%{name} @@ -89,6 +89,9 @@ rm -rf %{buildroot} %endif %changelog +* Sat Dec 11 2010 Thomas Moschny - 0.50-2 +- Don't package INSTALL. + * Wed Oct 27 2010 Thomas Moschny - 0.50-1 - Update to 0.50. - Change %%define -> %%global. From 965a3da124cf310de8ae38250c28922fc6f9c589 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Mon, 3 Jan 2011 13:15:58 +0100 Subject: [PATCH 014/128] - Update to 0.51. - etckeeper has been moved out of sbin. --- .gitignore | 1 + etckeeper.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 5f3de35..fed64c1 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ etckeeper_0.41.tar.gz /etckeeper_0.48.tar.gz /etckeeper_0.49.tar.gz /etckeeper_0.50.tar.gz +/etckeeper_0.51.tar.gz diff --git a/etckeeper.spec b/etckeeper.spec index 6552fe4..fd31849 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -1,8 +1,8 @@ %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") Name: etckeeper -Version: 0.50 -Release: 2%{?dist} +Version: 0.51 +Release: 1%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) Group: Applications/System License: GPLv2+ @@ -66,7 +66,7 @@ rm -rf %{buildroot} %files %defattr(-, root, root, -) %doc GPL TODO README -%{_sbindir}/%{name} +%{_bindir}/%{name} %{_mandir}/man8/%{name}.8* %dir %{_sysconfdir}/%{name} %{_sysconfdir}/%{name}/*.d @@ -89,6 +89,10 @@ rm -rf %{buildroot} %endif %changelog +* Mon Jan 3 2011 Thomas Moschny - 0.51-1 +- Update to 0.51. +- etckeeper has been moved out of sbin. + * Sat Dec 11 2010 Thomas Moschny - 0.50-2 - Don't package INSTALL. diff --git a/sources b/sources index 98ea002..7d71add 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fd272274e38db517288ad0bcb7a9e66d etckeeper_0.50.tar.gz +5e03c515cb0fe8b00b0eb26ca1345b33 etckeeper_0.51.tar.gz From f10450d1cc11cacfdf44b49ca530ea9dca73bd52 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 12:39:36 -0600 Subject: [PATCH 015/128] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- etckeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/etckeeper.spec b/etckeeper.spec index fd31849..574899d 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -2,7 +2,7 @@ Name: etckeeper Version: 0.51 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) Group: Applications/System License: GPLv2+ @@ -89,6 +89,9 @@ rm -rf %{buildroot} %endif %changelog +* Tue Feb 08 2011 Fedora Release Engineering - 0.51-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Mon Jan 3 2011 Thomas Moschny - 0.51-1 - Update to 0.51. - etckeeper has been moved out of sbin. From df51e470de0dc821a3358d10a0cb787388ba4583 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Wed, 9 Feb 2011 12:09:35 +0100 Subject: [PATCH 016/128] Drop unused patch from git. --- etckeeper-0.48-fix_path.patch | 45 ----------------------------------- 1 file changed, 45 deletions(-) delete mode 100644 etckeeper-0.48-fix_path.patch diff --git a/etckeeper-0.48-fix_path.patch b/etckeeper-0.48-fix_path.patch deleted file mode 100644 index ae51274..0000000 --- a/etckeeper-0.48-fix_path.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 60747c8dae14a12263124193572c7eb1177e475b Mon Sep 17 00:00:00 2001 -From: Joey Hess -Date: Sun, 25 Jul 2010 19:47:45 -0400 -Subject: [PATCH 1/1] Ensure that PATH contains the directory containing etckeeper, so that hook scripts that re-exec etckeeper are guaranteed to find it. - ---- - debian/changelog | 7 +++++++ - etckeeper | 6 ++++++ - 2 files changed, 13 insertions(+), 0 deletions(-) - -diff --git a/debian/changelog b/debian/changelog -index 58bdbd1..3ddc0b6 100644 ---- a/debian/changelog -+++ b/debian/changelog -@@ -1,3 +1,10 @@ -+etckeeper (0.49) UNRELEASED; urgency=low -+ -+ * Ensure that PATH contains the directory containing etckeeper, so -+ that hook scripts that re-exec etckeeper are guaranteed to find it. -+ -+ -- Joey Hess Sun, 25 Jul 2010 19:44:37 -0400 -+ - etckeeper (0.48) unstable; urgency=low - - * Fix backwards test for HGUSER. (Mike Rich) -diff --git a/etckeeper b/etckeeper -index 4c27005..d7b94a0 100755 ---- a/etckeeper -+++ b/etckeeper -@@ -25,6 +25,12 @@ export VCS - HOME=~root - export HOME - -+program_directory="${0%/*}" -+if [ -n "$program_directory" ]; then -+ PATH="$PATH:$program_directory" -+ export PATH -+fi -+ - if [ ! -z "$GIT_COMMIT_OPTIONS" ]; then - export GIT_COMMIT_OPTIONS - fi --- -1.7.1 - From cedeb90b072b37661579bd5829f4f71223c6a952 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Thu, 10 Feb 2011 11:44:06 +0100 Subject: [PATCH 017/128] - Update to 0.52. - Include a README.fedora (bz 670934). --- .gitignore | 1 + README.fedora | 22 ++++++++++++++++++++++ etckeeper.spec | 14 ++++++++++---- sources | 2 +- 4 files changed, 34 insertions(+), 5 deletions(-) create mode 100644 README.fedora diff --git a/.gitignore b/.gitignore index fed64c1..3b86587 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ etckeeper_0.41.tar.gz /etckeeper_0.49.tar.gz /etckeeper_0.50.tar.gz /etckeeper_0.51.tar.gz +/etckeeper_0.52.tar.gz diff --git a/README.fedora b/README.fedora new file mode 100644 index 0000000..217d39f --- /dev/null +++ b/README.fedora @@ -0,0 +1,22 @@ +*Please* read the included README, so you understand the security +aspects, and how it all works. + +For the impatient: Run + + etckeeper init + cd /etc + git status + git commit -m 'msg' + +to get etckeeper started. + +Once you do that, the cronjob is in place and it'll do daily +autocommits for you. To disable it, set AVOID_DAILY_AUTOCOMMITS=1 in +/etc/etckeeper/etckeeper.conf. + +There's also a yum plugin enabled that autocommits before and after +each yum transaction. It can be disabled in +/etc/yum/pluginconf.d/etckeeper.conf. + +If you ever want to deinstall etckeeper via yum, disable the plugin +like this: "yum --disableplugin=etckeeper remove etckeeper". diff --git a/etckeeper.spec b/etckeeper.spec index 574899d..4249a12 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -1,13 +1,14 @@ %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") Name: etckeeper -Version: 0.51 -Release: 2%{?dist} +Version: 0.52 +Release: 1%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) Group: Applications/System License: GPLv2+ URL: http://kitenet.net/~joey/code/etckeeper/ Source0: http://ftp.debian.org/debian/pool/main/e/etckeeper/%{name}_%{version}.tar.gz +Source1: README.fedora BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: git >= 1.5.4 @@ -44,7 +45,8 @@ etckeeper with bzr backend, install this package. s|HIGHLEVEL_PACKAGE_MANAGER=apt|HIGHLEVEL_PACKAGE_MANAGER=yum|; s|LOWLEVEL_PACKAGE_MANAGER=dpkg|LOWLEVEL_PACKAGE_MANAGER=rpm|; ' etckeeper.conf -%{__sed} -i -e '1d' yum-etckeeper.py +%{__sed} -i -e '1d' yum-etckeeper.py +cp -av %{SOURCE1} . %build make %{?_smp_mflags} @@ -65,7 +67,7 @@ rm -rf %{buildroot} %files %defattr(-, root, root, -) -%doc GPL TODO README +%doc GPL TODO README README.fedora %{_bindir}/%{name} %{_mandir}/man8/%{name}.8* %dir %{_sysconfdir}/%{name} @@ -89,6 +91,10 @@ rm -rf %{buildroot} %endif %changelog +* Wed Feb 9 2011 Thomas Moschny - 0.52-1 +- Update to 0.52. +- Include a README.fedora (bz 670934). + * Tue Feb 08 2011 Fedora Release Engineering - 0.51-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index 7d71add..0c8e268 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5e03c515cb0fe8b00b0eb26ca1345b33 etckeeper_0.51.tar.gz +ae066abebcef1af93ad3fd15a8e1a2a8 etckeeper_0.52.tar.gz From c027a44422579ea91b2796a13c3476e3a9a6220c Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Thu, 31 Mar 2011 00:13:14 +0200 Subject: [PATCH 018/128] Update to 0.53. Run update-ignore on package upgrade (bz 680632). --- .gitignore | 1 + etckeeper.spec | 11 ++++++++++- sources | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3b86587..9bfa67b 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ etckeeper_0.41.tar.gz /etckeeper_0.50.tar.gz /etckeeper_0.51.tar.gz /etckeeper_0.52.tar.gz +/etckeeper_0.53.tar.gz diff --git a/etckeeper.spec b/etckeeper.spec index 4249a12..79754de 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -1,7 +1,7 @@ %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") Name: etckeeper -Version: 0.52 +Version: 0.53 Release: 1%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) Group: Applications/System @@ -65,6 +65,11 @@ rm -rf %{buildroot} #post #{_sbindir}/%{name} init -d /etc/ +%post +if [ $1 -gt 1 ] ; then + %{_bindir}/%{name} update-ignore +fi + %files %defattr(-, root, root, -) %doc GPL TODO README README.fedora @@ -91,6 +96,10 @@ rm -rf %{buildroot} %endif %changelog +* Mon Mar 28 2011 Thomas Moschny - 0.53-1 +- Update to 0.53. +- Run update-ignore on package upgrade (bz 680632). + * Wed Feb 9 2011 Thomas Moschny - 0.52-1 - Update to 0.52. - Include a README.fedora (bz 670934). diff --git a/sources b/sources index 0c8e268..fe38bd2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ae066abebcef1af93ad3fd15a8e1a2a8 etckeeper_0.52.tar.gz +a5bb4613ce954a03e5db9b9cfff3351a etckeeper_0.53.tar.gz From d05fff596c0c866be8739b8e6f86569c671367a0 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Wed, 1 Jun 2011 01:12:17 +0200 Subject: [PATCH 019/128] - Update to 0.54. - Add patch for bz 709487. --- .gitignore | 1 + etckeeper.spec | 10 +++++++++- sources | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9bfa67b..dae8adf 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ etckeeper_0.41.tar.gz /etckeeper_0.51.tar.gz /etckeeper_0.52.tar.gz /etckeeper_0.53.tar.gz +/etckeeper_0.54.tar.gz diff --git a/etckeeper.spec b/etckeeper.spec index 79754de..43dd6a2 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -1,7 +1,7 @@ %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") Name: etckeeper -Version: 0.53 +Version: 0.54 Release: 1%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) Group: Applications/System @@ -9,6 +9,9 @@ License: GPLv2+ URL: http://kitenet.net/~joey/code/etckeeper/ Source0: http://ftp.debian.org/debian/pool/main/e/etckeeper/%{name}_%{version}.tar.gz Source1: README.fedora +# Upstream commit 394add71: Fix error propagation to yum, which makes +# AVOID_COMMIT_BEFORE_INSTALL work (bz 709487) +Patch0: etckeeper-0.54-yum.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: git >= 1.5.4 @@ -41,6 +44,7 @@ etckeeper with bzr backend, install this package. %prep %setup -q -n %{name} +%patch0 -p1 %{__perl} -pi -e ' s|HIGHLEVEL_PACKAGE_MANAGER=apt|HIGHLEVEL_PACKAGE_MANAGER=yum|; s|LOWLEVEL_PACKAGE_MANAGER=dpkg|LOWLEVEL_PACKAGE_MANAGER=rpm|; @@ -96,6 +100,10 @@ fi %endif %changelog +* Wed Jun 1 2011 Thomas Moschny - 0.54-1 +- Update to 0.54. +- Add patch for bz 709487. + * Mon Mar 28 2011 Thomas Moschny - 0.53-1 - Update to 0.53. - Run update-ignore on package upgrade (bz 680632). diff --git a/sources b/sources index fe38bd2..26fac72 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a5bb4613ce954a03e5db9b9cfff3351a etckeeper_0.53.tar.gz +24b6f924deaa59b2fa4f789bcf2e5dc7 etckeeper_0.54.tar.gz From cae2492044f621e5bba48566a7b4510cdf009867 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Wed, 1 Jun 2011 09:37:08 +0200 Subject: [PATCH 020/128] Add missing patch file. --- etckeeper-0.54-yum.patch | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 etckeeper-0.54-yum.patch diff --git a/etckeeper-0.54-yum.patch b/etckeeper-0.54-yum.patch new file mode 100644 index 0000000..c4965bb --- /dev/null +++ b/etckeeper-0.54-yum.patch @@ -0,0 +1,40 @@ +diff --git a/debian/changelog b/debian/changelog +index f195c9e..77bd3e3 100644 +--- a/debian/changelog ++++ b/debian/changelog +@@ -1,3 +1,11 @@ ++etckeeper (0.55) UNRELEASED; urgency=low ++ ++ * Fix error propigation to yum, which makes AVOID_COMMIT_BEFORE_INSTALL work. ++ Closes: https://bugzilla.redhat.com/show_bug.cgi?id=709487 ++ Thanks, Thomas Moschny ++ ++ -- Joey Hess Tue, 31 May 2011 17:34:54 -0400 ++ + etckeeper (0.54) unstable; urgency=low + + * Ignore inssev's FHS violating /etc/init.d/.depend.* files. +diff --git a/yum-etckeeper.py b/yum-etckeeper.py +index bdf9773..be3c943 100644 +--- a/yum-etckeeper.py ++++ b/yum-etckeeper.py +@@ -18,7 +18,7 @@ import os + from glob import fnmatch + + import yum +-from yum.plugins import TYPE_CORE ++from yum.plugins import PluginYumExit, TYPE_CORE + + requires_api_version = '2.1' + plugin_type = (TYPE_CORE,) +@@ -27,7 +27,9 @@ def pretrans_hook(conduit): + conduit.info(2, 'etckeeper: pre transaction commit') + servicecmd = conduit.confString('main', 'servicecmd', '/usr/bin/etckeeper') + command = '%s %s' % (servicecmd, " pre-install") +- os.system(command) ++ ret = os.system(command) ++ if ret != 0: ++ raise PluginYumExit('etckeeper returned %d' % (ret >> 8)) + + def posttrans_hook(conduit): + conduit.info(2, 'etckeeper: post transaction commit') From 8fe63e5c003e12bd5dd21a3d9456f15df02f61df Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Fri, 24 Jun 2011 23:20:11 +0200 Subject: [PATCH 021/128] Update to 0.55. --- .gitignore | 1 + etckeeper-0.54-yum.patch | 40 ---------------------------------------- etckeeper.spec | 9 ++++----- sources | 2 +- 4 files changed, 6 insertions(+), 46 deletions(-) delete mode 100644 etckeeper-0.54-yum.patch diff --git a/.gitignore b/.gitignore index dae8adf..6bc1fe2 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ etckeeper_0.41.tar.gz /etckeeper_0.52.tar.gz /etckeeper_0.53.tar.gz /etckeeper_0.54.tar.gz +/etckeeper_0.55.tar.gz diff --git a/etckeeper-0.54-yum.patch b/etckeeper-0.54-yum.patch deleted file mode 100644 index c4965bb..0000000 --- a/etckeeper-0.54-yum.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/debian/changelog b/debian/changelog -index f195c9e..77bd3e3 100644 ---- a/debian/changelog -+++ b/debian/changelog -@@ -1,3 +1,11 @@ -+etckeeper (0.55) UNRELEASED; urgency=low -+ -+ * Fix error propigation to yum, which makes AVOID_COMMIT_BEFORE_INSTALL work. -+ Closes: https://bugzilla.redhat.com/show_bug.cgi?id=709487 -+ Thanks, Thomas Moschny -+ -+ -- Joey Hess Tue, 31 May 2011 17:34:54 -0400 -+ - etckeeper (0.54) unstable; urgency=low - - * Ignore inssev's FHS violating /etc/init.d/.depend.* files. -diff --git a/yum-etckeeper.py b/yum-etckeeper.py -index bdf9773..be3c943 100644 ---- a/yum-etckeeper.py -+++ b/yum-etckeeper.py -@@ -18,7 +18,7 @@ import os - from glob import fnmatch - - import yum --from yum.plugins import TYPE_CORE -+from yum.plugins import PluginYumExit, TYPE_CORE - - requires_api_version = '2.1' - plugin_type = (TYPE_CORE,) -@@ -27,7 +27,9 @@ def pretrans_hook(conduit): - conduit.info(2, 'etckeeper: pre transaction commit') - servicecmd = conduit.confString('main', 'servicecmd', '/usr/bin/etckeeper') - command = '%s %s' % (servicecmd, " pre-install") -- os.system(command) -+ ret = os.system(command) -+ if ret != 0: -+ raise PluginYumExit('etckeeper returned %d' % (ret >> 8)) - - def posttrans_hook(conduit): - conduit.info(2, 'etckeeper: post transaction commit') diff --git a/etckeeper.spec b/etckeeper.spec index 43dd6a2..e747618 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -1,7 +1,7 @@ %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") Name: etckeeper -Version: 0.54 +Version: 0.55 Release: 1%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) Group: Applications/System @@ -9,9 +9,6 @@ License: GPLv2+ URL: http://kitenet.net/~joey/code/etckeeper/ Source0: http://ftp.debian.org/debian/pool/main/e/etckeeper/%{name}_%{version}.tar.gz Source1: README.fedora -# Upstream commit 394add71: Fix error propagation to yum, which makes -# AVOID_COMMIT_BEFORE_INSTALL work (bz 709487) -Patch0: etckeeper-0.54-yum.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: git >= 1.5.4 @@ -44,7 +41,6 @@ etckeeper with bzr backend, install this package. %prep %setup -q -n %{name} -%patch0 -p1 %{__perl} -pi -e ' s|HIGHLEVEL_PACKAGE_MANAGER=apt|HIGHLEVEL_PACKAGE_MANAGER=yum|; s|LOWLEVEL_PACKAGE_MANAGER=dpkg|LOWLEVEL_PACKAGE_MANAGER=rpm|; @@ -100,6 +96,9 @@ fi %endif %changelog +* Fri Jun 24 2011 Thomas Moschny - 0.55-1 +- Update to 0.55. + * Wed Jun 1 2011 Thomas Moschny - 0.54-1 - Update to 0.54. - Add patch for bz 709487. diff --git a/sources b/sources index 26fac72..181693d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -24b6f924deaa59b2fa4f789bcf2e5dc7 etckeeper_0.54.tar.gz +db1ea27facf352b5a27024f229b58e12 etckeeper_0.55.tar.gz From 448e48d2a3f9381ce30823b63c1022b38b935d2c Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Thu, 21 Jul 2011 18:14:38 +0200 Subject: [PATCH 022/128] Update to 0.56. --- .gitignore | 1 + etckeeper.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6bc1fe2..55e0fff 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ etckeeper_0.41.tar.gz /etckeeper_0.53.tar.gz /etckeeper_0.54.tar.gz /etckeeper_0.55.tar.gz +/etckeeper_0.56.tar.gz diff --git a/etckeeper.spec b/etckeeper.spec index e747618..e052eab 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -1,7 +1,7 @@ %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") Name: etckeeper -Version: 0.55 +Version: 0.56 Release: 1%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) Group: Applications/System @@ -96,6 +96,9 @@ fi %endif %changelog +* Thu Jul 21 2011 Thomas Moschny - 0.56-1 +- Update to 0.56. + * Fri Jun 24 2011 Thomas Moschny - 0.55-1 - Update to 0.55. diff --git a/sources b/sources index 181693d..5959421 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -db1ea27facf352b5a27024f229b58e12 etckeeper_0.55.tar.gz +15143ecb039db54a45e22f25e5be84ec etckeeper_0.56.tar.gz From c13ab31cb0fd4e544d6cb3079bfa1643391cd67f Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Wed, 17 Aug 2011 11:44:16 +0200 Subject: [PATCH 023/128] Rebuilt for trailing slash bug of rpm-4.9.1 --- etckeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/etckeeper.spec b/etckeeper.spec index e052eab..18f1b19 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -2,7 +2,7 @@ Name: etckeeper Version: 0.56 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) Group: Applications/System License: GPLv2+ @@ -96,6 +96,9 @@ fi %endif %changelog +* Wed Aug 17 2011 Thomas Moschny - 0.56-2 +- Rebuilt for trailing slash bug of rpm-4.9.1 + * Thu Jul 21 2011 Thomas Moschny - 0.56-1 - Update to 0.56. From eeb766f62e7847bb2d8a209f4b6dd42a8a1ff6d5 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Wed, 9 Nov 2011 13:14:15 +0100 Subject: [PATCH 024/128] Update to 0.57. --- .gitignore | 1 + etckeeper.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 55e0fff..055929b 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ etckeeper_0.41.tar.gz /etckeeper_0.54.tar.gz /etckeeper_0.55.tar.gz /etckeeper_0.56.tar.gz +/etckeeper_0.57.tar.gz diff --git a/etckeeper.spec b/etckeeper.spec index 18f1b19..b70815d 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -1,8 +1,8 @@ %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") Name: etckeeper -Version: 0.56 -Release: 2%{?dist} +Version: 0.57 +Release: 1%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) Group: Applications/System License: GPLv2+ @@ -96,6 +96,9 @@ fi %endif %changelog +* Wed Nov 9 2011 Thomas Moschny - 0.57-1 +- Update to 0.57. + * Wed Aug 17 2011 Thomas Moschny - 0.56-2 - Rebuilt for trailing slash bug of rpm-4.9.1 diff --git a/sources b/sources index 5959421..1fecb09 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -15143ecb039db54a45e22f25e5be84ec etckeeper_0.56.tar.gz +759d9445b31a1c51dda25af58b2dabb4 etckeeper_0.57.tar.gz From 66170d89459675e6da27f0f883812c3c39835748 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Thu, 1 Dec 2011 15:07:32 +0100 Subject: [PATCH 025/128] Update to 0.58. --- .gitignore | 1 + etckeeper.spec | 9 ++++----- sources | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 055929b..5f6025a 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ etckeeper_0.41.tar.gz /etckeeper_0.55.tar.gz /etckeeper_0.56.tar.gz /etckeeper_0.57.tar.gz +/etckeeper_0.58.tar.gz diff --git a/etckeeper.spec b/etckeeper.spec index b70815d..6768a7e 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -1,7 +1,7 @@ %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") Name: etckeeper -Version: 0.57 +Version: 0.58 Release: 1%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) Group: Applications/System @@ -61,10 +61,6 @@ make install DESTDIR=%{buildroot} INSTALL="%{__install} -p" %clean rm -rf %{buildroot} -# Users must study the README anyway. -#post -#{_sbindir}/%{name} init -d /etc/ - %post if [ $1 -gt 1 ] ; then %{_bindir}/%{name} update-ignore @@ -96,6 +92,9 @@ fi %endif %changelog +* Thu Dec 1 2011 Thomas Moschny - 0.58-1 +- Update to 0.58. + * Wed Nov 9 2011 Thomas Moschny - 0.57-1 - Update to 0.57. diff --git a/sources b/sources index 1fecb09..470ec91 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -759d9445b31a1c51dda25af58b2dabb4 etckeeper_0.57.tar.gz +75df8ac19a9ee14a914b767089f61a12 etckeeper_0.58.tar.gz From ab784993d53a65cec1b5df97ad9b51c253da391d Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 12 Jan 2012 20:03:03 -0600 Subject: [PATCH 026/128] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- etckeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/etckeeper.spec b/etckeeper.spec index 6768a7e..235efc3 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -2,7 +2,7 @@ Name: etckeeper Version: 0.58 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) Group: Applications/System License: GPLv2+ @@ -92,6 +92,9 @@ fi %endif %changelog +* Fri Jan 13 2012 Fedora Release Engineering - 0.58-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Thu Dec 1 2011 Thomas Moschny - 0.58-1 - Update to 0.58. From 46b38964886dc9703fd75c7b4fd866637ea65cc0 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Fri, 13 Jan 2012 17:32:55 +0100 Subject: [PATCH 027/128] Update to 0.60. --- .gitignore | 1 + etckeeper.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5f6025a..c54b594 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ etckeeper_0.41.tar.gz /etckeeper_0.56.tar.gz /etckeeper_0.57.tar.gz /etckeeper_0.58.tar.gz +/etckeeper_0.60.tar.gz diff --git a/etckeeper.spec b/etckeeper.spec index 235efc3..6d654b2 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -1,8 +1,8 @@ %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") Name: etckeeper -Version: 0.58 -Release: 2%{?dist} +Version: 0.60 +Release: 1%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) Group: Applications/System License: GPLv2+ @@ -92,6 +92,9 @@ fi %endif %changelog +* Fri Jan 13 2012 Thomas Moschny - 0.60-1 +- Update to 0.60. + * Fri Jan 13 2012 Fedora Release Engineering - 0.58-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild diff --git a/sources b/sources index 470ec91..ff932ee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -75df8ac19a9ee14a914b767089f61a12 etckeeper_0.58.tar.gz +62c94491a86d2fc6c730ee33cb25f13a etckeeper_0.60.tar.gz From 7345f87df7e854da142212da73cf62f8e8ef5185 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Tue, 17 Jan 2012 16:58:37 +0100 Subject: [PATCH 028/128] Update to 0.61. --- .gitignore | 1 + etckeeper.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index c54b594..6a13470 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ etckeeper_0.41.tar.gz /etckeeper_0.57.tar.gz /etckeeper_0.58.tar.gz /etckeeper_0.60.tar.gz +/etckeeper_0.61.tar.gz diff --git a/etckeeper.spec b/etckeeper.spec index 6d654b2..58cd720 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -1,7 +1,7 @@ %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") Name: etckeeper -Version: 0.60 +Version: 0.61 Release: 1%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) Group: Applications/System @@ -92,6 +92,9 @@ fi %endif %changelog +* Tue Jan 17 2012 Thomas Moschny - 0.61-1 +- Update to 0.61. + * Fri Jan 13 2012 Thomas Moschny - 0.60-1 - Update to 0.60. diff --git a/sources b/sources index ff932ee..c5b07cb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -62c94491a86d2fc6c730ee33cb25f13a etckeeper_0.60.tar.gz +1f5568f01ebca2546c819c8f5bdfb906 etckeeper_0.61.tar.gz From 8b4b3d2c5098d0db737b732ac2ba6c463700e43a Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Tue, 13 Mar 2012 19:30:03 +0100 Subject: [PATCH 029/128] Update to 0.62. --- .gitignore | 1 + etckeeper.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6a13470..a989c27 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ etckeeper_0.41.tar.gz /etckeeper_0.58.tar.gz /etckeeper_0.60.tar.gz /etckeeper_0.61.tar.gz +/etckeeper_0.62.tar.gz diff --git a/etckeeper.spec b/etckeeper.spec index 58cd720..458eeb3 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -1,7 +1,7 @@ %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") Name: etckeeper -Version: 0.61 +Version: 0.62 Release: 1%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) Group: Applications/System @@ -92,6 +92,9 @@ fi %endif %changelog +* Tue Mar 13 2012 Thomas Moschny - 0.62-1 +- Update to 0.62. + * Tue Jan 17 2012 Thomas Moschny - 0.61-1 - Update to 0.61. diff --git a/sources b/sources index c5b07cb..0338bdd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1f5568f01ebca2546c819c8f5bdfb906 etckeeper_0.61.tar.gz +4b7738882f425c6bae7c99daa965e1de etckeeper_0.62.tar.gz From f3d92f225486dfd1129a2b91d6898e221b103a36 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Tue, 13 Mar 2012 19:55:30 +0100 Subject: [PATCH 030/128] Add missing dependency on perl (bz 798563). --- etckeeper.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/etckeeper.spec b/etckeeper.spec index 458eeb3..033141c 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -2,7 +2,7 @@ Name: etckeeper Version: 0.62 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) Group: Applications/System License: GPLv2+ @@ -12,6 +12,7 @@ Source1: README.fedora BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: git >= 1.5.4 +Requires: perl %description The etckeeper program is a tool to let /etc be stored in a git, @@ -92,6 +93,9 @@ fi %endif %changelog +* Tue Mar 13 2012 Thomas Moschny - 0.62-2 +- Add missing dependency on perl (bz 798563). + * Tue Mar 13 2012 Thomas Moschny - 0.62-1 - Update to 0.62. From c20c38bb0c24a0d622f1bc6a8f1ca09b359be6d6 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Mon, 4 Jun 2012 19:01:11 +0200 Subject: [PATCH 031/128] Update to 0.63. --- .gitignore | 1 + etckeeper.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a989c27..b19f196 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ etckeeper_0.41.tar.gz /etckeeper_0.60.tar.gz /etckeeper_0.61.tar.gz /etckeeper_0.62.tar.gz +/etckeeper_0.63.tar.gz diff --git a/etckeeper.spec b/etckeeper.spec index 033141c..73d05ec 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -1,8 +1,8 @@ %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") Name: etckeeper -Version: 0.62 -Release: 2%{?dist} +Version: 0.63 +Release: 1%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) Group: Applications/System License: GPLv2+ @@ -93,6 +93,9 @@ fi %endif %changelog +* Mon Jun 4 2012 Thomas Moschny - 0.63-1 +- Update to 0.63. + * Tue Mar 13 2012 Thomas Moschny - 0.62-2 - Add missing dependency on perl (bz 798563). diff --git a/sources b/sources index 0338bdd..4073b31 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4b7738882f425c6bae7c99daa965e1de etckeeper_0.62.tar.gz +5178f36358c91052a2381e0a1a41e0ac etckeeper_0.63.tar.gz From 44d365b2182a422108e08bd17f3ff746715e614b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 18 Jul 2012 19:22:42 -0500 Subject: [PATCH 032/128] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- etckeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/etckeeper.spec b/etckeeper.spec index 73d05ec..401e4f7 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -2,7 +2,7 @@ Name: etckeeper Version: 0.63 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) Group: Applications/System License: GPLv2+ @@ -93,6 +93,9 @@ fi %endif %changelog +* Thu Jul 19 2012 Fedora Release Engineering - 0.63-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Mon Jun 4 2012 Thomas Moschny - 0.63-1 - Update to 0.63. From f51246920312977c2cfd7d34eff60f2a3885198c Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Sun, 23 Sep 2012 17:12:42 +0200 Subject: [PATCH 033/128] Update to 0.64. --- .gitignore | 1 + etckeeper.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b19f196..6a2edd6 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ etckeeper_0.41.tar.gz /etckeeper_0.61.tar.gz /etckeeper_0.62.tar.gz /etckeeper_0.63.tar.gz +/etckeeper_0.64.tar.gz diff --git a/etckeeper.spec b/etckeeper.spec index 401e4f7..c316653 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -1,8 +1,8 @@ %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") Name: etckeeper -Version: 0.63 -Release: 2%{?dist} +Version: 0.64 +Release: 1%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) Group: Applications/System License: GPLv2+ @@ -93,6 +93,9 @@ fi %endif %changelog +* Sun Sep 23 2012 Thomas Moschny - 0.64-1 +- Update to 0.64. + * Thu Jul 19 2012 Fedora Release Engineering - 0.63-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index 4073b31..7e21da0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5178f36358c91052a2381e0a1a41e0ac etckeeper_0.63.tar.gz +ddd3229028df8da9af03ec8128cebc9b etckeeper_0.64.tar.gz From 06d3b6c551a52f562adb7fac59444574edc24260 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 15:13:21 -0600 Subject: [PATCH 034/128] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- etckeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/etckeeper.spec b/etckeeper.spec index c316653..8254916 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -2,7 +2,7 @@ Name: etckeeper Version: 0.64 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) Group: Applications/System License: GPLv2+ @@ -93,6 +93,9 @@ fi %endif %changelog +* Wed Feb 13 2013 Fedora Release Engineering - 0.64-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Sun Sep 23 2012 Thomas Moschny - 0.64-1 - Update to 0.64. From 1a389853e26e84c8fbe11c17698e151ca7b703df Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Sat, 11 May 2013 11:36:36 +0200 Subject: [PATCH 035/128] Update to 1.3. --- .gitignore | 1 + etckeeper.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 6a2edd6..6902a2b 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ etckeeper_0.41.tar.gz /etckeeper_0.62.tar.gz /etckeeper_0.63.tar.gz /etckeeper_0.64.tar.gz +/etckeeper_1.3.tar.gz diff --git a/etckeeper.spec b/etckeeper.spec index 8254916..65247d8 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -1,8 +1,8 @@ %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") Name: etckeeper -Version: 0.64 -Release: 2%{?dist} +Version: 1.3 +Release: 1%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) Group: Applications/System License: GPLv2+ @@ -93,6 +93,9 @@ fi %endif %changelog +* Fri May 10 2013 Thomas Moschny - 1.3-1 +- Update to 1.3. + * Wed Feb 13 2013 Fedora Release Engineering - 0.64-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild diff --git a/sources b/sources index 7e21da0..2efbf9f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ddd3229028df8da9af03ec8128cebc9b etckeeper_0.64.tar.gz +f27e5a31a61aa601d9b0d357cc6b46ee etckeeper_1.3.tar.gz From e0680320ae00e5726db6eed0be513e3907cbba21 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Sun, 23 Jun 2013 12:57:50 +0200 Subject: [PATCH 036/128] Update to 1.4. --- .gitignore | 1 + etckeeper.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6902a2b..b760503 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ etckeeper_0.41.tar.gz /etckeeper_0.63.tar.gz /etckeeper_0.64.tar.gz /etckeeper_1.3.tar.gz +/etckeeper_1.4.tar.gz diff --git a/etckeeper.spec b/etckeeper.spec index 65247d8..198fdea 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -1,7 +1,7 @@ %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") Name: etckeeper -Version: 1.3 +Version: 1.4 Release: 1%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) Group: Applications/System @@ -93,6 +93,9 @@ fi %endif %changelog +* Sun Jun 23 2013 Thomas Moschny - 1.4-1 +- Update to 1.4. + * Fri May 10 2013 Thomas Moschny - 1.3-1 - Update to 1.3. diff --git a/sources b/sources index 2efbf9f..67eee42 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f27e5a31a61aa601d9b0d357cc6b46ee etckeeper_1.3.tar.gz +a794c52d53a1f80503ffd9d1fb749db0 etckeeper_1.4.tar.gz From 2b40d1fab622467b1b7c776f0afaac5c77318264 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= Date: Sat, 27 Jul 2013 16:15:38 +0200 Subject: [PATCH 037/128] Add a missing requirement on crontabs to spec file. --- etckeeper.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/etckeeper.spec b/etckeeper.spec index 198fdea..73a86a2 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -2,7 +2,7 @@ Name: etckeeper Version: 1.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) Group: Applications/System License: GPLv2+ @@ -13,6 +13,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: git >= 1.5.4 Requires: perl +Requires: crontabs %description The etckeeper program is a tool to let /etc be stored in a git, @@ -93,6 +94,9 @@ fi %endif %changelog +* Sat Jul 27 2013 Jóhann B. Guðmundsson - 1.4-2 +- Add a missing requirement on crontabs to spec file + * Sun Jun 23 2013 Thomas Moschny - 1.4-1 - Update to 1.4. From b062038e508e859944cf85a4fb914fa7436cb54d Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Sat, 27 Jul 2013 16:18:46 +0200 Subject: [PATCH 038/128] Update to 1.5. --- .gitignore | 1 + etckeeper.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b760503..ac712b4 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ etckeeper_0.41.tar.gz /etckeeper_0.64.tar.gz /etckeeper_1.3.tar.gz /etckeeper_1.4.tar.gz +/etckeeper_1.5.tar.gz diff --git a/etckeeper.spec b/etckeeper.spec index 73a86a2..f299f15 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -1,8 +1,8 @@ %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") Name: etckeeper -Version: 1.4 -Release: 2%{?dist} +Version: 1.5 +Release: 1%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) Group: Applications/System License: GPLv2+ @@ -94,6 +94,9 @@ fi %endif %changelog +* Sat Jul 27 2013 Thomas Moschny - 1.5-1 +- Update to 1.5. + * Sat Jul 27 2013 Jóhann B. Guðmundsson - 1.4-2 - Add a missing requirement on crontabs to spec file diff --git a/sources b/sources index 67eee42..630f483 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a794c52d53a1f80503ffd9d1fb749db0 etckeeper_1.4.tar.gz +332dcd373cf79df1e0f5272ce29344e0 etckeeper_1.5.tar.gz From 649c061eeb69cbfb536346150fec0d05a309dd2b Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Tue, 30 Jul 2013 12:14:23 +0200 Subject: [PATCH 039/128] Update to 1.6. --- .gitignore | 1 + etckeeper.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index ac712b4..801c2ae 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ etckeeper_0.41.tar.gz /etckeeper_1.3.tar.gz /etckeeper_1.4.tar.gz /etckeeper_1.5.tar.gz +/etckeeper_1.6.tar.gz diff --git a/etckeeper.spec b/etckeeper.spec index f299f15..f551903 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -1,7 +1,7 @@ %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") Name: etckeeper -Version: 1.5 +Version: 1.6 Release: 1%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) Group: Applications/System @@ -94,6 +94,9 @@ fi %endif %changelog +* Tue Jul 30 2013 Thomas Moschny - 1.6-1 +- Update to 1.6. + * Sat Jul 27 2013 Thomas Moschny - 1.5-1 - Update to 1.5. diff --git a/sources b/sources index 630f483..ee88bc5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -332dcd373cf79df1e0f5272ce29344e0 etckeeper_1.5.tar.gz +bb5c852df9bc27d6294d8df00dcf87be etckeeper_1.6.tar.gz From 7e1af3f7ffc0b986589beb8bf7a3a889e4370a78 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Sun, 18 Aug 2013 07:44:12 +0200 Subject: [PATCH 040/128] Update to 1.7. --- .gitignore | 1 + etckeeper.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 801c2ae..63d04fd 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ etckeeper_0.41.tar.gz /etckeeper_1.4.tar.gz /etckeeper_1.5.tar.gz /etckeeper_1.6.tar.gz +/etckeeper_1.7.tar.gz diff --git a/etckeeper.spec b/etckeeper.spec index f551903..f7c00b5 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -1,7 +1,7 @@ %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") Name: etckeeper -Version: 1.6 +Version: 1.7 Release: 1%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) Group: Applications/System @@ -94,6 +94,9 @@ fi %endif %changelog +* Sun Aug 18 2013 Thomas Moschny - 1.7-1 +- Update to 1.7. + * Tue Jul 30 2013 Thomas Moschny - 1.6-1 - Update to 1.6. diff --git a/sources b/sources index ee88bc5..5ea47d0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bb5c852df9bc27d6294d8df00dcf87be etckeeper_1.6.tar.gz +a3525676c8b085744f7c40e3ae48b559 etckeeper_1.7.tar.gz From 5e8cc18415204b362aa044e8718da6679955f3b9 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Sun, 18 Aug 2013 07:44:38 +0200 Subject: [PATCH 041/128] Define (if undefined) and use _pkgdocdir macro (rhbz#993741). --- etckeeper.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/etckeeper.spec b/etckeeper.spec index f7c00b5..85409bd 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -1,4 +1,5 @@ %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") +%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} Name: etckeeper Version: 1.7 @@ -28,7 +29,7 @@ The default backend is git, if want to use a another backend please install the appropriate tool (mercurial, darcs or bzr). To use bzr as backend, please also install the %{name}-bzr package. -To start using the package please read %{_docdir}/%{name}-%{version}/README +To start using the package please read %{_pkgdocdir}/README. %package bzr Summary: Support for bzr with etckeeper @@ -96,6 +97,7 @@ fi %changelog * Sun Aug 18 2013 Thomas Moschny - 1.7-1 - Update to 1.7. +- Define (if undefined) and use _pkgdocdir macro (rhbz#993741). * Tue Jul 30 2013 Thomas Moschny - 1.6-1 - Update to 1.6. From 1ddec8e146f241f47b51948ee93e53d49510bfc7 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Thu, 12 Sep 2013 19:21:16 +0200 Subject: [PATCH 042/128] Update to 1.9. --- .gitignore | 1 + etckeeper.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 63d04fd..f7629a7 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ etckeeper_0.41.tar.gz /etckeeper_1.5.tar.gz /etckeeper_1.6.tar.gz /etckeeper_1.7.tar.gz +/etckeeper_1.9.tar.gz diff --git a/etckeeper.spec b/etckeeper.spec index 85409bd..6e6bf9c 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -2,7 +2,7 @@ %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} Name: etckeeper -Version: 1.7 +Version: 1.9 Release: 1%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) Group: Applications/System @@ -95,6 +95,9 @@ fi %endif %changelog +* Thu Sep 12 2013 Thomas Moschny - 1.9-1 +- Update to 1.9. + * Sun Aug 18 2013 Thomas Moschny - 1.7-1 - Update to 1.7. - Define (if undefined) and use _pkgdocdir macro (rhbz#993741). diff --git a/sources b/sources index 5ea47d0..e0e0d69 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a3525676c8b085744f7c40e3ae48b559 etckeeper_1.7.tar.gz +46d1793216750df0a70489d42ca88027 etckeeper_1.9.tar.gz From a32db0ced54f1e2f73ebf666d06cb9ee70d8efdb Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Sat, 9 Nov 2013 13:09:49 +0100 Subject: [PATCH 043/128] Update to 1.10. --- .gitignore | 1 + etckeeper.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f7629a7..fa66afc 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ etckeeper_0.41.tar.gz /etckeeper_1.6.tar.gz /etckeeper_1.7.tar.gz /etckeeper_1.9.tar.gz +/etckeeper_1.10.tar.gz diff --git a/etckeeper.spec b/etckeeper.spec index 6e6bf9c..5e90917 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -2,7 +2,7 @@ %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} Name: etckeeper -Version: 1.9 +Version: 1.10 Release: 1%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) Group: Applications/System @@ -95,6 +95,9 @@ fi %endif %changelog +* Sat Nov 9 2013 Thomas Moschny - 1.10-1 +- Update to 1.10. + * Thu Sep 12 2013 Thomas Moschny - 1.9-1 - Update to 1.9. diff --git a/sources b/sources index e0e0d69..a3699da 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -46d1793216750df0a70489d42ca88027 etckeeper_1.9.tar.gz +8f9376166d97aa3c842223db93ee2889 etckeeper_1.10.tar.gz From 1bc793d4816a2dcc70b621ad83565030fc384112 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Thu, 19 Dec 2013 20:17:33 +0100 Subject: [PATCH 044/128] Update to 1.11. --- .gitignore | 1 + etckeeper.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index fa66afc..9c57aaf 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ etckeeper_0.41.tar.gz /etckeeper_1.7.tar.gz /etckeeper_1.9.tar.gz /etckeeper_1.10.tar.gz +/etckeeper_1.11.tar.gz diff --git a/etckeeper.spec b/etckeeper.spec index 5e90917..2eaad26 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -2,7 +2,7 @@ %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} Name: etckeeper -Version: 1.10 +Version: 1.11 Release: 1%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) Group: Applications/System @@ -95,6 +95,9 @@ fi %endif %changelog +* Thu Dec 19 2013 Thomas Moschny - 1.11-1 +- Update to 1.11. + * Sat Nov 9 2013 Thomas Moschny - 1.10-1 - Update to 1.10. diff --git a/sources b/sources index a3699da..efa2b86 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8f9376166d97aa3c842223db93ee2889 etckeeper_1.10.tar.gz +fd6b8f62593a9ab7664828bad93e7fb2 etckeeper_1.11.tar.gz From 2699e4fc312dae545f55bbf9e76f0c784882a4ed Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 06:03:30 -0500 Subject: [PATCH 045/128] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- etckeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/etckeeper.spec b/etckeeper.spec index 2eaad26..4a2e9de 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -3,7 +3,7 @@ Name: etckeeper Version: 1.11 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) Group: Applications/System License: GPLv2+ @@ -95,6 +95,9 @@ fi %endif %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 1.11-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Thu Dec 19 2013 Thomas Moschny - 1.11-1 - Update to 1.11. From a50714477f8ae9e2930da03e316f43ef14dcb01b Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Mon, 23 Jun 2014 18:27:14 +0200 Subject: [PATCH 046/128] Update to 1.12. - Format README.md. --- .gitignore | 1 + etckeeper.spec | 17 ++++++++++++++--- sources | 2 +- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 9c57aaf..56b9004 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ etckeeper_0.41.tar.gz /etckeeper_1.9.tar.gz /etckeeper_1.10.tar.gz /etckeeper_1.11.tar.gz +/etckeeper_1.12.tar.gz diff --git a/etckeeper.spec b/etckeeper.spec index 4a2e9de..d46d964 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -2,8 +2,8 @@ %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} Name: etckeeper -Version: 1.11 -Release: 2%{?dist} +Version: 1.12 +Release: 1%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) Group: Applications/System License: GPLv2+ @@ -12,6 +12,7 @@ Source0: http://ftp.debian.org/debian/pool/main/e/etckeeper/%{name}_%{version} Source1: README.fedora BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch +BuildRequires: python-markdown Requires: git >= 1.5.4 Requires: perl Requires: crontabs @@ -53,6 +54,12 @@ cp -av %{SOURCE1} . %build make %{?_smp_mflags} +%if 0%{?fedora} || 0%{?rhel} > 6 +# the binary in python-markdown has been renamed +markdown_py README.html +%else +markdown README.html +%endif %install rm -rf %{buildroot} @@ -71,7 +78,7 @@ fi %files %defattr(-, root, root, -) -%doc GPL TODO README README.fedora +%doc GPL TODO README.html README.fedora %{_bindir}/%{name} %{_mandir}/man8/%{name}.8* %dir %{_sysconfdir}/%{name} @@ -95,6 +102,10 @@ fi %endif %changelog +* Sun Jun 22 2014 Thomas Moschny - 1.12-1 +- Update to 1.12. +- Format README.md. + * Sat Jun 07 2014 Fedora Release Engineering - 1.11-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/sources b/sources index efa2b86..2bbb383 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fd6b8f62593a9ab7664828bad93e7fb2 etckeeper_1.11.tar.gz +e4ef0688ac73f508766dd1d8c7b6733f etckeeper_1.12.tar.gz From f78223c00de5010b87de4a54e92a10bbef1ae7b0 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Fri, 15 Aug 2014 17:36:06 +0200 Subject: [PATCH 047/128] Update to 1.13. --- .gitignore | 1 + etckeeper.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 56b9004..76b8b87 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ etckeeper_0.41.tar.gz /etckeeper_1.10.tar.gz /etckeeper_1.11.tar.gz /etckeeper_1.12.tar.gz +/etckeeper_1.13.tar.gz diff --git a/etckeeper.spec b/etckeeper.spec index d46d964..05046ab 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -2,7 +2,7 @@ %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} Name: etckeeper -Version: 1.12 +Version: 1.13 Release: 1%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) Group: Applications/System @@ -102,6 +102,9 @@ fi %endif %changelog +* Fri Aug 15 2014 Thomas Moschny - 1.13-1 +- Update to 1.13. + * Sun Jun 22 2014 Thomas Moschny - 1.12-1 - Update to 1.12. - Format README.md. diff --git a/sources b/sources index 2bbb383..1bb274d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e4ef0688ac73f508766dd1d8c7b6733f etckeeper_1.12.tar.gz +ddaa70577fb212646152be23afd5861b etckeeper_1.13.tar.gz From 72d4fce020dcb948a85cd848cdea4d80899ac1ba Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Fri, 5 Sep 2014 18:03:23 +0200 Subject: [PATCH 048/128] Update to 1.14. --- .gitignore | 1 + etckeeper.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 76b8b87..54d4ec9 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ etckeeper_0.41.tar.gz /etckeeper_1.11.tar.gz /etckeeper_1.12.tar.gz /etckeeper_1.13.tar.gz +/etckeeper_1.14.tar.gz diff --git a/etckeeper.spec b/etckeeper.spec index 05046ab..8ff53fe 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -2,7 +2,7 @@ %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} Name: etckeeper -Version: 1.13 +Version: 1.14 Release: 1%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) Group: Applications/System @@ -102,6 +102,9 @@ fi %endif %changelog +* Fri Sep 5 2014 Thomas Moschny - 1.14-1 +- Update to 1.14. + * Fri Aug 15 2014 Thomas Moschny - 1.13-1 - Update to 1.13. diff --git a/sources b/sources index 1bb274d..c627817 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ddaa70577fb212646152be23afd5861b etckeeper_1.13.tar.gz +c3e2ef83b946b45459347af14c19fa81 etckeeper_1.14.tar.gz From 517cb612242ed934185b0f2e5a52c79177c3a458 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Thu, 18 Dec 2014 21:13:27 +0100 Subject: [PATCH 049/128] Disable bzr plugin on epel5. --- etckeeper.spec | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/etckeeper.spec b/etckeeper.spec index 8ff53fe..a5202ed 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -3,7 +3,7 @@ Name: etckeeper Version: 1.14 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) Group: Applications/System License: GPLv2+ @@ -32,6 +32,7 @@ To use bzr as backend, please also install the %{name}-bzr package. To start using the package please read %{_pkgdocdir}/README. +%if 0%{?fedora} || 0%{?rhel} > 5 %package bzr Summary: Support for bzr with etckeeper Group: Applications/System @@ -42,6 +43,7 @@ BuildRequires: python-devel %description bzr This package provides a bzr backend for etckeeper, if you want to use etckeeper with bzr backend, install this package. +%endif %prep %setup -q -n %{name} @@ -66,7 +68,12 @@ rm -rf %{buildroot} make install DESTDIR=%{buildroot} INSTALL="%{__install} -p" %{__install} -D -p debian/cron.daily %{buildroot}%{_sysconfdir}/cron.daily/%{name} %{__install} -d %{buildroot}%{_localstatedir}/cache/%{name} +%if 0%{?fedora} || 0%{?rhel} > 5 %{__sed} -i -e '1d' %{buildroot}%{python_sitelib}/bzrlib/plugins/%{name}/__init__.py +%else +rm -rf %{buildroot}%{python_sitelib}/bzrlib/plugins/%{name} +rm -rf %{buildroot}%{python_sitelib}/bzr_%{name}-*.egg-info +%endif %clean rm -rf %{buildroot} @@ -93,15 +100,18 @@ fi %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/%{name}.conf %{_localstatedir}/cache/%{name} +%if 0%{?fedora} || 0%{?rhel} > 5 %files bzr %defattr(-, root, root, -) %doc GPL %{python_sitelib}/bzrlib/plugins/%{name} -%if 0%{?fedora} || 0%{?rhel} > 5 %{python_sitelib}/bzr_%{name}-*.egg-info %endif %changelog +* Thu Dec 18 2014 Thomas Moschny - 1.14-2 +- Disable bzr plugin on epel5. + * Fri Sep 5 2014 Thomas Moschny - 1.14-1 - Update to 1.14. From 2da25fa5b8498928c0500a53aabd25f9c8c51fd3 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Thu, 26 Mar 2015 12:04:13 +0100 Subject: [PATCH 050/128] Update to 1.18. - Update upstream URLs. - Package DNF plugin. - Slightly modernize spec file. --- .gitignore | 1 + ...eeper-makefile-remove-python-plugins.patch | 30 ++++ etckeeper.spec | 168 +++++++++++++++--- sources | 2 +- 4 files changed, 171 insertions(+), 30 deletions(-) create mode 100644 etckeeper-makefile-remove-python-plugins.patch diff --git a/.gitignore b/.gitignore index 54d4ec9..04e5dd0 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ etckeeper_0.41.tar.gz /etckeeper_1.12.tar.gz /etckeeper_1.13.tar.gz /etckeeper_1.14.tar.gz +/etckeeper_1.16.tar.gz diff --git a/etckeeper-makefile-remove-python-plugins.patch b/etckeeper-makefile-remove-python-plugins.patch new file mode 100644 index 0000000..9c81f01 --- /dev/null +++ b/etckeeper-makefile-remove-python-plugins.patch @@ -0,0 +1,30 @@ +diff -up etckeeper-1.18/Makefile.orig etckeeper-1.18/Makefile +--- etckeeper-1.18/Makefile.orig 2015-03-20 16:53:23.681037197 +0100 ++++ etckeeper-1.18/Makefile 2015-03-20 16:56:28.697621078 +0100 +@@ -13,11 +13,8 @@ CP=cp -R + INSTALL=install + INSTALL_EXE=${INSTALL} + INSTALL_DATA=${INSTALL} -m 0644 +-PYTHON=python + + build: etckeeper.spec etckeeper.version +- -$(PYTHON) ./etckeeper-bzr/__init__.py build || echo "** bzr support not built" +- -$(PYTHON) ./etckeeper-dnf/etckeeper.py build || echo "** DNF support not built" + + install: etckeeper.version + mkdir -p $(DESTDIR)$(etcdir)/etckeeper/ $(DESTDIR)$(vardir)/cache/etckeeper/ +@@ -45,14 +42,10 @@ ifeq ($(HIGHLEVEL_PACKAGE_MANAGER),yum) + mkdir -p $(DESTDIR)$(etcdir)/yum/pluginconf.d + $(INSTALL_DATA) yum-etckeeper.conf $(DESTDIR)$(etcdir)/yum/pluginconf.d/etckeeper.conf + endif +-ifeq ($(HIGHLEVEL_PACKAGE_MANAGER),dnf) +- -$(PYTHON) ./etckeeper-dnf/etckeeper.py install --root=$(DESTDIR) ${PYTHON_INSTALL_OPTS} || echo "** DNF support not installed" +-endif + ifeq ($(HIGHLEVEL_PACKAGE_MANAGER),zypper) + mkdir -p $(DESTDIR)$(prefix)/lib/zypp/plugins/commit + $(INSTALL) zypper-etckeeper.py $(DESTDIR)$(prefix)/lib/zypp/plugins/commit/zypper-etckeeper.py + endif +- -$(PYTHON) ./etckeeper-bzr/__init__.py install --root=$(DESTDIR) ${PYTHON_INSTALL_OPTS} || echo "** bzr support not installed" + echo "** installation successful" + + clean: etckeeper.spec etckeeper.version diff --git a/etckeeper.spec b/etckeeper.spec index a5202ed..46eac41 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -1,15 +1,40 @@ -%global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") +%if 0%{?rhel} && 0%{?rhel} <= 6 +%{!?__python2: %global __python2 /usr/bin/python2} +%{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} +%endif + %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} +%if 0%{?fedora} || 0%{?rhel} > 5 +%global with_bzr 1 +%else +%global with_bzr 0 +%endif + +%if 0%{?fedora} +# enable for epel7 later +%global with_dnf 1 +%if 0%{fedora} >= 23 +%global dnf_uses_python3 1 +%global __python_dnf %{__python3} +%else +%global dnf_uses_python3 0 +%global __python_dnf %{__python2} +%endif +%else +%global with_dnf 0 +%endif + Name: etckeeper -Version: 1.14 -Release: 2%{?dist} +Version: 1.18 +Release: 1%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) Group: Applications/System License: GPLv2+ -URL: http://kitenet.net/~joey/code/etckeeper/ -Source0: http://ftp.debian.org/debian/pool/main/e/etckeeper/%{name}_%{version}.tar.gz +URL: http://etckeeper.branchable.com/ +Source0: https://github.com/joeyh/etckeeper/archive/%{version}/%{name}-%{version}.tar.gz Source1: README.fedora +Patch0: etckeeper-makefile-remove-python-plugins.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-markdown @@ -32,30 +57,75 @@ To use bzr as backend, please also install the %{name}-bzr package. To start using the package please read %{_pkgdocdir}/README. -%if 0%{?fedora} || 0%{?rhel} > 5 + +%if 0%{?with_bzr} %package bzr Summary: Support for bzr with etckeeper Group: Applications/System -Requires: %{name} = %{version}-%{release} bzr +BuildRequires: python2-devel BuildRequires: bzr -BuildRequires: python-devel +Requires: %{name} = %{version}-%{release} +Requires: bzr %description bzr This package provides a bzr backend for etckeeper, if you want to use etckeeper with bzr backend, install this package. -%endif +%endif # with_bzr + + +%if 0%{?with_dnf} +%package dnf +Summary: DNF plugin for etckeeper support +Group: Applications/System +BuildRequires: python2-devel +BuildRequires: dnf +BuildRequires: dnf-plugins-core +Requires: %{name} = %{version}-%{release} +Requires: dnf +Requires: dnf-plugins-core + +%description dnf +This package provides a DNF plugin for etckeeper. If you want to use +etckeeper with DNF, install this package. +%endif # with_dnf + %prep -%setup -q -n %{name} -%{__perl} -pi -e ' - s|HIGHLEVEL_PACKAGE_MANAGER=apt|HIGHLEVEL_PACKAGE_MANAGER=yum|; - s|LOWLEVEL_PACKAGE_MANAGER=dpkg|LOWLEVEL_PACKAGE_MANAGER=rpm|; - ' etckeeper.conf -%{__sed} -i -e '1d' yum-etckeeper.py +%setup -q +%patch0 -p1 +sed -e 's|HIGHLEVEL_PACKAGE_MANAGER=apt|HIGHLEVEL_PACKAGE_MANAGER=yum|' \ + -e 's|LOWLEVEL_PACKAGE_MANAGER=dpkg|LOWLEVEL_PACKAGE_MANAGER=rpm|' \ + -i etckeeper.conf +sed -e 's|^prefix=.*|prefix=%{_prefix}|' \ + -e 's|^bindir=.*|bindir=%{_bindir}|' \ + -e 's|^etcdir=.*|etcdir=%{_sysconfdir}|' \ + -e 's|^mandir=.*|mandir=%{_mandir}|' \ + -e 's|^vardir=.*|vardir=%{_localstatedir}|' \ + -e 's|^INSTALL=.*|INSTALL=install -p|' \ + -e 's|^CP=.*|CP=cp -pR|' \ + -i Makefile +# move each plugin in its own subdirectory, so each has its own build/ +# directory +mkdir bzr-plugin ; mv etckeeper-bzr bzr-plugin +mkdir dnf-plugin ; mv etckeeper-dnf dnf-plugin cp -av %{SOURCE1} . + %build make %{?_smp_mflags} + +%if 0%{?with_bzr} +pushd bzr-plugin +%{__python2} etckeeper-bzr/__init__.py build +popd +%endif + +%if 0%{?with_dnf} +pushd dnf-plugin +%{__python_dnf} etckeeper-dnf/etckeeper.py build +popd +%endif + %if 0%{?fedora} || 0%{?rhel} > 6 # the binary in python-markdown has been renamed markdown_py README.html @@ -63,29 +133,45 @@ markdown_py README.html markdown README.html %endif + %install rm -rf %{buildroot} -make install DESTDIR=%{buildroot} INSTALL="%{__install} -p" -%{__install} -D -p debian/cron.daily %{buildroot}%{_sysconfdir}/cron.daily/%{name} -%{__install} -d %{buildroot}%{_localstatedir}/cache/%{name} -%if 0%{?fedora} || 0%{?rhel} > 5 -%{__sed} -i -e '1d' %{buildroot}%{python_sitelib}/bzrlib/plugins/%{name}/__init__.py -%else -rm -rf %{buildroot}%{python_sitelib}/bzrlib/plugins/%{name} -rm -rf %{buildroot}%{python_sitelib}/bzr_%{name}-*.egg-info +make install DESTDIR=%{buildroot} + +%if 0%{?with_bzr} +pushd bzr-plugin +%{__python2} etckeeper-bzr/__init__.py install -O1 --skip-build --root %{buildroot} +popd %endif +%if 0%{?with_dnf} +pushd dnf-plugin +%{__python_dnf} etckeeper-dnf/etckeeper.py install -O1 --skip-build --root %{buildroot} +popd +%endif + +install -D -p debian/cron.daily %{buildroot}%{_sysconfdir}/cron.daily/%{name} +install -d %{buildroot}%{_localstatedir}/cache/%{name} + + %clean rm -rf %{buildroot} + %post if [ $1 -gt 1 ] ; then %{_bindir}/%{name} update-ignore fi + %files %defattr(-, root, root, -) -%doc GPL TODO README.html README.fedora +%doc README.html README.fedora +%if 0%{?_licensedir:1} +%license GPL +%else +%doc GPL +%endif # licensedir %{_bindir}/%{name} %{_mandir}/man8/%{name}.8* %dir %{_sysconfdir}/%{name} @@ -100,15 +186,39 @@ fi %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/%{name}.conf %{_localstatedir}/cache/%{name} -%if 0%{?fedora} || 0%{?rhel} > 5 + +%if 0%{?with_bzr} %files bzr %defattr(-, root, root, -) -%doc GPL -%{python_sitelib}/bzrlib/plugins/%{name} -%{python_sitelib}/bzr_%{name}-*.egg-info -%endif +%{python2_sitelib}/bzrlib/plugins/%{name} +%{python2_sitelib}/bzr_%{name}-*.egg-info +%endif # with_bzr + + +%if 0%{?with_dnf} +%files dnf +%defattr(-, root, root, -) +%if 0%{?dnf_uses_python3} +%{python3_sitelib}/dnf-plugins/%{name}.py +%exclude %{python3_sitelib}/dnf-plugins/__init__.py +%{python3_sitelib}/dnf-plugins/__pycache__/%{name}.* +%exclude %{python3_sitelib}/dnf-plugins/__pycache__/__init__.* +%{python3_sitelib}/dnf_%{name}-*.egg-info +%else +%{python2_sitelib}/dnf-plugins/%{name}.py* +%exclude %{python2_sitelib}/dnf-plugins/__init__.py* +%{python2_sitelib}/dnf_%{name}-*.egg-info +%endif # dnf_uses_python3 +%endif # with_dnf + %changelog +* Fri Mar 20 2015 Thomas Moschny - 1.18-1 +- Update to 1.18. +- Update upstream URLs. +- Package DNF plugin. +- Slightly modernize spec file. + * Thu Dec 18 2014 Thomas Moschny - 1.14-2 - Disable bzr plugin on epel5. diff --git a/sources b/sources index c627817..e8dc104 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c3e2ef83b946b45459347af14c19fa81 etckeeper_1.14.tar.gz +cfdf340f7dc2c072a13d0a09ee560cb8 etckeeper-1.18.tar.gz From e5a09baa2747c751d240dbceccff5114507abcbf Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Thu, 26 Mar 2015 16:28:38 +0100 Subject: [PATCH 051/128] Update to 0.18.1. --- .gitignore | 1 + etckeeper.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 04e5dd0..53071c3 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ etckeeper_0.41.tar.gz /etckeeper_1.13.tar.gz /etckeeper_1.14.tar.gz /etckeeper_1.16.tar.gz +/etckeeper-1.18.1.tar.gz diff --git a/etckeeper.spec b/etckeeper.spec index 46eac41..c382789 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -26,7 +26,7 @@ %endif Name: etckeeper -Version: 1.18 +Version: 1.18.1 Release: 1%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) Group: Applications/System @@ -213,6 +213,9 @@ fi %changelog +* Thu Mar 26 2015 Thomas Moschny - 1.18.1-1 +- Update to 0.18.1. + * Fri Mar 20 2015 Thomas Moschny - 1.18-1 - Update to 1.18. - Update upstream URLs. diff --git a/sources b/sources index e8dc104..999000f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cfdf340f7dc2c072a13d0a09ee560cb8 etckeeper-1.18.tar.gz +4d85e0a41ca34db7916727b7a31ed2d0 etckeeper-1.18.1.tar.gz From 0234808277eb8eaa849ac9ff625e518f33a4e576 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Thu, 26 Mar 2015 16:48:52 +0100 Subject: [PATCH 052/128] Add missing dependency on python3-devel for dnf plugin on F23+. --- etckeeper.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/etckeeper.spec b/etckeeper.spec index c382789..d786e2d 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -77,7 +77,11 @@ etckeeper with bzr backend, install this package. %package dnf Summary: DNF plugin for etckeeper support Group: Applications/System +%if 0%{?dnf_uses_python3} +BuildRequires: python3-devel +%else BuildRequires: python2-devel +%endif # dnf_uses_python3 BuildRequires: dnf BuildRequires: dnf-plugins-core Requires: %{name} = %{version}-%{release} @@ -215,6 +219,7 @@ fi %changelog * Thu Mar 26 2015 Thomas Moschny - 1.18.1-1 - Update to 0.18.1. +- Add missing dependency on python3-devel for dnf plugin on F23+. * Fri Mar 20 2015 Thomas Moschny - 1.18-1 - Update to 1.18. From dd5090b826579fe80fae98c2b7b0fe2effa0ffdf Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Thu, 23 Apr 2015 18:58:05 +0200 Subject: [PATCH 053/128] Fix markdown generation (rhbz#1213776). --- etckeeper.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/etckeeper.spec b/etckeeper.spec index d786e2d..1e7044a 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -27,7 +27,7 @@ Name: etckeeper Version: 1.18.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) Group: Applications/System License: GPLv2+ @@ -132,9 +132,9 @@ popd %if 0%{?fedora} || 0%{?rhel} > 6 # the binary in python-markdown has been renamed -markdown_py README.html +markdown_py -f README.html README.md %else -markdown README.html +markdown -f README.html README.md %endif @@ -217,6 +217,9 @@ fi %changelog +* Thu Apr 23 2015 Thomas Moschny - 1.18.1-2 +- Fix markdown generation (rhbz#1213776). + * Thu Mar 26 2015 Thomas Moschny - 1.18.1-1 - Update to 0.18.1. - Add missing dependency on python3-devel for dnf plugin on F23+. From c65165e442099a4938f30317adc32f80f9b12e0d Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 05:47:34 +0000 Subject: [PATCH 054/128] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- etckeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/etckeeper.spec b/etckeeper.spec index 1e7044a..ebbcdd2 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -27,7 +27,7 @@ Name: etckeeper Version: 1.18.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) Group: Applications/System License: GPLv2+ @@ -217,6 +217,9 @@ fi %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 1.18.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Thu Apr 23 2015 Thomas Moschny - 1.18.1-2 - Fix markdown generation (rhbz#1213776). From d19b462968b192470ec0fa9f3e939addf60ed50e Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Sat, 24 Oct 2015 15:59:37 +0200 Subject: [PATCH 055/128] Update to etckeeper 1.18.2. - Depend on dnf for F22+ (rhbz#1229131). - Minor changelog fixes. --- .gitignore | 1 + etckeeper.spec | 21 ++++++++++++++++----- sources | 2 +- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 53071c3..cef0752 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ etckeeper_0.41.tar.gz /etckeeper_1.14.tar.gz /etckeeper_1.16.tar.gz /etckeeper-1.18.1.tar.gz +/etckeeper-1.18.2.tar.gz diff --git a/etckeeper.spec b/etckeeper.spec index ebbcdd2..7648bd0 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -12,8 +12,11 @@ %endif %if 0%{?fedora} -# enable for epel7 later +# todo: enable dnf for epel7 later %global with_dnf 1 +%if 0%{fedora} >= 22 +%global dnf_is_mandatory 1 +%endif %if 0%{fedora} >= 23 %global dnf_uses_python3 1 %global __python_dnf %{__python3} @@ -26,8 +29,8 @@ %endif Name: etckeeper -Version: 1.18.1 -Release: 3%{?dist} +Version: 1.18.2 +Release: 1%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) Group: Applications/System License: GPLv2+ @@ -41,6 +44,9 @@ BuildRequires: python-markdown Requires: git >= 1.5.4 Requires: perl Requires: crontabs +%if 0%{?dnf_is_mandatory} +Requires: %{name}-dnf = %{version}-%{release} +%endif # dnf_is_mandatory %description The etckeeper program is a tool to let /etc be stored in a git, @@ -217,14 +223,19 @@ fi %changelog +* Sat Oct 24 2015 Thomas Moschny - 1.18.2-1 +- Update to etckeeper 1.18.2. +- Depend on dnf for F22+ (rhbz#1229131). +- Minor changelog fixes. + * Wed Jun 17 2015 Fedora Release Engineering - 1.18.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild * Thu Apr 23 2015 Thomas Moschny - 1.18.1-2 -- Fix markdown generation (rhbz#1213776). +- Fix HTML generation from markdown (rhbz#1213776). * Thu Mar 26 2015 Thomas Moschny - 1.18.1-1 -- Update to 0.18.1. +- Update to 1.18.1. - Add missing dependency on python3-devel for dnf plugin on F23+. * Fri Mar 20 2015 Thomas Moschny - 1.18-1 diff --git a/sources b/sources index 999000f..57642e9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4d85e0a41ca34db7916727b7a31ed2d0 etckeeper-1.18.1.tar.gz +f4217adc1e1a19a03222af76a0a5bffc etckeeper-1.18.2.tar.gz From f1275c9e264de520364f64d562e9a63ffbf702df Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 10 Nov 2015 14:18:08 +0000 Subject: [PATCH 056/128] - Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 --- etckeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/etckeeper.spec b/etckeeper.spec index 7648bd0..ae23045 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -30,7 +30,7 @@ Name: etckeeper Version: 1.18.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) Group: Applications/System License: GPLv2+ @@ -223,6 +223,9 @@ fi %changelog +* Tue Nov 10 2015 Fedora Release Engineering - 1.18.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 + * Sat Oct 24 2015 Thomas Moschny - 1.18.2-1 - Update to etckeeper 1.18.2. - Depend on dnf for F22+ (rhbz#1229131). From 8b19fc2ae63adb379a2444445152289eac3490df Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 20:04:38 +0000 Subject: [PATCH 057/128] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- etckeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/etckeeper.spec b/etckeeper.spec index ae23045..fab7a89 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -30,7 +30,7 @@ Name: etckeeper Version: 1.18.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) Group: Applications/System License: GPLv2+ @@ -223,6 +223,9 @@ fi %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 1.18.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Tue Nov 10 2015 Fedora Release Engineering - 1.18.2-2 - Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 From 40c0515d3a2e6662bb9b6e773361aa220526e7b7 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Wed, 3 Feb 2016 22:26:53 +0100 Subject: [PATCH 058/128] Do not own /etc/bash_completion.d on Fedora and EPEL>=7. - Drop %defattr. --- .gitignore | 33 ++------------------------------- etckeeper.spec | 13 ++++++++----- 2 files changed, 10 insertions(+), 36 deletions(-) diff --git a/.gitignore b/.gitignore index cef0752..171ced7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,31 +1,2 @@ -etckeeper_0.41.tar.gz -/etckeeper_0.48.tar.gz -/etckeeper_0.49.tar.gz -/etckeeper_0.50.tar.gz -/etckeeper_0.51.tar.gz -/etckeeper_0.52.tar.gz -/etckeeper_0.53.tar.gz -/etckeeper_0.54.tar.gz -/etckeeper_0.55.tar.gz -/etckeeper_0.56.tar.gz -/etckeeper_0.57.tar.gz -/etckeeper_0.58.tar.gz -/etckeeper_0.60.tar.gz -/etckeeper_0.61.tar.gz -/etckeeper_0.62.tar.gz -/etckeeper_0.63.tar.gz -/etckeeper_0.64.tar.gz -/etckeeper_1.3.tar.gz -/etckeeper_1.4.tar.gz -/etckeeper_1.5.tar.gz -/etckeeper_1.6.tar.gz -/etckeeper_1.7.tar.gz -/etckeeper_1.9.tar.gz -/etckeeper_1.10.tar.gz -/etckeeper_1.11.tar.gz -/etckeeper_1.12.tar.gz -/etckeeper_1.13.tar.gz -/etckeeper_1.14.tar.gz -/etckeeper_1.16.tar.gz -/etckeeper-1.18.1.tar.gz -/etckeeper-1.18.2.tar.gz +/etckeeper_*.tar.gz +/etckeeper-*.tar.gz diff --git a/etckeeper.spec b/etckeeper.spec index fab7a89..1cc18aa 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -30,7 +30,7 @@ Name: etckeeper Version: 1.18.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) Group: Applications/System License: GPLv2+ @@ -175,7 +175,6 @@ fi %files -%defattr(-, root, root, -) %doc README.html README.fedora %if 0%{?_licensedir:1} %license GPL @@ -188,8 +187,10 @@ fi %{_sysconfdir}/%{name}/*.d %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf %{_sysconfdir}/cron.daily/%{name} +%if !(0%{?fedora} || 0%{?rhel} >= 7) %dir %{_sysconfdir}/bash_completion.d -%config(noreplace) %{_sysconfdir}/bash_completion.d/%{name} +%endif +%{_sysconfdir}/bash_completion.d/%{name} %dir %{_prefix}/lib/yum-plugins %{_prefix}/lib/yum-plugins/%{name}.* %dir %{_sysconfdir}/yum/pluginconf.d @@ -199,7 +200,6 @@ fi %if 0%{?with_bzr} %files bzr -%defattr(-, root, root, -) %{python2_sitelib}/bzrlib/plugins/%{name} %{python2_sitelib}/bzr_%{name}-*.egg-info %endif # with_bzr @@ -207,7 +207,6 @@ fi %if 0%{?with_dnf} %files dnf -%defattr(-, root, root, -) %if 0%{?dnf_uses_python3} %{python3_sitelib}/dnf-plugins/%{name}.py %exclude %{python3_sitelib}/dnf-plugins/__init__.py @@ -223,6 +222,10 @@ fi %changelog +* Wed Feb 3 2016 Thomas Moschny - 1.18.2-4 +- Do not own /etc/bash_completion.d on Fedora and EPEL>=7. +- Drop %%defattr. + * Wed Feb 03 2016 Fedora Release Engineering - 1.18.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From a5a2fe225e70ed08fa80fa21b0e538391dcbaf74 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Mon, 22 Feb 2016 18:28:10 +0100 Subject: [PATCH 059/128] Update to 1.18.3. - Bash completions have been moved to /usr/share/bash-completion. --- etckeeper.spec | 15 +++++++++------ sources | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/etckeeper.spec b/etckeeper.spec index 1cc18aa..a2d6e4f 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -29,8 +29,8 @@ %endif Name: etckeeper -Version: 1.18.2 -Release: 4%{?dist} +Version: 1.18.3 +Release: 1%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) Group: Applications/System License: GPLv2+ @@ -187,10 +187,9 @@ fi %{_sysconfdir}/%{name}/*.d %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf %{_sysconfdir}/cron.daily/%{name} -%if !(0%{?fedora} || 0%{?rhel} >= 7) -%dir %{_sysconfdir}/bash_completion.d -%endif -%{_sysconfdir}/bash_completion.d/%{name} +%dir %{_datadir}/bash-completion +%dir %{_datadir}/bash-completion/completions +%{_datadir}/bash-completion/completions/%{name} %dir %{_prefix}/lib/yum-plugins %{_prefix}/lib/yum-plugins/%{name}.* %dir %{_sysconfdir}/yum/pluginconf.d @@ -222,6 +221,10 @@ fi %changelog +* Mon Feb 22 2016 Thomas Moschny - 1.18.3-1 +- Update to 1.18.3. +- Bash completions have been moved to /usr/share/bash-completion. + * Wed Feb 3 2016 Thomas Moschny - 1.18.2-4 - Do not own /etc/bash_completion.d on Fedora and EPEL>=7. - Drop %%defattr. diff --git a/sources b/sources index 57642e9..a1a0ca6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f4217adc1e1a19a03222af76a0a5bffc etckeeper-1.18.2.tar.gz +570ddf024b8c0621e7b8a33478016c68 etckeeper-1.18.3.tar.gz From f55706d2f209f549f61ed32f9ccb841219480a84 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Wed, 2 Mar 2016 19:05:14 +0100 Subject: [PATCH 060/128] Move completion file back to /etc/bash_completion.d on EPEL<7. --- etckeeper.spec | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/etckeeper.spec b/etckeeper.spec index a2d6e4f..84bfa4f 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -30,7 +30,7 @@ Name: etckeeper Version: 1.18.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) Group: Applications/System License: GPLv2+ @@ -163,6 +163,13 @@ popd install -D -p debian/cron.daily %{buildroot}%{_sysconfdir}/cron.daily/%{name} install -d %{buildroot}%{_localstatedir}/cache/%{name} +# on RHEL < 7, move the completion file back to /etc/bash_completion.d +%if !(0%{?fedora} || 0%{?rhel} >= 7) +install -d %{buildroot}%{_sysconfdir}/bash_completion.d +mv %{buildroot}%{_datadir}/bash-completion/completions/%{name} \ + %{buildroot}%{_sysconfdir}/bash_completion.d/%{name} +%endif + %clean rm -rf %{buildroot} @@ -187,9 +194,14 @@ fi %{_sysconfdir}/%{name}/*.d %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf %{_sysconfdir}/cron.daily/%{name} +%if 0%{?fedora} || 0%{?rhel} >= 7 %dir %{_datadir}/bash-completion %dir %{_datadir}/bash-completion/completions %{_datadir}/bash-completion/completions/%{name} +%else +%dir %{_sysconfdir}/bash_completion.d +%{_sysconfdir}/bash_completion.d/%{name} +%endif %dir %{_prefix}/lib/yum-plugins %{_prefix}/lib/yum-plugins/%{name}.* %dir %{_sysconfdir}/yum/pluginconf.d @@ -221,6 +233,9 @@ fi %changelog +* Wed Mar 2 2016 Thomas Moschny - 1.18.3-2 +- Move completion file back to /etc/bash_completion.d on EPEL<7. + * Mon Feb 22 2016 Thomas Moschny - 1.18.3-1 - Update to 1.18.3. - Bash completions have been moved to /usr/share/bash-completion. From 32b198d5e1050525fab41b3771ba085cdaac10d0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 19 Jul 2016 07:01:24 +0000 Subject: [PATCH 061/128] - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages --- etckeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/etckeeper.spec b/etckeeper.spec index 84bfa4f..724963f 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -30,7 +30,7 @@ Name: etckeeper Version: 1.18.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) Group: Applications/System License: GPLv2+ @@ -233,6 +233,9 @@ fi %changelog +* Tue Jul 19 2016 Fedora Release Engineering - 1.18.3-3 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + * Wed Mar 2 2016 Thomas Moschny - 1.18.3-2 - Move completion file back to /etc/bash_completion.d on EPEL<7. From d6da311c929828dce6238dd843100bd36c4182f2 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Tue, 23 Aug 2016 12:04:54 +0200 Subject: [PATCH 062/128] Update to 1.18.5. --- etckeeper.spec | 91 +++++++++++++++++++++++++++++++++++++++----------- sources | 2 +- 2 files changed, 73 insertions(+), 20 deletions(-) diff --git a/etckeeper.spec b/etckeeper.spec index 724963f..eaa221a 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -7,30 +7,25 @@ %if 0%{?fedora} || 0%{?rhel} > 5 %global with_bzr 1 -%else -%global with_bzr 0 %endif %if 0%{?fedora} -# todo: enable dnf for epel7 later %global with_dnf 1 -%if 0%{fedora} >= 22 %global dnf_is_mandatory 1 -%endif -%if 0%{fedora} >= 23 %global dnf_uses_python3 1 -%global __python_dnf %{__python3} -%else -%global dnf_uses_python3 0 -%global __python_dnf %{__python2} %endif -%else -%global with_dnf 0 + +%if 0%{?rhel} >= 7 +%global with_dnf 1 +%endif + +%if 0%{?fedora} || 0%{?rhel} >= 7 +%global with_systemd 1 %endif Name: etckeeper -Version: 1.18.3 -Release: 3%{?dist} +Version: 1.18.5 +Release: 1%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) Group: Applications/System License: GPLv2+ @@ -47,6 +42,12 @@ Requires: crontabs %if 0%{?dnf_is_mandatory} Requires: %{name}-dnf = %{version}-%{release} %endif # dnf_is_mandatory +%if 0%{?with_systemd} +BuildRequires: systemd +Requires(post): systemd +Requires(preun): systemd +Requires(postun): systemd +%endif # with_systemd %description The etckeeper program is a tool to let /etc be stored in a git, @@ -103,8 +104,10 @@ etckeeper with DNF, install this package. %prep %setup -q %patch0 -p1 -sed -e 's|HIGHLEVEL_PACKAGE_MANAGER=apt|HIGHLEVEL_PACKAGE_MANAGER=yum|' \ - -e 's|LOWLEVEL_PACKAGE_MANAGER=dpkg|LOWLEVEL_PACKAGE_MANAGER=rpm|' \ +# we set yum here, so the yum plugin gets built, and change that to +# dnf later, if needed +sed -e 's|HIGHLEVEL_PACKAGE_MANAGER=.*|HIGHLEVEL_PACKAGE_MANAGER=yum|' \ + -e 's|LOWLEVEL_PACKAGE_MANAGER=.*|LOWLEVEL_PACKAGE_MANAGER=rpm|' \ -i etckeeper.conf sed -e 's|^prefix=.*|prefix=%{_prefix}|' \ -e 's|^bindir=.*|bindir=%{_bindir}|' \ @@ -114,6 +117,10 @@ sed -e 's|^prefix=.*|prefix=%{_prefix}|' \ -e 's|^INSTALL=.*|INSTALL=install -p|' \ -e 's|^CP=.*|CP=cp -pR|' \ -i Makefile +%if 0%{?with_systemd} +sed -e 's|^systemddir=.*|systemddir=%{_unitdir}|' \ + -i Makefile +%endif # move each plugin in its own subdirectory, so each has its own build/ # directory mkdir bzr-plugin ; mv etckeeper-bzr bzr-plugin @@ -132,11 +139,15 @@ popd %if 0%{?with_dnf} pushd dnf-plugin -%{__python_dnf} etckeeper-dnf/etckeeper.py build +%if 0%{?dnf_uses_python3} +%{__python3} etckeeper-dnf/etckeeper.py build +%else +%{__python2} etckeeper-dnf/etckeeper.py build +%endif popd %endif -%if 0%{?fedora} || 0%{?rhel} > 6 +%if 0%{?fedora} || 0%{?rhel} >= 7 # the binary in python-markdown has been renamed markdown_py -f README.html README.md %else @@ -156,8 +167,17 @@ popd %if 0%{?with_dnf} pushd dnf-plugin -%{__python_dnf} etckeeper-dnf/etckeeper.py install -O1 --skip-build --root %{buildroot} +%if 0%{?dnf_uses_python3} +%{__python3} etckeeper-dnf/etckeeper.py install -O1 --skip-build --root %{buildroot} +%else +%{__python2} etckeeper-dnf/etckeeper.py install -O1 --skip-build --root %{buildroot} +%endif popd + +%if 0%{?dnf_is_mandatory} +sed -e 's|HIGHLEVEL_PACKAGE_MANAGER=.*|HIGHLEVEL_PACKAGE_MANAGER=dnf|' \ + -i %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf +%endif %endif install -D -p debian/cron.daily %{buildroot}%{_sysconfdir}/cron.daily/%{name} @@ -170,6 +190,13 @@ mv %{buildroot}%{_datadir}/bash-completion/completions/%{name} \ %{buildroot}%{_sysconfdir}/bash_completion.d/%{name} %endif +# remove unit files if not used (note: /lib/systemd/system is the +# original, hardcoded location from the etckeeper Makefile) +%if !0%{?with_systemd} +rm %{buildroot}/lib/systemd/system/%{name}.service +rm %{buildroot}/lib/systemd/system/%{name}.timer +%endif + %clean rm -rf %{buildroot} @@ -179,6 +206,24 @@ rm -rf %{buildroot} if [ $1 -gt 1 ] ; then %{_bindir}/%{name} update-ignore fi +%if 0%{?with_systemd} +%systemd_post %{name}.service +%systemd_post %{name}.timer +%endif # with_systemd + + +%preun +%if 0%{?with_systemd} +%systemd_preun %{name}.service +%systemd_preun %{name}.timer +%endif # with_systemd + + +%postun +%if 0%{?with_systemd} +%systemd_postun %{name}.service +%systemd_postun %{name}.timer +%endif # with_systemd %files @@ -192,6 +237,7 @@ fi %{_mandir}/man8/%{name}.8* %dir %{_sysconfdir}/%{name} %{_sysconfdir}/%{name}/*.d +%{_sysconfdir}/%{name}/daily %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf %{_sysconfdir}/cron.daily/%{name} %if 0%{?fedora} || 0%{?rhel} >= 7 @@ -207,6 +253,10 @@ fi %dir %{_sysconfdir}/yum/pluginconf.d %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/%{name}.conf %{_localstatedir}/cache/%{name} +%if 0%{?with_systemd} +%{_unitdir}/%{name}.service +%{_unitdir}/%{name}.timer +%endif # with_systemd %if 0%{?with_bzr} @@ -233,6 +283,9 @@ fi %changelog +* Tue Aug 23 2016 Thomas Moschny - 1.18.5-1 +- Update to 1.18.5. + * Tue Jul 19 2016 Fedora Release Engineering - 1.18.3-3 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages diff --git a/sources b/sources index a1a0ca6..4aa3c61 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -570ddf024b8c0621e7b8a33478016c68 etckeeper-1.18.3.tar.gz +c06a5f69cc6d53da6e280e7d9ddafb11 etckeeper-1.18.5.tar.gz From ac73c4ac175803cd0051f91eead5858fc279cff8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 19 Dec 2016 18:20:36 +0100 Subject: [PATCH 063/128] Rebuild for Python 3.6 --- etckeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/etckeeper.spec b/etckeeper.spec index eaa221a..3368704 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -25,7 +25,7 @@ Name: etckeeper Version: 1.18.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) Group: Applications/System License: GPLv2+ @@ -283,6 +283,9 @@ fi %changelog +* Mon Dec 19 2016 Miro Hrončok - 1.18.5-2 +- Rebuild for Python 3.6 + * Tue Aug 23 2016 Thomas Moschny - 1.18.5-1 - Update to 1.18.5. From 118bcf32b20583a2715e5593dc178c0b897ab7c7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 09:26:38 +0000 Subject: [PATCH 064/128] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- etckeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/etckeeper.spec b/etckeeper.spec index 3368704..be34da5 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -25,7 +25,7 @@ Name: etckeeper Version: 1.18.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) Group: Applications/System License: GPLv2+ @@ -283,6 +283,9 @@ fi %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 1.18.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Mon Dec 19 2016 Miro Hrončok - 1.18.5-2 - Rebuild for Python 3.6 From 659617bd73adc7ec59ccdc1360d09c3ee0f05df7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Thu, 13 Jul 2017 10:10:48 +0200 Subject: [PATCH 065/128] perl dependency renamed to perl-interpreter --- etckeeper.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/etckeeper.spec b/etckeeper.spec index be34da5..86f24ea 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -25,7 +25,7 @@ Name: etckeeper Version: 1.18.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) Group: Applications/System License: GPLv2+ @@ -37,7 +37,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-markdown Requires: git >= 1.5.4 -Requires: perl +Requires: perl-interpreter Requires: crontabs %if 0%{?dnf_is_mandatory} Requires: %{name}-dnf = %{version}-%{release} @@ -283,6 +283,10 @@ fi %changelog +* Thu Jul 13 2017 Petr Pisar - 1.18.5-4 +- perl dependency renamed to perl-interpreter + + * Fri Feb 10 2017 Fedora Release Engineering - 1.18.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 33dd6ab30540caf3e64f8a739fbc97cec0e61aea Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 07:49:43 +0000 Subject: [PATCH 066/128] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- etckeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/etckeeper.spec b/etckeeper.spec index 86f24ea..b433766 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -25,7 +25,7 @@ Name: etckeeper Version: 1.18.5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) Group: Applications/System License: GPLv2+ @@ -283,6 +283,9 @@ fi %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 1.18.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Thu Jul 13 2017 Petr Pisar - 1.18.5-4 - perl dependency renamed to perl-interpreter From 4f30d7f052b696c8959d60c0a7214b9816676d80 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 09:00:11 +0000 Subject: [PATCH 067/128] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- etckeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/etckeeper.spec b/etckeeper.spec index b433766..e6cff8b 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -25,7 +25,7 @@ Name: etckeeper Version: 1.18.5 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) Group: Applications/System License: GPLv2+ @@ -283,6 +283,9 @@ fi %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 1.18.5-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 1.18.5-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 439692c45757b70c1f5e47ebfe234367753753d8 Mon Sep 17 00:00:00 2001 From: Iryna Shcherbina Date: Wed, 7 Feb 2018 10:26:53 +0100 Subject: [PATCH 068/128] Update Python 2 dependency declarations to new packaging standards --- etckeeper.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/etckeeper.spec b/etckeeper.spec index e6cff8b..3e52083 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -25,7 +25,7 @@ Name: etckeeper Version: 1.18.5 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) Group: Applications/System License: GPLv2+ @@ -35,7 +35,7 @@ Source1: README.fedora Patch0: etckeeper-makefile-remove-python-plugins.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: python-markdown +BuildRequires: python2-markdown Requires: git >= 1.5.4 Requires: perl-interpreter Requires: crontabs @@ -283,6 +283,10 @@ fi %changelog +* Wed Feb 07 2018 Iryna Shcherbina - 1.18.5-7 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + * Wed Feb 07 2018 Fedora Release Engineering - 1.18.5-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From c4bdd516413f98174d397686401069ba195c247f Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 13 Feb 2018 23:20:41 +0100 Subject: [PATCH 069/128] Remove BuildRoot definition None of currently supported distributions need that. It was needed last for EL5 which is EOL now Signed-off-by: Igor Gnatenko --- etckeeper.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/etckeeper.spec b/etckeeper.spec index 3e52083..349e61d 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -33,7 +33,6 @@ URL: http://etckeeper.branchable.com/ Source0: https://github.com/joeyh/etckeeper/archive/%{version}/%{name}-%{version}.tar.gz Source1: README.fedora Patch0: etckeeper-makefile-remove-python-plugins.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python2-markdown Requires: git >= 1.5.4 From 50d380e1f288663f3992f53b66cc0b4bd3e35704 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 07:11:27 +0100 Subject: [PATCH 070/128] Remove %clean section None of currently supported distributions need that. Last one was EL5 which is EOL for a while. Signed-off-by: Igor Gnatenko --- etckeeper.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/etckeeper.spec b/etckeeper.spec index 349e61d..bff7cde 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -197,9 +197,6 @@ rm %{buildroot}/lib/systemd/system/%{name}.timer %endif -%clean -rm -rf %{buildroot} - %post if [ $1 -gt 1 ] ; then From 1122c58f9e6ce3330df78150bdd6212de9bd9782 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Sat, 21 Apr 2018 12:45:33 +0200 Subject: [PATCH 071/128] Update to 1.18.7. Rebase patches. Slightly modernize spec file. Update Python dependencies. Fix ignore rules (rhbz#1460461). Update README.fedora (rhbz#1478655). Add missing BRs (rhbz#1418790). Add patch to prevent mercurial warnings (rhbz#1480843). --- README.fedora | 15 +++-- etckeeper-1.18.7-fix-hg-warnings.patch | 34 ++++++++++++ etckeeper-1.18.7-fix-rpm-ignores.patch | 14 +++++ ...eeper-makefile-remove-python-plugins.patch | 12 ++-- etckeeper.spec | 55 ++++++++++--------- sources | 2 +- 6 files changed, 93 insertions(+), 39 deletions(-) create mode 100644 etckeeper-1.18.7-fix-hg-warnings.patch create mode 100644 etckeeper-1.18.7-fix-rpm-ignores.patch diff --git a/README.fedora b/README.fedora index 217d39f..04c7011 100644 --- a/README.fedora +++ b/README.fedora @@ -4,9 +4,8 @@ aspects, and how it all works. For the impatient: Run etckeeper init - cd /etc - git status - git commit -m 'msg' + etckeeper vcs status + etckeeper vcs commit -m 'msg' to get etckeeper started. @@ -14,9 +13,9 @@ Once you do that, the cronjob is in place and it'll do daily autocommits for you. To disable it, set AVOID_DAILY_AUTOCOMMITS=1 in /etc/etckeeper/etckeeper.conf. -There's also a yum plugin enabled that autocommits before and after -each yum transaction. It can be disabled in -/etc/yum/pluginconf.d/etckeeper.conf. +There's a yum plugin enabled that autocommits before and after each +yum transaction. A dnf plugin is also included, in the subpackage +etckeeper-dnf. -If you ever want to deinstall etckeeper via yum, disable the plugin -like this: "yum --disableplugin=etckeeper remove etckeeper". +The yum plugin can be disabled in +/etc/yum/pluginconf.d/etckeeper.conf. diff --git a/etckeeper-1.18.7-fix-hg-warnings.patch b/etckeeper-1.18.7-fix-hg-warnings.patch new file mode 100644 index 0000000..90c6818 --- /dev/null +++ b/etckeeper-1.18.7-fix-hg-warnings.patch @@ -0,0 +1,34 @@ +diff --git a/pre-commit.d/20warn-problem-files b/pre-commit.d/20warn-problem-files +index 6bd5c2b..7899268 100755 +--- a/pre-commit.d/20warn-problem-files ++++ b/pre-commit.d/20warn-problem-files +@@ -1,19 +1,20 @@ + #!/bin/sh + set -e + +-exclude_internal () { +- egrep -v '(^|/)(\.git|\.hg|\.bzr|_darcs)/' +-} ++# (Note that when using this, the find expression must end with ++# -print or -exec, else the excluded directories will actually be ++# printed!) ++NOVCS='. -path ./.git -prune -o -path ./.bzr -prune -o -path ./.hg -prune -o -path ./_darcs -prune -o' + + if [ "$VCS" = bzr ] || [ "$VCS" = darcs ]; then +- special=$(find . ! -type d ! -type f ! -type l | exclude_internal) || true +- hardlinks=$(find . -type f ! -links 1 | exclude_internal ) || true ++ special=$(find $NOVCS ! -type d ! -type f ! -type l -print) || true ++ hardlinks=$(find $NOVCS -type f ! -links 1 -print) || true + elif [ "$VCS" = hg ]; then +- special=$(find . ! -type d ! -type f ! -type l | exclude_internal) || true +- hardlinks=$(find . -type f ! -links 1 -exec hg status {} \; | exclude_internal ) || true ++ special=$(find $NOVCS ! -type d ! -type f ! -type l -print) || true ++ hardlinks=$(find $NOVCS -type f ! -links 1 -exec hg status {} \; -print) || true + elif [ "$VCS" = git ]; then +- special=$(find . ! -type d ! -type f ! -type l -exec git ls-files --exclude-standard --cached --others {} + | exclude_internal) || true +- hardlinks=$(find . -type f ! -links 1 -exec git ls-files --exclude-standard --cached --others {} + | exclude_internal) || true ++ special=$(find $NOVCS ! -type d ! -type f ! -type l -exec git ls-files --exclude-standard --cached --others {} + -print) || true ++ hardlinks=$(find $NOVCS -type f ! -links 1 -exec git ls-files --exclude-standard --cached --others {} + -print) || true + else + special="" + fi diff --git a/etckeeper-1.18.7-fix-rpm-ignores.patch b/etckeeper-1.18.7-fix-rpm-ignores.patch new file mode 100644 index 0000000..1cb5fed --- /dev/null +++ b/etckeeper-1.18.7-fix-rpm-ignores.patch @@ -0,0 +1,14 @@ +diff -up etckeeper-1.18.7/update-ignore.d/01update-ignore.orig etckeeper-1.18.7/update-ignore.d/01update-ignore +--- etckeeper-1.18.7/update-ignore.d/01update-ignore.orig 2017-08-13 12:31:57.360734395 +0200 ++++ etckeeper-1.18.7/update-ignore.d/01update-ignore 2017-08-13 12:32:45.246242478 +0200 +@@ -91,7 +91,9 @@ writefile () { + nl + elif [ "$LOWLEVEL_PACKAGE_MANAGER" = "rpm" ]; then + comment "new and old versions of conffiles, stored by apt/rpm" +- ignore "*.rpm*" ++ ignore "*.rpmnew" ++ ignore "*.rpmorig" ++ ignore "*.rpmsave" + nl + elif [ "$LOWLEVEL_PACKAGE_MANAGER" = "pacman-g2" -o "$LOWLEVEL_PACKAGE_MANAGER" = "pacman" -o "$LOWLEVEL_PACKAGE_MANAGER" = "pacmatic" ]; then + comment "new and old versions of conffiles, stored by pacman" diff --git a/etckeeper-makefile-remove-python-plugins.patch b/etckeeper-makefile-remove-python-plugins.patch index 9c81f01..7ed0de8 100644 --- a/etckeeper-makefile-remove-python-plugins.patch +++ b/etckeeper-makefile-remove-python-plugins.patch @@ -1,11 +1,13 @@ -diff -up etckeeper-1.18/Makefile.orig etckeeper-1.18/Makefile ---- etckeeper-1.18/Makefile.orig 2015-03-20 16:53:23.681037197 +0100 -+++ etckeeper-1.18/Makefile 2015-03-20 16:56:28.697621078 +0100 -@@ -13,11 +13,8 @@ CP=cp -R +diff -up etckeeper-1.18.7/Makefile.orig etckeeper-1.18.7/Makefile +--- etckeeper-1.18.7/Makefile.orig 2017-06-08 18:59:32.000000000 +0200 ++++ etckeeper-1.18.7/Makefile 2017-06-12 22:58:50.802133039 +0200 +@@ -15,13 +15,10 @@ CP=cp -R INSTALL=install INSTALL_EXE=${INSTALL} INSTALL_DATA=${INSTALL} -m 0644 -PYTHON=python + FAKEROOT := $(shell command -v fakeroot 2> /dev/null) + TESTDIR := $(shell mktemp -u -d) build: etckeeper.spec etckeeper.version - -$(PYTHON) ./etckeeper-bzr/__init__.py build || echo "** bzr support not built" @@ -13,7 +15,7 @@ diff -up etckeeper-1.18/Makefile.orig etckeeper-1.18/Makefile install: etckeeper.version mkdir -p $(DESTDIR)$(etcdir)/etckeeper/ $(DESTDIR)$(vardir)/cache/etckeeper/ -@@ -45,14 +42,10 @@ ifeq ($(HIGHLEVEL_PACKAGE_MANAGER),yum) +@@ -58,14 +55,10 @@ ifeq ($(HIGHLEVEL_PACKAGE_MANAGER),yum) mkdir -p $(DESTDIR)$(etcdir)/yum/pluginconf.d $(INSTALL_DATA) yum-etckeeper.conf $(DESTDIR)$(etcdir)/yum/pluginconf.d/etckeeper.conf endif diff --git a/etckeeper.spec b/etckeeper.spec index bff7cde..5858a3b 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -1,11 +1,6 @@ -%if 0%{?rhel} && 0%{?rhel} <= 6 -%{!?__python2: %global __python2 /usr/bin/python2} -%{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} -%endif - %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} -%if 0%{?fedora} || 0%{?rhel} > 5 +%if 0%{?fedora} || 0%{?rhel} %global with_bzr 1 %endif @@ -13,31 +8,37 @@ %global with_dnf 1 %global dnf_is_mandatory 1 %global dnf_uses_python3 1 +%global with_systemd 1 %endif %if 0%{?rhel} >= 7 %global with_dnf 1 -%endif - -%if 0%{?fedora} || 0%{?rhel} >= 7 %global with_systemd 1 %endif Name: etckeeper -Version: 1.18.5 -Release: 7%{?dist} +Version: 1.18.7 +Release: 1%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) -Group: Applications/System License: GPLv2+ URL: http://etckeeper.branchable.com/ -Source0: https://github.com/joeyh/etckeeper/archive/%{version}/%{name}-%{version}.tar.gz +Source0: http://ftp.debian.org/debian/pool/main/e/%{name}/%{name}_%{version}.orig.tar.gz Source1: README.fedora Patch0: etckeeper-makefile-remove-python-plugins.patch +Patch1: etckeeper-1.18.7-fix-rpm-ignores.patch +Patch2: etckeeper-1.18.7-fix-hg-warnings.patch BuildArch: noarch -BuildRequires: python2-markdown -Requires: git >= 1.5.4 +%if 0%{?fedora} || 0%{?rhel} >= 7 +BuildRequires: %{_bindir}/markdown_py +%else +BuildRequires: %{_bindir}/markdown +%endif +Requires: git >= 1.6.1 Requires: perl-interpreter Requires: crontabs +Requires: findutils +Requires: hostname +Requires: which %if 0%{?dnf_is_mandatory} Requires: %{name}-dnf = %{version}-%{release} %endif # dnf_is_mandatory @@ -67,7 +68,6 @@ To start using the package please read %{_pkgdocdir}/README. %if 0%{?with_bzr} %package bzr Summary: Support for bzr with etckeeper -Group: Applications/System BuildRequires: python2-devel BuildRequires: bzr Requires: %{name} = %{version}-%{release} @@ -82,7 +82,6 @@ etckeeper with bzr backend, install this package. %if 0%{?with_dnf} %package dnf Summary: DNF plugin for etckeeper support -Group: Applications/System %if 0%{?dnf_uses_python3} BuildRequires: python3-devel %else @@ -103,6 +102,8 @@ etckeeper with DNF, install this package. %prep %setup -q %patch0 -p1 +%patch1 -p1 +%patch2 -p1 # we set yum here, so the yum plugin gets built, and change that to # dnf later, if needed sed -e 's|HIGHLEVEL_PACKAGE_MANAGER=.*|HIGHLEVEL_PACKAGE_MANAGER=yum|' \ @@ -139,9 +140,9 @@ popd %if 0%{?with_dnf} pushd dnf-plugin %if 0%{?dnf_uses_python3} -%{__python3} etckeeper-dnf/etckeeper.py build +%{__python3} etckeeper-dnf/etckeeper.py build --executable="%{__python3} -s" %else -%{__python2} etckeeper-dnf/etckeeper.py build +%{__python2} etckeeper-dnf/etckeeper.py build --executable="%{__python2} -s" %endif popd %endif @@ -155,7 +156,6 @@ markdown -f README.html README.md %install -rm -rf %{buildroot} make install DESTDIR=%{buildroot} %if 0%{?with_bzr} @@ -197,7 +197,6 @@ rm %{buildroot}/lib/systemd/system/%{name}.timer %endif - %post if [ $1 -gt 1 ] ; then %{_bindir}/%{name} update-ignore @@ -224,11 +223,7 @@ fi %files %doc README.html README.fedora -%if 0%{?_licensedir:1} %license GPL -%else -%doc GPL -%endif # licensedir %{_bindir}/%{name} %{_mandir}/man8/%{name}.8* %dir %{_sysconfdir}/%{name} @@ -279,6 +274,16 @@ fi %changelog +* Sat Apr 21 2018 Thomas Moschny - 1.18.7-1 +- Update to 1.18.7. +- Rebase patches. +- Slightly modernize spec file. +- Update Python dependencies. +- Fix ignore rules (rhbz#1460461). +- Update README.fedora (rhbz#1478655). +- Add missing BRs (rhbz#1418790). +- Add patch to prevent mercurial warnings (rhbz#1480843). + * Wed Feb 07 2018 Iryna Shcherbina - 1.18.5-7 - Update Python 2 dependency declarations to new packaging standards (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) diff --git a/sources b/sources index 4aa3c61..931f475 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c06a5f69cc6d53da6e280e7d9ddafb11 etckeeper-1.18.5.tar.gz +SHA512 (etckeeper_1.18.7.orig.tar.gz) = 44b8f66b95663da1370943128bb5673e57bd7b9df7e727c93baea5dfc79852ebba9d0834827fed19722668849d3ed18b045db5cb42135e198576a2b839523d1a From bda2cfeddb61454ff3c6245f88e22ebd5d8661fc Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Sat, 21 Apr 2018 14:07:59 +0200 Subject: [PATCH 072/128] DNF is no longer available in EPEL7. --- etckeeper.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/etckeeper.spec b/etckeeper.spec index 5858a3b..3e6eefa 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -12,13 +12,12 @@ %endif %if 0%{?rhel} >= 7 -%global with_dnf 1 %global with_systemd 1 %endif Name: etckeeper Version: 1.18.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) License: GPLv2+ URL: http://etckeeper.branchable.com/ @@ -274,6 +273,9 @@ fi %changelog +* Sat Apr 21 2018 Thomas Moschny - 1.18.7-2 +- DNF is no longer available in EPEL7. + * Sat Apr 21 2018 Thomas Moschny - 1.18.7-1 - Update to 1.18.7. - Rebase patches. From 93c50cab0b727b2dc0afc4aacae0be5e9f3f38ff Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Mon, 14 May 2018 14:31:59 +0200 Subject: [PATCH 073/128] Use correct Requires: for the hostname cmd on EPEL6. --- etckeeper.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/etckeeper.spec b/etckeeper.spec index 3e6eefa..23542af 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -17,7 +17,7 @@ Name: etckeeper Version: 1.18.7 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) License: GPLv2+ URL: http://etckeeper.branchable.com/ @@ -36,7 +36,11 @@ Requires: git >= 1.6.1 Requires: perl-interpreter Requires: crontabs Requires: findutils +%if 0%{?fedora} || 0%{?rhel} >= 7 Requires: hostname +%else +Requires: net-tools +%endif Requires: which %if 0%{?dnf_is_mandatory} Requires: %{name}-dnf = %{version}-%{release} @@ -273,6 +277,9 @@ fi %changelog +* Mon May 14 2018 Thomas Moschny - 1.18.7-3 +- Use correct Requires: for the hostname cmd on EPEL6. + * Sat Apr 21 2018 Thomas Moschny - 1.18.7-2 - DNF is no longer available in EPEL7. From dab9a3dfd31494c14d7e00486888c393bcb858b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 19 Jun 2018 10:42:44 +0200 Subject: [PATCH 074/128] Rebuilt for Python 3.7 --- etckeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/etckeeper.spec b/etckeeper.spec index 23542af..bd0cd4b 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -17,7 +17,7 @@ Name: etckeeper Version: 1.18.7 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) License: GPLv2+ URL: http://etckeeper.branchable.com/ @@ -277,6 +277,9 @@ fi %changelog +* Tue Jun 19 2018 Miro Hrončok - 1.18.7-4 +- Rebuilt for Python 3.7 + * Mon May 14 2018 Thomas Moschny - 1.18.7-3 - Use correct Requires: for the hostname cmd on EPEL6. From 5f96d16c786ace76bd585ac9a1ac7e1607d4bd7e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 00:10:59 +0000 Subject: [PATCH 075/128] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- etckeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/etckeeper.spec b/etckeeper.spec index bd0cd4b..d7eab99 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -17,7 +17,7 @@ Name: etckeeper Version: 1.18.7 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) License: GPLv2+ URL: http://etckeeper.branchable.com/ @@ -277,6 +277,9 @@ fi %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 1.18.7-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Tue Jun 19 2018 Miro Hrončok - 1.18.7-4 - Rebuilt for Python 3.7 From d90e0777bf774d59c4021d10fa6bf1f19f7cb4da Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Mon, 16 Jul 2018 12:27:28 +0200 Subject: [PATCH 076/128] Update to 1.18.8. Update URL: and Source: tags. --- etckeeper.spec | 12 ++++++++---- sources | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/etckeeper.spec b/etckeeper.spec index d7eab99..1385897 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -16,12 +16,12 @@ %endif Name: etckeeper -Version: 1.18.7 -Release: 5%{?dist} +Version: 1.18.8 +Release: 1%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) License: GPLv2+ -URL: http://etckeeper.branchable.com/ -Source0: http://ftp.debian.org/debian/pool/main/e/%{name}/%{name}_%{version}.orig.tar.gz +URL: https://etckeeper.branchable.com/ +Source0: https://git.joeyh.name/index.cgi/etckeeper.git/snapshot/%{name}-%{version}.tar.gz Source1: README.fedora Patch0: etckeeper-makefile-remove-python-plugins.patch Patch1: etckeeper-1.18.7-fix-rpm-ignores.patch @@ -277,6 +277,10 @@ fi %changelog +* Mon Jul 16 2018 Thomas Moschny - 1.18.8-1 +- Update to 1.18.8. +- Update URL: and Source: tags. + * Fri Jul 13 2018 Fedora Release Engineering - 1.18.7-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 931f475..4e05080 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (etckeeper_1.18.7.orig.tar.gz) = 44b8f66b95663da1370943128bb5673e57bd7b9df7e727c93baea5dfc79852ebba9d0834827fed19722668849d3ed18b045db5cb42135e198576a2b839523d1a +SHA512 (etckeeper-1.18.8.tar.gz) = 35607622d7533d9acb28af2320a571b66ac5a5e2dd44703ec542e0a95622b11a7709134f26d6dba6741b99247c00481172c2601109dc501630f02c25530a516c From 3b3c7f284f07bee2d7aefd9da9ea289f81c2101e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 19:08:23 +0000 Subject: [PATCH 077/128] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- etckeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/etckeeper.spec b/etckeeper.spec index 1385897..161b1f7 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -17,7 +17,7 @@ Name: etckeeper Version: 1.18.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) License: GPLv2+ URL: https://etckeeper.branchable.com/ @@ -277,6 +277,9 @@ fi %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 1.18.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Mon Jul 16 2018 Thomas Moschny - 1.18.8-1 - Update to 1.18.8. - Update URL: and Source: tags. From 98538ddb6e4fe483dd3b655c4a5d6889007b63db Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 23:58:36 +0000 Subject: [PATCH 078/128] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- etckeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/etckeeper.spec b/etckeeper.spec index 161b1f7..1b15888 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -17,7 +17,7 @@ Name: etckeeper Version: 1.18.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) License: GPLv2+ URL: https://etckeeper.branchable.com/ @@ -277,6 +277,9 @@ fi %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 1.18.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Jan 31 2019 Fedora Release Engineering - 1.18.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From ea3ae3a0307e3ea48bf1a076b81420fab3fb8317 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 19 Aug 2019 10:13:33 +0200 Subject: [PATCH 079/128] Rebuilt for Python 3.8 --- etckeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/etckeeper.spec b/etckeeper.spec index 1b15888..4443bac 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -17,7 +17,7 @@ Name: etckeeper Version: 1.18.8 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) License: GPLv2+ URL: https://etckeeper.branchable.com/ @@ -277,6 +277,9 @@ fi %changelog +* Mon Aug 19 2019 Miro Hrončok - 1.18.8-4 +- Rebuilt for Python 3.8 + * Wed Jul 24 2019 Fedora Release Engineering - 1.18.8-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 2d07753d0e4020e4b4191d5c7bf64d0578143d8f Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Thu, 3 Oct 2019 11:53:01 +0200 Subject: [PATCH 080/128] Update to 1.18.10. --- etckeeper.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/etckeeper.spec b/etckeeper.spec index 4443bac..575bdbe 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -16,8 +16,8 @@ %endif Name: etckeeper -Version: 1.18.8 -Release: 4%{?dist} +Version: 1.18.10 +Release: 1%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) License: GPLv2+ URL: https://etckeeper.branchable.com/ @@ -277,6 +277,9 @@ fi %changelog +* Thu Oct 3 2019 Thomas Moschny - 1.18.10-1 +- Update to 1.18.10. + * Mon Aug 19 2019 Miro Hrončok - 1.18.8-4 - Rebuilt for Python 3.8 diff --git a/sources b/sources index 4e05080..033b121 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (etckeeper-1.18.8.tar.gz) = 35607622d7533d9acb28af2320a571b66ac5a5e2dd44703ec542e0a95622b11a7709134f26d6dba6741b99247c00481172c2601109dc501630f02c25530a516c +SHA512 (etckeeper-1.18.10.tar.gz) = 57eb91823c37f364e7ade6b25d2ab91fc99d1192a606fd09370c2876a0440120a625f30167fc52fb16b53ef9f7a58a1329bfe9567cbc2c91da06a345ebbe8e05 From c78786ff721cdf2076360fd4a9eae207ef48118e Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Thu, 3 Oct 2019 12:20:06 +0200 Subject: [PATCH 081/128] There is currently no bzr for rhel8. --- etckeeper.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/etckeeper.spec b/etckeeper.spec index 575bdbe..72dcdb0 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -1,6 +1,6 @@ %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} -%if 0%{?fedora} || 0%{?rhel} +%if 0%{?fedora} || (0%{?rhel} && 0%{?rhel} <= 7) %global with_bzr 1 %endif @@ -17,7 +17,7 @@ Name: etckeeper Version: 1.18.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) License: GPLv2+ URL: https://etckeeper.branchable.com/ @@ -277,6 +277,9 @@ fi %changelog +* Thu Oct 3 2019 Thomas Moschny - 1.18.10-2 +- There is currently no bzr for rhel8. + * Thu Oct 3 2019 Thomas Moschny - 1.18.10-1 - Update to 1.18.10. From f46a5643e422eaa97c528f6a8994695adc45431d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 3 Oct 2019 13:52:58 +0200 Subject: [PATCH 082/128] Rebuilt for Python 3.8.0rc1 (#1748018) --- etckeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/etckeeper.spec b/etckeeper.spec index 72dcdb0..394ed7c 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -17,7 +17,7 @@ Name: etckeeper Version: 1.18.10 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) License: GPLv2+ URL: https://etckeeper.branchable.com/ @@ -277,6 +277,9 @@ fi %changelog +* Thu Oct 03 2019 Miro Hrončok - 1.18.10-3 +- Rebuilt for Python 3.8.0rc1 (#1748018) + * Thu Oct 3 2019 Thomas Moschny - 1.18.10-2 - There is currently no bzr for rhel8. From 386372563d7b991f37702c40d3fa528f627ae9fa Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Fri, 4 Oct 2019 22:00:00 +0200 Subject: [PATCH 083/128] Package fixes for CentOS8. Build dnf plugin on CentOS7. --- etckeeper.spec | 67 +++++++++++++++++++++++++++----------------------- 1 file changed, 36 insertions(+), 31 deletions(-) diff --git a/etckeeper.spec b/etckeeper.spec index 394ed7c..b7eecc0 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -4,20 +4,28 @@ %global with_bzr 1 %endif -%if 0%{?fedora} -%global with_dnf 1 -%global dnf_is_mandatory 1 -%global dnf_uses_python3 1 -%global with_systemd 1 +%if (0%{?fedora} && 0%{?fedora} <= 30) || (0%{?rhel} && 0%{?rhel} <= 7) +%global with_yum 1 %endif -%if 0%{?rhel} >= 7 +%if 0%{?fedora} || 0%{?rhel} >= 7 +%global with_dnf 1 %global with_systemd 1 +%global __markdown %{_bindir}/markdown_py +%global hostname_dep hostname +%else +%global __markdown %{_bindir}/markdown +%global hostname_dep net-tools +%endif + +%if 0%{?fedora} || 0%{?rhel} >= 8 +%global dnf_is_mandatory 1 +%global dnf_uses_python3 1 %endif Name: etckeeper Version: 1.18.10 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) License: GPLv2+ URL: https://etckeeper.branchable.com/ @@ -27,20 +35,12 @@ Patch0: etckeeper-makefile-remove-python-plugins.patch Patch1: etckeeper-1.18.7-fix-rpm-ignores.patch Patch2: etckeeper-1.18.7-fix-hg-warnings.patch BuildArch: noarch -%if 0%{?fedora} || 0%{?rhel} >= 7 -BuildRequires: %{_bindir}/markdown_py -%else -BuildRequires: %{_bindir}/markdown -%endif +BuildRequires: %{__markdown} Requires: git >= 1.6.1 Requires: perl-interpreter Requires: crontabs Requires: findutils -%if 0%{?fedora} || 0%{?rhel} >= 7 -Requires: hostname -%else -Requires: net-tools -%endif +Requires: %{hostname_dep} Requires: which %if 0%{?dnf_is_mandatory} Requires: %{name}-dnf = %{version}-%{release} @@ -107,9 +107,13 @@ etckeeper with DNF, install this package. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%if 0%{?with_yum} # we set yum here, so the yum plugin gets built, and change that to # dnf later, if needed sed -e 's|HIGHLEVEL_PACKAGE_MANAGER=.*|HIGHLEVEL_PACKAGE_MANAGER=yum|' \ +%else +sed -e 's|HIGHLEVEL_PACKAGE_MANAGER=.*|HIGHLEVEL_PACKAGE_MANAGER=dnf|' \ +%endif # with_yum -e 's|LOWLEVEL_PACKAGE_MANAGER=.*|LOWLEVEL_PACKAGE_MANAGER=rpm|' \ -i etckeeper.conf sed -e 's|^prefix=.*|prefix=%{_prefix}|' \ @@ -123,7 +127,7 @@ sed -e 's|^prefix=.*|prefix=%{_prefix}|' \ %if 0%{?with_systemd} sed -e 's|^systemddir=.*|systemddir=%{_unitdir}|' \ -i Makefile -%endif +%endif # with_systemd # move each plugin in its own subdirectory, so each has its own build/ # directory mkdir bzr-plugin ; mv etckeeper-bzr bzr-plugin @@ -138,7 +142,7 @@ make %{?_smp_mflags} pushd bzr-plugin %{__python2} etckeeper-bzr/__init__.py build popd -%endif +%endif # with_bzr %if 0%{?with_dnf} pushd dnf-plugin @@ -146,16 +150,11 @@ pushd dnf-plugin %{__python3} etckeeper-dnf/etckeeper.py build --executable="%{__python3} -s" %else %{__python2} etckeeper-dnf/etckeeper.py build --executable="%{__python2} -s" -%endif +%endif # dnf_uses_python3 popd -%endif +%endif # with_dnf -%if 0%{?fedora} || 0%{?rhel} >= 7 -# the binary in python-markdown has been renamed -markdown_py -f README.html README.md -%else -markdown -f README.html README.md -%endif +%{__markdown} -f README.html README.md %install @@ -165,7 +164,7 @@ make install DESTDIR=%{buildroot} pushd bzr-plugin %{__python2} etckeeper-bzr/__init__.py install -O1 --skip-build --root %{buildroot} popd -%endif +%endif # with_bzr %if 0%{?with_dnf} pushd dnf-plugin @@ -173,14 +172,14 @@ pushd dnf-plugin %{__python3} etckeeper-dnf/etckeeper.py install -O1 --skip-build --root %{buildroot} %else %{__python2} etckeeper-dnf/etckeeper.py install -O1 --skip-build --root %{buildroot} -%endif +%endif # dnf_uses_python3 popd %if 0%{?dnf_is_mandatory} sed -e 's|HIGHLEVEL_PACKAGE_MANAGER=.*|HIGHLEVEL_PACKAGE_MANAGER=dnf|' \ -i %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf -%endif -%endif +%endif # dnf_is_mandatory +%endif # with_dnf install -D -p debian/cron.daily %{buildroot}%{_sysconfdir}/cron.daily/%{name} install -d %{buildroot}%{_localstatedir}/cache/%{name} @@ -242,10 +241,12 @@ fi %dir %{_sysconfdir}/bash_completion.d %{_sysconfdir}/bash_completion.d/%{name} %endif +%if 0%{?with_yum} %dir %{_prefix}/lib/yum-plugins %{_prefix}/lib/yum-plugins/%{name}.* %dir %{_sysconfdir}/yum/pluginconf.d %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/%{name}.conf +%endif # with_yum %{_localstatedir}/cache/%{name} %if 0%{?with_systemd} %{_unitdir}/%{name}.service @@ -277,6 +278,10 @@ fi %changelog +* Fri Oct 4 2019 Thomas Moschny - 1.18.10-4 +- Package fixes for CentOS8. +- Build dnf plugin on CentOS7. + * Thu Oct 03 2019 Miro Hrončok - 1.18.10-3 - Rebuilt for Python 3.8.0rc1 (#1748018) From 10df7451759a7c8c88d865b3a5e3e2dd6c08dccc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 1 Nov 2019 09:42:08 +0100 Subject: [PATCH 084/128] Add breezy plugin on Fedora 31+ - Remove bazaar plugin on Fedora 32+ - https://fedoraproject.org/wiki/Changes/ReplaceBazaarWithBreezy - https://bugzilla.redhat.com/show_bug.cgi?id=1741027 --- etckeeper-add-breezy-python3-plugin.patch | 52 ++++++++++++++++++++ etckeeper.spec | 60 +++++++++++++++++++++-- 2 files changed, 109 insertions(+), 3 deletions(-) create mode 100644 etckeeper-add-breezy-python3-plugin.patch diff --git a/etckeeper-add-breezy-python3-plugin.patch b/etckeeper-add-breezy-python3-plugin.patch new file mode 100644 index 0000000..d234bef --- /dev/null +++ b/etckeeper-add-breezy-python3-plugin.patch @@ -0,0 +1,52 @@ +From b5919d7919dda614c3c3c76ba126f45e205494bd Mon Sep 17 00:00:00 2001 +From: Dimitri John Ledkov +Date: Mon, 29 Apr 2019 14:11:09 +0100 +Subject: [PATCH 1/3] Add breezy python3 plugin + +--- + Makefile | 3 +++ + debian/changelog | 6 ++++++ + debian/control | 6 +++--- + etckeeper-brz/__init__.py | 34 ++++++++++++++++++++++++++++++++++ + 4 files changed, 46 insertions(+), 3 deletions(-) + create mode 100644 etckeeper-brz/__init__.py + +Index: etckeeper-1.18.10/etckeeper-brz/__init__.py +=================================================================== +--- /dev/null ++++ etckeeper-1.18.10/etckeeper-brz/__init__.py +@@ -0,0 +1,34 @@ ++# ++# Breezy plugin that runs etckeeper pre-commit when necessary ++ ++"""Runs etckeeper pre-commit when necessary.""" ++ ++from breezy.errors import BzrError ++import os ++ ++def etckeeper_startcommit_hook(tree): ++ abspath = getattr(tree, "abspath", None) ++ if abspath is None or not os.path.exists(abspath(".etckeeper")): ++ # Only run the commit hook when this is an etckeeper branch ++ return ++ import subprocess ++ ret = subprocess.call(["etckeeper", "pre-commit", abspath(".")]) ++ if ret != 0: ++ raise BzrError("etckeeper pre-commit failed") ++ ++try: ++ from breezy.hooks import install_lazy_named_hook ++except ImportError: ++ from breezy.mutabletree import MutableTree ++ MutableTree.hooks.install_named_hook('start_commit', ++ etckeeper_startcommit_hook, 'etckeeper') ++else: ++ install_lazy_named_hook( ++ "breezy.mutabletree", "MutableTree.hooks", ++ 'start_commit', etckeeper_startcommit_hook, 'etckeeper') ++ ++if __name__ == "__main__": ++ from distutils.core import setup ++ setup(name="brz-etckeeper", ++ packages=["breezy.plugins.etckeeper"], ++ package_dir={"breezy.plugins.etckeeper":"etckeeper-brz"}) diff --git a/etckeeper.spec b/etckeeper.spec index b7eecc0..e1a467b 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -1,9 +1,17 @@ %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} -%if 0%{?fedora} || (0%{?rhel} && 0%{?rhel} <= 7) +%if (0%{?fedora} && 0%{?fedora} < 32) || (0%{?rhel} && 0%{?rhel} <= 7) %global with_bzr 1 %endif +%if 0%{?fedora} >= 31 +%global with_brz 1 +# this is used to mention the correct package in descriptions +%global bazaar brz +%else +%global bazaar bzr +%endif + %if (0%{?fedora} && 0%{?fedora} <= 30) || (0%{?rhel} && 0%{?rhel} <= 7) %global with_yum 1 %endif @@ -25,7 +33,7 @@ Name: etckeeper Version: 1.18.10 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) License: GPLv2+ URL: https://etckeeper.branchable.com/ @@ -34,6 +42,8 @@ Source1: README.fedora Patch0: etckeeper-makefile-remove-python-plugins.patch Patch1: etckeeper-1.18.7-fix-rpm-ignores.patch Patch2: etckeeper-1.18.7-fix-hg-warnings.patch +# From https://bugs.launchpad.net/ubuntu/+source/etckeeper/+bug/1826855 +Patch3: etckeeper-add-breezy-python3-plugin.patch BuildArch: noarch BuildRequires: %{__markdown} Requires: git >= 1.6.1 @@ -63,7 +73,7 @@ understand the basics of working with version control. The default backend is git, if want to use a another backend please install the appropriate tool (mercurial, darcs or bzr). -To use bzr as backend, please also install the %{name}-bzr package. +To use bzr as backend, please also install the %{name}-%{bazaar} package. To start using the package please read %{_pkgdocdir}/README. @@ -82,6 +92,20 @@ etckeeper with bzr backend, install this package. %endif # with_bzr +%if 0%{?with_brz} +%package brz +Summary: Support for bzr with etckeeper (via breezy) +BuildRequires: python3-devel +BuildRequires: brz +Requires: %{name} = %{version}-%{release} +Requires: brz + +%description brz +This package provides a brz (breezy) backend for etckeeper, if you want to use +etckeeper with (bzr) bazaar repositories, install this package. +%endif # with_brz + + %if 0%{?with_dnf} %package dnf Summary: DNF plugin for etckeeper support @@ -107,6 +131,7 @@ etckeeper with DNF, install this package. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %if 0%{?with_yum} # we set yum here, so the yum plugin gets built, and change that to # dnf later, if needed @@ -131,6 +156,7 @@ sed -e 's|^systemddir=.*|systemddir=%{_unitdir}|' \ # move each plugin in its own subdirectory, so each has its own build/ # directory mkdir bzr-plugin ; mv etckeeper-bzr bzr-plugin +mkdir brz-plugin ; mv etckeeper-brz brz-plugin mkdir dnf-plugin ; mv etckeeper-dnf dnf-plugin cp -av %{SOURCE1} . @@ -144,6 +170,12 @@ pushd bzr-plugin popd %endif # with_bzr +%if 0%{?with_brz} +pushd brz-plugin +%{__python3} etckeeper-brz/__init__.py build +popd +%endif # with_brz + %if 0%{?with_dnf} pushd dnf-plugin %if 0%{?dnf_uses_python3} @@ -166,6 +198,12 @@ pushd bzr-plugin popd %endif # with_bzr +%if 0%{?with_brz} +pushd brz-plugin +%{__python3} etckeeper-brz/__init__.py install -O1 --skip-build --root %{buildroot} +popd +%endif # with_brz + %if 0%{?with_dnf} pushd dnf-plugin %if 0%{?dnf_uses_python3} @@ -261,6 +299,17 @@ fi %endif # with_bzr +%if 0%{?with_brz} +%files brz +# co-own the plugins directories +# breezy installs to sitearch +%dir %{python3_sitelib}/breezy/ +%dir %{python3_sitelib}/breezy/plugins/ +%{python3_sitelib}/breezy/plugins/%{name}/ +%{python3_sitelib}/brz_%{name}-*.egg-info +%endif # with_brz + + %if 0%{?with_dnf} %files dnf %if 0%{?dnf_uses_python3} @@ -278,6 +327,11 @@ fi %changelog +* Fri Nov 01 2019 Miro Hrončok - 1.18.10-5 +- Add breezy plugin on Fedora 31+ +- Remove bazaar plugin on Fedora 32+ +- https://fedoraproject.org/wiki/Changes/ReplaceBazaarWithBreezy + * Fri Oct 4 2019 Thomas Moschny - 1.18.10-4 - Package fixes for CentOS8. - Build dnf plugin on CentOS7. From 432ea14d18a77ce7e241325cbcd02fc94b3235d7 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Sun, 17 Nov 2019 11:31:18 +0100 Subject: [PATCH 085/128] Add patch to fix logging with Ansible (#1762693). --- ...eeper-1.18.10-fix-output-for-ansible.patch | 189 ++++++++++++++++++ etckeeper.spec | 16 +- 2 files changed, 199 insertions(+), 6 deletions(-) create mode 100644 etckeeper-1.18.10-fix-output-for-ansible.patch diff --git a/etckeeper-1.18.10-fix-output-for-ansible.patch b/etckeeper-1.18.10-fix-output-for-ansible.patch new file mode 100644 index 0000000..b1d0a65 --- /dev/null +++ b/etckeeper-1.18.10-fix-output-for-ansible.patch @@ -0,0 +1,189 @@ +From afbdce2d24b46bc91840044b953aca8b68f20fd3 Mon Sep 17 00:00:00 2001 +From: Alan Jenkins +Date: Wed, 10 Apr 2019 00:19:14 +0100 +Subject: [PATCH 1/3] DNF: fix logging, now it will work from Ansible + +The Ansible dnf module uses the python dnf bindings. In contexts like +these, stdout/stderr is owned by the host app (Ansible). dnf should not +mess with stdout/stderr, unless the host app asks it to log there. + +Specifically, it was breaking the JSON output of the Ansible module. +This was only noticeable when the etckeeper message began with a "[" +character. Ansible has a mechanism to try and skip header messages like +login banners. However, "[" is a valid character to start a JSON document. + +https://unix.stackexchange.com/questions/511210/ansible-dnf-module-module-failure/ + +This requires decoding the etckeeper messages into unicode. For gory +details, see the code comment. + +Also enable unicode string literals. This reduces differences between py2 +and py3 semantics; it is universal inside the dnf code. + +Also when I tested the failure case, I noticed the exit code was not +printed correctly. Fix it. +--- + etckeeper-dnf/etckeeper.py | 62 ++++++++++++++++++++++++++++++++------ + 1 file changed, 53 insertions(+), 9 deletions(-) + +diff --git a/etckeeper-dnf/etckeeper.py b/etckeeper-dnf/etckeeper.py +index e8a1a51..d3376ac 100644 +--- a/etckeeper-dnf/etckeeper.py ++++ b/etckeeper-dnf/etckeeper.py +@@ -7,9 +7,11 @@ + # Distutils code below was copied from etckeeper-bzr distributed with v1.15 + # + ++from __future__ import unicode_literals + from dnfpluginscore import logger + +-import os ++import subprocess ++import locale + import dnf + + +@@ -17,20 +19,62 @@ class Etckeeper(dnf.Plugin): + + name = 'etckeeper' + +- def _out(self, msg): ++ def _debug(self, msg): + logger.debug('Etckeeper plugin: %s', msg) + ++ def _log_pipe(self, pipe): ++ # etckeeper & git messages should be encoded using the default locale ++ # (or us-ascii, which is a strict subset). ++ # ++ # Normally py2 breaks if you print arbitrary unicode when stdout is ++ # not a tty (UnicodeEncodeError). However the dnf cli has a ++ # workaround; it will survive regardless of what we do. ++ # ++ # Then we have logging.FileHandler. In py3 it will use ++ # locale.getpreferredencoding(False) by default. This should match ++ # the default locale, unless we are on py < 3.2, AND the program ++ # forgot to call setlocale(LC_ALL, ""). dnf already calls ++ # setlocale(LC_ALL, ""), so it will be nice and consistent. ++ # In fact it is the dnf *library* that calls setlocale, this is not ++ # really recommended, but it makes me pretty confident here. ++ # ++ # errors='replace' means that decode errors give us '\ufffd', which ++ # causes UnicodeEncodeError in some character encodings. Let us ++ # simulate a round-trip through errors='replace', by replacing them ++ # with a question mark. ++ # ++ # The story for py2 is more complex. In libdnf 2.6.3, the logfile ++ # is equivalent to hardcoding a utf8 encoding. That is survivable ++ # (and if it changes to match py3, it will also be fine). ++ # ++ encoding = locale.getpreferredencoding(False) ++ for line in pipe: ++ line = line.decode(encoding, 'replace') ++ line.replace('\ufffd', '?') ++ line = line.rstrip('\n') ++ logger.info('%s', line) ++ + def resolved(self): +- self._out('pre transaction commit') +- command = '%s %s' % ('etckeeper', " pre-install") +- ret = os.system(command) ++ self._debug('pre transaction commit') ++ proc = subprocess.Popen(("etckeeper", "pre-install"), ++ stdout=subprocess.PIPE, ++ stderr=subprocess.STDOUT, ++ close_fds=True) ++ self._log_pipe(proc.stdout) ++ ret = proc.wait() + if ret != 0: +- raise dnf.exceptions.Error('etckeeper returned %d' % (ret >> 8)) ++ raise dnf.exceptions.Error('etckeeper returned %d' % ret) + + def transaction(self): +- self._out('post transaction commit') +- command = '%s %s > /dev/null' % ('etckeeper', "post-install") +- os.system(command) ++ self._debug('post transaction commit') ++ proc = subprocess.Popen(("etckeeper", "post-install"), ++ stdout=None, ++ stderr=subprocess.PIPE, ++ close_fds=True) ++ self._log_pipe(proc.stderr) ++ ret = proc.wait() ++ if ret != 0: ++ logger.err('etckeeper returned %d' % ret) + + if __name__ == "__main__": + from distutils.core import setup +-- +2.23.0 + + +From dcf94a71d46ff0e9981319b9a7786d565bec9a28 Mon Sep 17 00:00:00 2001 +From: Alan Jenkins +Date: Tue, 23 Apr 2019 20:15:01 +0100 +Subject: [PATCH 2/3] Do not use dnfpluginscore.logger + +dnfpluginscore is not core support for dnf plugins, it is just a +collection of "core plugins" for dnf. There is equally +dnfpluginsextras and dnfpluginsextras.logger. + +A comment in dnf.logger comment says the logger name 'dnf.plugin' is "api". +So we can safely rely on that name. + +Technically you can install etckeeper without the dnfpluginscore package +(at least I managed to run into this for python2, on a Fedora 29 system +which uses python3 for dnf by default). +--- + etckeeper-dnf/etckeeper.py | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/etckeeper-dnf/etckeeper.py b/etckeeper-dnf/etckeeper.py +index d3376ac..72f3dc5 100644 +--- a/etckeeper-dnf/etckeeper.py ++++ b/etckeeper-dnf/etckeeper.py +@@ -8,12 +8,14 @@ + # + + from __future__ import unicode_literals +-from dnfpluginscore import logger + ++import logging + import subprocess + import locale + import dnf + ++logger = logging.getLogger('dnf.plugin') ++ + + class Etckeeper(dnf.Plugin): + +-- +2.23.0 + + +From 6e9e369353457c2cfb303e2be15a14381e2eb53a Mon Sep 17 00:00:00 2001 +From: Thomas Moschny +Date: Tue, 19 Nov 2019 08:27:03 +0100 +Subject: [PATCH 3/3] setup() doesn't accept unicode strings. + +--- + etckeeper-dnf/etckeeper.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/etckeeper-dnf/etckeeper.py b/etckeeper-dnf/etckeeper.py +index 72f3dc5..7a9c256 100644 +--- a/etckeeper-dnf/etckeeper.py ++++ b/etckeeper-dnf/etckeeper.py +@@ -80,6 +80,6 @@ class Etckeeper(dnf.Plugin): + + if __name__ == "__main__": + from distutils.core import setup +- setup(name="dnf-etckeeper", +- packages=["dnf-plugins"], +- package_dir={"dnf-plugins":"etckeeper-dnf"}) ++ setup(name=str("dnf-etckeeper"), ++ packages=[str("dnf-plugins")], ++ package_dir={str("dnf-plugins"):str("etckeeper-dnf")}) +-- +2.23.0 + diff --git a/etckeeper.spec b/etckeeper.spec index e1a467b..652e7f2 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -33,17 +33,22 @@ Name: etckeeper Version: 1.18.10 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) License: GPLv2+ URL: https://etckeeper.branchable.com/ Source0: https://git.joeyh.name/index.cgi/etckeeper.git/snapshot/%{name}-%{version}.tar.gz Source1: README.fedora +# build plugins separately Patch0: etckeeper-makefile-remove-python-plugins.patch +# see rhbz#1460461 Patch1: etckeeper-1.18.7-fix-rpm-ignores.patch +# see rhbz#1480843 Patch2: etckeeper-1.18.7-fix-hg-warnings.patch # From https://bugs.launchpad.net/ubuntu/+source/etckeeper/+bug/1826855 Patch3: etckeeper-add-breezy-python3-plugin.patch +# see rhbz#1762693 and https://github.com/ansible/ansible/issues/54949 +Patch4: etckeeper-1.18.10-fix-output-for-ansible.patch BuildArch: noarch BuildRequires: %{__markdown} Requires: git >= 1.6.1 @@ -127,11 +132,7 @@ etckeeper with DNF, install this package. %prep -%setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 +%autosetup -p1 %if 0%{?with_yum} # we set yum here, so the yum plugin gets built, and change that to # dnf later, if needed @@ -327,6 +328,9 @@ fi %changelog +* Tue Nov 19 2019 Thomas Moschny - 1.18.10-6 +- Add patch to fix logging with Ansible (#1762693). + * Fri Nov 01 2019 Miro Hrončok - 1.18.10-5 - Add breezy plugin on Fedora 31+ - Remove bazaar plugin on Fedora 32+ From 01729ff78013c472053207a5fe914f610f0b0d69 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Sun, 1 Dec 2019 13:22:39 +0100 Subject: [PATCH 086/128] Update to 1.18.12. New version of patch to fix logging with Ansible (#1762693). --- ...eeper-1.18.10-fix-output-for-ansible.patch | 189 ------------------ ...eeper-1.18.12-fix-output-for-ansible.patch | 162 +++++++++++++++ etckeeper.spec | 10 +- sources | 2 +- 4 files changed, 170 insertions(+), 193 deletions(-) delete mode 100644 etckeeper-1.18.10-fix-output-for-ansible.patch create mode 100644 etckeeper-1.18.12-fix-output-for-ansible.patch diff --git a/etckeeper-1.18.10-fix-output-for-ansible.patch b/etckeeper-1.18.10-fix-output-for-ansible.patch deleted file mode 100644 index b1d0a65..0000000 --- a/etckeeper-1.18.10-fix-output-for-ansible.patch +++ /dev/null @@ -1,189 +0,0 @@ -From afbdce2d24b46bc91840044b953aca8b68f20fd3 Mon Sep 17 00:00:00 2001 -From: Alan Jenkins -Date: Wed, 10 Apr 2019 00:19:14 +0100 -Subject: [PATCH 1/3] DNF: fix logging, now it will work from Ansible - -The Ansible dnf module uses the python dnf bindings. In contexts like -these, stdout/stderr is owned by the host app (Ansible). dnf should not -mess with stdout/stderr, unless the host app asks it to log there. - -Specifically, it was breaking the JSON output of the Ansible module. -This was only noticeable when the etckeeper message began with a "[" -character. Ansible has a mechanism to try and skip header messages like -login banners. However, "[" is a valid character to start a JSON document. - -https://unix.stackexchange.com/questions/511210/ansible-dnf-module-module-failure/ - -This requires decoding the etckeeper messages into unicode. For gory -details, see the code comment. - -Also enable unicode string literals. This reduces differences between py2 -and py3 semantics; it is universal inside the dnf code. - -Also when I tested the failure case, I noticed the exit code was not -printed correctly. Fix it. ---- - etckeeper-dnf/etckeeper.py | 62 ++++++++++++++++++++++++++++++++------ - 1 file changed, 53 insertions(+), 9 deletions(-) - -diff --git a/etckeeper-dnf/etckeeper.py b/etckeeper-dnf/etckeeper.py -index e8a1a51..d3376ac 100644 ---- a/etckeeper-dnf/etckeeper.py -+++ b/etckeeper-dnf/etckeeper.py -@@ -7,9 +7,11 @@ - # Distutils code below was copied from etckeeper-bzr distributed with v1.15 - # - -+from __future__ import unicode_literals - from dnfpluginscore import logger - --import os -+import subprocess -+import locale - import dnf - - -@@ -17,20 +19,62 @@ class Etckeeper(dnf.Plugin): - - name = 'etckeeper' - -- def _out(self, msg): -+ def _debug(self, msg): - logger.debug('Etckeeper plugin: %s', msg) - -+ def _log_pipe(self, pipe): -+ # etckeeper & git messages should be encoded using the default locale -+ # (or us-ascii, which is a strict subset). -+ # -+ # Normally py2 breaks if you print arbitrary unicode when stdout is -+ # not a tty (UnicodeEncodeError). However the dnf cli has a -+ # workaround; it will survive regardless of what we do. -+ # -+ # Then we have logging.FileHandler. In py3 it will use -+ # locale.getpreferredencoding(False) by default. This should match -+ # the default locale, unless we are on py < 3.2, AND the program -+ # forgot to call setlocale(LC_ALL, ""). dnf already calls -+ # setlocale(LC_ALL, ""), so it will be nice and consistent. -+ # In fact it is the dnf *library* that calls setlocale, this is not -+ # really recommended, but it makes me pretty confident here. -+ # -+ # errors='replace' means that decode errors give us '\ufffd', which -+ # causes UnicodeEncodeError in some character encodings. Let us -+ # simulate a round-trip through errors='replace', by replacing them -+ # with a question mark. -+ # -+ # The story for py2 is more complex. In libdnf 2.6.3, the logfile -+ # is equivalent to hardcoding a utf8 encoding. That is survivable -+ # (and if it changes to match py3, it will also be fine). -+ # -+ encoding = locale.getpreferredencoding(False) -+ for line in pipe: -+ line = line.decode(encoding, 'replace') -+ line.replace('\ufffd', '?') -+ line = line.rstrip('\n') -+ logger.info('%s', line) -+ - def resolved(self): -- self._out('pre transaction commit') -- command = '%s %s' % ('etckeeper', " pre-install") -- ret = os.system(command) -+ self._debug('pre transaction commit') -+ proc = subprocess.Popen(("etckeeper", "pre-install"), -+ stdout=subprocess.PIPE, -+ stderr=subprocess.STDOUT, -+ close_fds=True) -+ self._log_pipe(proc.stdout) -+ ret = proc.wait() - if ret != 0: -- raise dnf.exceptions.Error('etckeeper returned %d' % (ret >> 8)) -+ raise dnf.exceptions.Error('etckeeper returned %d' % ret) - - def transaction(self): -- self._out('post transaction commit') -- command = '%s %s > /dev/null' % ('etckeeper', "post-install") -- os.system(command) -+ self._debug('post transaction commit') -+ proc = subprocess.Popen(("etckeeper", "post-install"), -+ stdout=None, -+ stderr=subprocess.PIPE, -+ close_fds=True) -+ self._log_pipe(proc.stderr) -+ ret = proc.wait() -+ if ret != 0: -+ logger.err('etckeeper returned %d' % ret) - - if __name__ == "__main__": - from distutils.core import setup --- -2.23.0 - - -From dcf94a71d46ff0e9981319b9a7786d565bec9a28 Mon Sep 17 00:00:00 2001 -From: Alan Jenkins -Date: Tue, 23 Apr 2019 20:15:01 +0100 -Subject: [PATCH 2/3] Do not use dnfpluginscore.logger - -dnfpluginscore is not core support for dnf plugins, it is just a -collection of "core plugins" for dnf. There is equally -dnfpluginsextras and dnfpluginsextras.logger. - -A comment in dnf.logger comment says the logger name 'dnf.plugin' is "api". -So we can safely rely on that name. - -Technically you can install etckeeper without the dnfpluginscore package -(at least I managed to run into this for python2, on a Fedora 29 system -which uses python3 for dnf by default). ---- - etckeeper-dnf/etckeeper.py | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/etckeeper-dnf/etckeeper.py b/etckeeper-dnf/etckeeper.py -index d3376ac..72f3dc5 100644 ---- a/etckeeper-dnf/etckeeper.py -+++ b/etckeeper-dnf/etckeeper.py -@@ -8,12 +8,14 @@ - # - - from __future__ import unicode_literals --from dnfpluginscore import logger - -+import logging - import subprocess - import locale - import dnf - -+logger = logging.getLogger('dnf.plugin') -+ - - class Etckeeper(dnf.Plugin): - --- -2.23.0 - - -From 6e9e369353457c2cfb303e2be15a14381e2eb53a Mon Sep 17 00:00:00 2001 -From: Thomas Moschny -Date: Tue, 19 Nov 2019 08:27:03 +0100 -Subject: [PATCH 3/3] setup() doesn't accept unicode strings. - ---- - etckeeper-dnf/etckeeper.py | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/etckeeper-dnf/etckeeper.py b/etckeeper-dnf/etckeeper.py -index 72f3dc5..7a9c256 100644 ---- a/etckeeper-dnf/etckeeper.py -+++ b/etckeeper-dnf/etckeeper.py -@@ -80,6 +80,6 @@ class Etckeeper(dnf.Plugin): - - if __name__ == "__main__": - from distutils.core import setup -- setup(name="dnf-etckeeper", -- packages=["dnf-plugins"], -- package_dir={"dnf-plugins":"etckeeper-dnf"}) -+ setup(name=str("dnf-etckeeper"), -+ packages=[str("dnf-plugins")], -+ package_dir={str("dnf-plugins"):str("etckeeper-dnf")}) --- -2.23.0 - diff --git a/etckeeper-1.18.12-fix-output-for-ansible.patch b/etckeeper-1.18.12-fix-output-for-ansible.patch new file mode 100644 index 0000000..7ca4b4f --- /dev/null +++ b/etckeeper-1.18.12-fix-output-for-ansible.patch @@ -0,0 +1,162 @@ +From 8266a4fb45621e08085c58537a531f33fc7eca74 Mon Sep 17 00:00:00 2001 +From: Alan Jenkins +Date: Wed, 10 Apr 2019 00:19:14 +0100 +Subject: [PATCH 1/2] DNF: stderr is not ours to log to (and doing so breaks + Ansible) + +stderr does not belong to etckeeper-dnf +--------------------------------------- + +The Ansible dnf module uses the python dnf bindings. In contexts like +these, stdout/stderr is owned by the host app (Ansible). dnf should not +mess with stdout/stderr, unless the host app asks it to log there. + +Specifically, we were breaking the JSON output of the Ansible dnf module. +This was only noticeable when the etckeeper message began with a "[" +character. Ansible has a mechanism to try and skip header messages like +login banners. However, "[" is a valid character to start a JSON document. + +https://unix.stackexchange.com/questions/511210/ansible-dnf-module-module-failure/ + +Solution +-------- + +Instead, log any non-zero exit status through the dnf logger. + +For the pre-transaction etckeeper run, this message replaces an exception. +So we now avoid logging a traceback, which did not appear to add anything +useful. (In my testing, dnf was continued to install after the exception +was logged). + +I have also added a warning message for the post-transaction etckeeper run. + +I switched from os.system() to subprocess.call(). The latter interface +supports better error reporting. (When I tested os.system(), it returned +an errno number which was indistinguishable from an exit code). + +etckeeper >/dev/null 2>&1 +-------------------------- + +Any specific error messages from etckeeper are now discarded. Because +unfortunately, python conventions about passing text strings have been +somewhat unclear. It is an error to log strings if the encoding settings +of a registered logger cannot handle them. Because a "bad" character +causes the entire string to be discarded, and optionally an exception +printed to stderr. In a previous proposal I showed code that should be +correct in all expected cases. However, the length of comment required to +define "all expected cases" was not very reassuring. + +That was on top of explaining that dnf has a workaround that will avoid +raising exceptions when arbitrary unicode is logged to stdout. My proposal +had to include that explanation, to show that we were not breaking a +system package manager. + +It might sound strange to talk about error messages with characters +we cannot encode. But I have one word for you: "filenames". + +(After the recent python PR #14008[1], logging.basicConfig() defaults +to errors='backslashreplace'. Also, errors= can be manually specified when +creating a lower-level logging "Handler". I think this will resolve the +problem in the future. It means that when programs are written for this +new version of python, it should be the responsibility of the log setup +code to prevent UnicodeEncodeError.) + +[1] https://github.com/python/cpython/pull/14008 +--- + etckeeper-dnf/etckeeper.py | 27 ++++++++++++++++----------- + 1 file changed, 16 insertions(+), 11 deletions(-) + +diff --git a/etckeeper-dnf/etckeeper.py b/etckeeper-dnf/etckeeper.py +index e8a1a51..69edd88 100644 +--- a/etckeeper-dnf/etckeeper.py ++++ b/etckeeper-dnf/etckeeper.py +@@ -9,7 +9,7 @@ + + from dnfpluginscore import logger + +-import os ++import subprocess + import dnf + + +@@ -17,20 +17,25 @@ class Etckeeper(dnf.Plugin): + + name = 'etckeeper' + +- def _out(self, msg): +- logger.debug('Etckeeper plugin: %s', msg) ++ def _run_command(self, command): ++ logger.debug('Etckeeper plugin: %s', command) ++ try: ++ with open("/dev/null", "wb") as devnull: ++ ret = subprocess.call(("etckeeper", command), ++ stdout=devnull, stderr=devnull, ++ close_fds=True) ++ if ret > 0: ++ logger.warning('"etckeeper %s" failed (exit code %d)' % (command, ret)) ++ if ret < 0: ++ logger.warning('"etckeeper %s" died (signal %d)' % (command, -ret)) ++ except OSError as err: ++ logger.warning('Failed to run "etckeeper %s": %s' % (command, err)) + + def resolved(self): +- self._out('pre transaction commit') +- command = '%s %s' % ('etckeeper', " pre-install") +- ret = os.system(command) +- if ret != 0: +- raise dnf.exceptions.Error('etckeeper returned %d' % (ret >> 8)) ++ self._run_command("pre-install") + + def transaction(self): +- self._out('post transaction commit') +- command = '%s %s > /dev/null' % ('etckeeper', "post-install") +- os.system(command) ++ self._run_command("post-install") + + if __name__ == "__main__": + from distutils.core import setup +-- +2.23.0 + + +From 7cda9678b1e60c0495a2a522721b319843d5fae0 Mon Sep 17 00:00:00 2001 +From: Alan Jenkins +Date: Tue, 23 Apr 2019 20:15:01 +0100 +Subject: [PATCH 2/2] Do not use dnfpluginscore.logger + +dnfpluginscore is not core support for dnf plugins, it is just a +collection of "core plugins" for dnf. There is equally +dnfpluginsextras and dnfpluginsextras.logger. + +A comment in dnf.logger comment says the logger name 'dnf.plugin' is "api". +So we can safely rely on that name. + +Technically you can install etckeeper without the dnfpluginscore package +(at least I managed to run into this for python2, on a Fedora 29 system +which uses python3 for dnf by default). +--- + etckeeper-dnf/etckeeper.py | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/etckeeper-dnf/etckeeper.py b/etckeeper-dnf/etckeeper.py +index 69edd88..d9dd2c3 100644 +--- a/etckeeper-dnf/etckeeper.py ++++ b/etckeeper-dnf/etckeeper.py +@@ -7,11 +7,12 @@ + # Distutils code below was copied from etckeeper-bzr distributed with v1.15 + # + +-from dnfpluginscore import logger +- ++import logging + import subprocess + import dnf + ++logger = logging.getLogger('dnf.plugin') ++ + + class Etckeeper(dnf.Plugin): + +-- +2.23.0 + diff --git a/etckeeper.spec b/etckeeper.spec index 652e7f2..f73ccd4 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -32,8 +32,8 @@ %endif Name: etckeeper -Version: 1.18.10 -Release: 6%{?dist} +Version: 1.18.12 +Release: 1%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) License: GPLv2+ URL: https://etckeeper.branchable.com/ @@ -48,7 +48,7 @@ Patch2: etckeeper-1.18.7-fix-hg-warnings.patch # From https://bugs.launchpad.net/ubuntu/+source/etckeeper/+bug/1826855 Patch3: etckeeper-add-breezy-python3-plugin.patch # see rhbz#1762693 and https://github.com/ansible/ansible/issues/54949 -Patch4: etckeeper-1.18.10-fix-output-for-ansible.patch +Patch4: etckeeper-1.18.12-fix-output-for-ansible.patch BuildArch: noarch BuildRequires: %{__markdown} Requires: git >= 1.6.1 @@ -328,6 +328,10 @@ fi %changelog +* Sun Dec 1 2019 Thomas Moschny - 1.18.12-1 +- Update to 1.18.12. +- New version of patch to fix logging with Ansible (#1762693). + * Tue Nov 19 2019 Thomas Moschny - 1.18.10-6 - Add patch to fix logging with Ansible (#1762693). diff --git a/sources b/sources index 033b121..67c6744 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (etckeeper-1.18.10.tar.gz) = 57eb91823c37f364e7ade6b25d2ab91fc99d1192a606fd09370c2876a0440120a625f30167fc52fb16b53ef9f7a58a1329bfe9567cbc2c91da06a345ebbe8e05 +SHA512 (etckeeper-1.18.12.tar.gz) = 7fb75d89bbf69d5ef29fc93f34f8368f0d93adb6f89a96be4769be4a58faff793682f5a5fc6f6f2bf51bc5a151a28b61319396a4298cbf0aa75ff3c1bbb660d7 From b5242302d7ab14023482da08cbb888a3cce49067 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 17:52:48 +0000 Subject: [PATCH 087/128] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- etckeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/etckeeper.spec b/etckeeper.spec index f73ccd4..ef9b69f 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -33,7 +33,7 @@ Name: etckeeper Version: 1.18.12 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) License: GPLv2+ URL: https://etckeeper.branchable.com/ @@ -328,6 +328,9 @@ fi %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 1.18.12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sun Dec 1 2019 Thomas Moschny - 1.18.12-1 - Update to 1.18.12. - New version of patch to fix logging with Ansible (#1762693). From f73e2c4c3204ce64af91a716b32f0bef36fcffdd Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Sat, 14 Mar 2020 10:01:09 +0100 Subject: [PATCH 088/128] Update to 1.18.14. Include zsh completion. Mark cron file as config file. --- etckeeper.spec | 14 +++++++++++--- sources | 2 +- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/etckeeper.spec b/etckeeper.spec index ef9b69f..6e3f101 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -32,8 +32,8 @@ %endif Name: etckeeper -Version: 1.18.12 -Release: 2%{?dist} +Version: 1.18.14 +Release: 1%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) License: GPLv2+ URL: https://etckeeper.branchable.com/ @@ -271,7 +271,7 @@ fi %{_sysconfdir}/%{name}/*.d %{_sysconfdir}/%{name}/daily %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf -%{_sysconfdir}/cron.daily/%{name} +%config(noreplace) %{_sysconfdir}/cron.daily/%{name} %if 0%{?fedora} || 0%{?rhel} >= 7 %dir %{_datadir}/bash-completion %dir %{_datadir}/bash-completion/completions @@ -280,6 +280,9 @@ fi %dir %{_sysconfdir}/bash_completion.d %{_sysconfdir}/bash_completion.d/%{name} %endif +%dir %{_datadir}/zsh +%dir %{_datadir}/zsh/vendor-completions +%{_datadir}/zsh/vendor-completions/_%{name} %if 0%{?with_yum} %dir %{_prefix}/lib/yum-plugins %{_prefix}/lib/yum-plugins/%{name}.* @@ -328,6 +331,11 @@ fi %changelog +* Sat Mar 14 2020 Thomas Moschny - 1.18.14-1 +- Update to 1.18.14. +- Include zsh completion. +- Mark cron file as config file. + * Tue Jan 28 2020 Fedora Release Engineering - 1.18.12-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 67c6744..3db483a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (etckeeper-1.18.12.tar.gz) = 7fb75d89bbf69d5ef29fc93f34f8368f0d93adb6f89a96be4769be4a58faff793682f5a5fc6f6f2bf51bc5a151a28b61319396a4298cbf0aa75ff3c1bbb660d7 +SHA512 (etckeeper-1.18.14.tar.gz) = 1bc01845d47ce3af1ef56474745843e8be6e005da90a21bed302fe73476fbf1f64b84fae7dac73139c394ca698bd146e1609fa34ebbc6737ba73a6f61e670948 From aa83d10631bbae0345ba750b6b50c9bef97682aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 26 May 2020 02:45:06 +0200 Subject: [PATCH 089/128] Rebuilt for Python 3.9 --- etckeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/etckeeper.spec b/etckeeper.spec index 6e3f101..438d140 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -33,7 +33,7 @@ Name: etckeeper Version: 1.18.14 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) License: GPLv2+ URL: https://etckeeper.branchable.com/ @@ -331,6 +331,9 @@ fi %changelog +* Tue May 26 2020 Miro Hrončok - 1.18.14-2 +- Rebuilt for Python 3.9 + * Sat Mar 14 2020 Thomas Moschny - 1.18.14-1 - Update to 1.18.14. - Include zsh completion. From 53ae57e5948483aec3bd205af1aaa10ffb42c874 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 16:59:01 +0000 Subject: [PATCH 090/128] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- etckeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/etckeeper.spec b/etckeeper.spec index 438d140..4bc5413 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -33,7 +33,7 @@ Name: etckeeper Version: 1.18.14 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) License: GPLv2+ URL: https://etckeeper.branchable.com/ @@ -331,6 +331,9 @@ fi %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 1.18.14-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue May 26 2020 Miro Hrončok - 1.18.14-2 - Rebuilt for Python 3.9 From 13f683035f0bda4e03e1700fa5bdd1ce294f926a Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Mon, 4 Jan 2021 22:15:48 +0000 Subject: [PATCH 091/128] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- etckeeper.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/etckeeper.spec b/etckeeper.spec index 4bc5413..e020900 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -121,6 +121,7 @@ BuildRequires: python2-devel %endif # dnf_uses_python3 BuildRequires: dnf BuildRequires: dnf-plugins-core +BuildRequires: make Requires: %{name} = %{version}-%{release} Requires: dnf Requires: dnf-plugins-core From 66ed97daa7d0a600cdbb59240fc595085383ccf9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 05:02:05 +0000 Subject: [PATCH 092/128] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- etckeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/etckeeper.spec b/etckeeper.spec index e020900..7eca136 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -33,7 +33,7 @@ Name: etckeeper Version: 1.18.14 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) License: GPLv2+ URL: https://etckeeper.branchable.com/ @@ -332,6 +332,9 @@ fi %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1.18.14-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 1.18.14-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From e194c21ca5c430e78ddf6dc0522a4ab974541647 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Tue, 9 Feb 2021 20:59:56 +0100 Subject: [PATCH 093/128] Update to 1.18.16. Update spec file, remove obsolete conditionals. --- cron.daily | 8 ++++ etckeeper.spec | 112 +++++++++++++++---------------------------------- sources | 2 +- 3 files changed, 43 insertions(+), 79 deletions(-) create mode 100644 cron.daily diff --git a/cron.daily b/cron.daily new file mode 100644 index 0000000..eb74401 --- /dev/null +++ b/cron.daily @@ -0,0 +1,8 @@ +#!/bin/sh +set -e +if [ -e /etc/etckeeper/daily ] && [ -e /etc/etckeeper/etckeeper.conf ]; then + . /etc/etckeeper/etckeeper.conf + if [ "$AVOID_DAILY_AUTOCOMMITS" != "1" ]; then + /etc/etckeeper/daily + fi +fi diff --git a/etckeeper.spec b/etckeeper.spec index 7eca136..87993a3 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -1,29 +1,14 @@ %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} -%if (0%{?fedora} && 0%{?fedora} < 32) || (0%{?rhel} && 0%{?rhel} <= 7) +%if 0%{?rhel} && 0%{?rhel} <= 7 +%global with_yum 1 %global with_bzr 1 -%endif - -%if 0%{?fedora} >= 31 -%global with_brz 1 -# this is used to mention the correct package in descriptions -%global bazaar brz -%else %global bazaar bzr %endif -%if (0%{?fedora} && 0%{?fedora} <= 30) || (0%{?rhel} && 0%{?rhel} <= 7) -%global with_yum 1 -%endif - -%if 0%{?fedora} || 0%{?rhel} >= 7 -%global with_dnf 1 -%global with_systemd 1 -%global __markdown %{_bindir}/markdown_py -%global hostname_dep hostname -%else -%global __markdown %{_bindir}/markdown -%global hostname_dep net-tools +%if 0%{?fedora} +%global with_brz 1 +%global bazaar brz %endif %if 0%{?fedora} || 0%{?rhel} >= 8 @@ -32,13 +17,14 @@ %endif Name: etckeeper -Version: 1.18.14 -Release: 4%{?dist} +Version: 1.18.16 +Release: 1%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) License: GPLv2+ URL: https://etckeeper.branchable.com/ Source0: https://git.joeyh.name/index.cgi/etckeeper.git/snapshot/%{name}-%{version}.tar.gz Source1: README.fedora +Source2: cron.daily # build plugins separately Patch0: etckeeper-makefile-remove-python-plugins.patch # see rhbz#1460461 @@ -50,22 +36,20 @@ Patch3: etckeeper-add-breezy-python3-plugin.patch # see rhbz#1762693 and https://github.com/ansible/ansible/issues/54949 Patch4: etckeeper-1.18.12-fix-output-for-ansible.patch BuildArch: noarch -BuildRequires: %{__markdown} +BuildRequires: %{_bindir}/markdown_py Requires: git >= 1.6.1 Requires: perl-interpreter Requires: crontabs Requires: findutils -Requires: %{hostname_dep} +Requires: hostname Requires: which %if 0%{?dnf_is_mandatory} Requires: %{name}-dnf = %{version}-%{release} %endif # dnf_is_mandatory -%if 0%{?with_systemd} BuildRequires: systemd Requires(post): systemd Requires(preun): systemd Requires(postun): systemd -%endif # with_systemd %description The etckeeper program is a tool to let /etc be stored in a git, @@ -78,7 +62,7 @@ understand the basics of working with version control. The default backend is git, if want to use a another backend please install the appropriate tool (mercurial, darcs or bzr). -To use bzr as backend, please also install the %{name}-%{bazaar} package. +%{?bazaar: To use bazaar/breezy as backend, please also install the %{name}-%{bazaar} package.} To start using the package please read %{_pkgdocdir}/README. @@ -111,7 +95,6 @@ etckeeper with (bzr) bazaar repositories, install this package. %endif # with_brz -%if 0%{?with_dnf} %package dnf Summary: DNF plugin for etckeeper support %if 0%{?dnf_uses_python3} @@ -129,7 +112,6 @@ Requires: dnf-plugins-core %description dnf This package provides a DNF plugin for etckeeper. If you want to use etckeeper with DNF, install this package. -%endif # with_dnf %prep @@ -150,11 +132,8 @@ sed -e 's|^prefix=.*|prefix=%{_prefix}|' \ -e 's|^vardir=.*|vardir=%{_localstatedir}|' \ -e 's|^INSTALL=.*|INSTALL=install -p|' \ -e 's|^CP=.*|CP=cp -pR|' \ + -e 's|^systemddir=.*|systemddir=%{_unitdir}|' \ -i Makefile -%if 0%{?with_systemd} -sed -e 's|^systemddir=.*|systemddir=%{_unitdir}|' \ - -i Makefile -%endif # with_systemd # move each plugin in its own subdirectory, so each has its own build/ # directory mkdir bzr-plugin ; mv etckeeper-bzr bzr-plugin @@ -164,54 +143,57 @@ cp -av %{SOURCE1} . %build -make %{?_smp_mflags} +%make_build %if 0%{?with_bzr} pushd bzr-plugin -%{__python2} etckeeper-bzr/__init__.py build +%define py_setup etckeeper-bzr/__init__.py +%py2_build popd %endif # with_bzr %if 0%{?with_brz} pushd brz-plugin -%{__python3} etckeeper-brz/__init__.py build +%define py_setup etckeeper-brz/__init__.py +%py3_build popd %endif # with_brz -%if 0%{?with_dnf} pushd dnf-plugin +%define py_setup etckeeper-dnf/etckeeper.py build %if 0%{?dnf_uses_python3} -%{__python3} etckeeper-dnf/etckeeper.py build --executable="%{__python3} -s" +%py3_build %else -%{__python2} etckeeper-dnf/etckeeper.py build --executable="%{__python2} -s" +%py2_build %endif # dnf_uses_python3 popd -%endif # with_dnf -%{__markdown} -f README.html README.md +markdown_py -f README.html README.md %install -make install DESTDIR=%{buildroot} +%make_install %if 0%{?with_bzr} pushd bzr-plugin -%{__python2} etckeeper-bzr/__init__.py install -O1 --skip-build --root %{buildroot} +%define py_setup etckeeper-bzr/__init__.py +%py2_install popd %endif # with_bzr %if 0%{?with_brz} pushd brz-plugin -%{__python3} etckeeper-brz/__init__.py install -O1 --skip-build --root %{buildroot} +%define py_setup etckeeper-brz/__init__.py +%py3_install popd %endif # with_brz -%if 0%{?with_dnf} pushd dnf-plugin +%define py_setup etckeeper-dnf/etckeeper.py build %if 0%{?dnf_uses_python3} -%{__python3} etckeeper-dnf/etckeeper.py install -O1 --skip-build --root %{buildroot} +%py3_install %else -%{__python2} etckeeper-dnf/etckeeper.py install -O1 --skip-build --root %{buildroot} +%py2_install %endif # dnf_uses_python3 popd @@ -219,48 +201,27 @@ popd sed -e 's|HIGHLEVEL_PACKAGE_MANAGER=.*|HIGHLEVEL_PACKAGE_MANAGER=dnf|' \ -i %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf %endif # dnf_is_mandatory -%endif # with_dnf -install -D -p debian/cron.daily %{buildroot}%{_sysconfdir}/cron.daily/%{name} +install -D -p %{SOURCE2} %{buildroot}%{_sysconfdir}/cron.daily/%{name} install -d %{buildroot}%{_localstatedir}/cache/%{name} -# on RHEL < 7, move the completion file back to /etc/bash_completion.d -%if !(0%{?fedora} || 0%{?rhel} >= 7) -install -d %{buildroot}%{_sysconfdir}/bash_completion.d -mv %{buildroot}%{_datadir}/bash-completion/completions/%{name} \ - %{buildroot}%{_sysconfdir}/bash_completion.d/%{name} -%endif - -# remove unit files if not used (note: /lib/systemd/system is the -# original, hardcoded location from the etckeeper Makefile) -%if !0%{?with_systemd} -rm %{buildroot}/lib/systemd/system/%{name}.service -rm %{buildroot}/lib/systemd/system/%{name}.timer -%endif - %post if [ $1 -gt 1 ] ; then %{_bindir}/%{name} update-ignore fi -%if 0%{?with_systemd} %systemd_post %{name}.service %systemd_post %{name}.timer -%endif # with_systemd %preun -%if 0%{?with_systemd} %systemd_preun %{name}.service %systemd_preun %{name}.timer -%endif # with_systemd %postun -%if 0%{?with_systemd} %systemd_postun %{name}.service %systemd_postun %{name}.timer -%endif # with_systemd %files @@ -273,14 +234,9 @@ fi %{_sysconfdir}/%{name}/daily %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf %config(noreplace) %{_sysconfdir}/cron.daily/%{name} -%if 0%{?fedora} || 0%{?rhel} >= 7 %dir %{_datadir}/bash-completion %dir %{_datadir}/bash-completion/completions %{_datadir}/bash-completion/completions/%{name} -%else -%dir %{_sysconfdir}/bash_completion.d -%{_sysconfdir}/bash_completion.d/%{name} -%endif %dir %{_datadir}/zsh %dir %{_datadir}/zsh/vendor-completions %{_datadir}/zsh/vendor-completions/_%{name} @@ -291,10 +247,8 @@ fi %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/%{name}.conf %endif # with_yum %{_localstatedir}/cache/%{name} -%if 0%{?with_systemd} %{_unitdir}/%{name}.service %{_unitdir}/%{name}.timer -%endif # with_systemd %if 0%{?with_bzr} @@ -315,7 +269,6 @@ fi %endif # with_brz -%if 0%{?with_dnf} %files dnf %if 0%{?dnf_uses_python3} %{python3_sitelib}/dnf-plugins/%{name}.py @@ -328,10 +281,13 @@ fi %exclude %{python2_sitelib}/dnf-plugins/__init__.py* %{python2_sitelib}/dnf_%{name}-*.egg-info %endif # dnf_uses_python3 -%endif # with_dnf %changelog +* Tue Feb 9 2021 Thomas Moschny - 1.18.16-1 +- Update to 1.18.16. +- Update spec file, remove obsolete conditionals. + * Tue Jan 26 2021 Fedora Release Engineering - 1.18.14-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 3db483a..def5238 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (etckeeper-1.18.14.tar.gz) = 1bc01845d47ce3af1ef56474745843e8be6e005da90a21bed302fe73476fbf1f64b84fae7dac73139c394ca698bd146e1609fa34ebbc6737ba73a6f61e670948 +SHA512 (etckeeper-1.18.16.tar.gz) = 48a9f0089f72d62d68467b17a5a441dbf219c6b5b817b8ef2160b5f50eef6492257393c482a658ce11a97983ed037caa80b92e289049987bde5f8fbb22c98f07 From 316aacc07c7ed4059585efed24175e7846f8a5b8 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 4 Jun 2021 20:03:59 +0200 Subject: [PATCH 094/128] Rebuilt for Python 3.10 --- etckeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/etckeeper.spec b/etckeeper.spec index 87993a3..ec2b8cb 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -18,7 +18,7 @@ Name: etckeeper Version: 1.18.16 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) License: GPLv2+ URL: https://etckeeper.branchable.com/ @@ -284,6 +284,9 @@ fi %changelog +* Fri Jun 04 2021 Python Maint - 1.18.16-2 +- Rebuilt for Python 3.10 + * Tue Feb 9 2021 Thomas Moschny - 1.18.16-1 - Update to 1.18.16. - Update spec file, remove obsolete conditionals. From 55c1720ac07d7605149853fe9d265a20fba9abe5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 22:26:27 +0000 Subject: [PATCH 095/128] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- etckeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/etckeeper.spec b/etckeeper.spec index ec2b8cb..50f8201 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -18,7 +18,7 @@ Name: etckeeper Version: 1.18.16 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) License: GPLv2+ URL: https://etckeeper.branchable.com/ @@ -284,6 +284,9 @@ fi %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 1.18.16-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Fri Jun 04 2021 Python Maint - 1.18.16-2 - Rebuilt for Python 3.10 From 967f251aef1b32b49174a4ab85ab4c18e3a1aabc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 02:27:09 +0000 Subject: [PATCH 096/128] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- etckeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/etckeeper.spec b/etckeeper.spec index 50f8201..5496466 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -18,7 +18,7 @@ Name: etckeeper Version: 1.18.16 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) License: GPLv2+ URL: https://etckeeper.branchable.com/ @@ -284,6 +284,9 @@ fi %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 1.18.16-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Jul 21 2021 Fedora Release Engineering - 1.18.16-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 8e0916c332740c23397a60f530bf9b797acca1a0 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Mon, 31 Jan 2022 21:28:26 +0100 Subject: [PATCH 097/128] Exclude egg-info directories for dnf, bzr and brz plugins (#2048085). --- etckeeper.spec | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/etckeeper.spec b/etckeeper.spec index 5496466..18cc10e 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -18,7 +18,7 @@ Name: etckeeper Version: 1.18.16 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) License: GPLv2+ URL: https://etckeeper.branchable.com/ @@ -254,7 +254,8 @@ fi %if 0%{?with_bzr} %files bzr %{python2_sitelib}/bzrlib/plugins/%{name} -%{python2_sitelib}/bzr_%{name}-*.egg-info +# exclude egg-info dir, doesn't contain meaningful information +%exclude %{python2_sitelib}/bzr_%{name}-*.egg-info %endif # with_bzr @@ -265,7 +266,8 @@ fi %dir %{python3_sitelib}/breezy/ %dir %{python3_sitelib}/breezy/plugins/ %{python3_sitelib}/breezy/plugins/%{name}/ -%{python3_sitelib}/brz_%{name}-*.egg-info +# exclude egg-info dir, doesn't contain meaningful information +%exclude %{python3_sitelib}/brz_%{name}-*.egg-info %endif # with_brz @@ -275,15 +277,20 @@ fi %exclude %{python3_sitelib}/dnf-plugins/__init__.py %{python3_sitelib}/dnf-plugins/__pycache__/%{name}.* %exclude %{python3_sitelib}/dnf-plugins/__pycache__/__init__.* -%{python3_sitelib}/dnf_%{name}-*.egg-info +# exclude egg-info dir, doesn't contain meaningful information +%exclude %{python3_sitelib}/dnf_%{name}-*.egg-info %else %{python2_sitelib}/dnf-plugins/%{name}.py* %exclude %{python2_sitelib}/dnf-plugins/__init__.py* -%{python2_sitelib}/dnf_%{name}-*.egg-info +# exclude egg-info dir, doesn't contain meaningful information +%exclude %{python2_sitelib}/dnf_%{name}-*.egg-info %endif # dnf_uses_python3 %changelog +* Mon Jan 31 2022 Thomas Moschny - 1.18.16-5 +- Exclude egg-info directories for dnf, bzr and brz plugins (#2048085). + * Thu Jan 20 2022 Fedora Release Engineering - 1.18.16-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From f8810ee6ee509508320d1229386c9a3aec1d075d Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 16 Feb 2022 09:11:42 -0500 Subject: [PATCH 098/128] require git-core instead of git Avoid pulling in more dependencies that necessary. The functionality required is in git-core. --- etckeeper.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/etckeeper.spec b/etckeeper.spec index 18cc10e..8f31ec2 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -18,7 +18,7 @@ Name: etckeeper Version: 1.18.16 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) License: GPLv2+ URL: https://etckeeper.branchable.com/ @@ -37,7 +37,7 @@ Patch3: etckeeper-add-breezy-python3-plugin.patch Patch4: etckeeper-1.18.12-fix-output-for-ansible.patch BuildArch: noarch BuildRequires: %{_bindir}/markdown_py -Requires: git >= 1.6.1 +Requires: git-core Requires: perl-interpreter Requires: crontabs Requires: findutils @@ -288,6 +288,9 @@ fi %changelog +* Wed Feb 16 2022 Todd Zullinger - 1.18.16-6 +- Require git-core instead of git + * Mon Jan 31 2022 Thomas Moschny - 1.18.16-5 - Exclude egg-info directories for dnf, bzr and brz plugins (#2048085). From 3467fc0502e0a4c3703496de20eb97c1f3672c7a Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Tue, 8 Mar 2022 22:41:15 +0100 Subject: [PATCH 099/128] Update to 1.18.17. --- etckeeper.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/etckeeper.spec b/etckeeper.spec index 8f31ec2..17a5813 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -17,8 +17,8 @@ %endif Name: etckeeper -Version: 1.18.16 -Release: 6%{?dist} +Version: 1.18.17 +Release: 1%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) License: GPLv2+ URL: https://etckeeper.branchable.com/ @@ -288,6 +288,9 @@ fi %changelog +* Tue Mar 8 2022 Thomas Moschny - 1.18.17-1 +- Update to 1.18.17. + * Wed Feb 16 2022 Todd Zullinger - 1.18.16-6 - Require git-core instead of git diff --git a/sources b/sources index def5238..73fac7e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (etckeeper-1.18.16.tar.gz) = 48a9f0089f72d62d68467b17a5a441dbf219c6b5b817b8ef2160b5f50eef6492257393c482a658ce11a97983ed037caa80b92e289049987bde5f8fbb22c98f07 +SHA512 (etckeeper-1.18.17.tar.gz) = 6e75d0f38c8d27ba290ab6e1a51d50ca7a736c958da7a1edb792a5c7f1eedd4848adbb43571425f127bf2c5fe39d5b7887968b09178ca5385ec0abeaeb6cfa00 From b4e7dcf856fea47dbf955a94f96cc6c6cd36cebd Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 15 Jun 2022 18:25:29 +0200 Subject: [PATCH 100/128] Rebuilt for Python 3.11 --- etckeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/etckeeper.spec b/etckeeper.spec index 17a5813..6d95a13 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -18,7 +18,7 @@ Name: etckeeper Version: 1.18.17 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) License: GPLv2+ URL: https://etckeeper.branchable.com/ @@ -288,6 +288,9 @@ fi %changelog +* Wed Jun 15 2022 Python Maint - 1.18.17-2 +- Rebuilt for Python 3.11 + * Tue Mar 8 2022 Thomas Moschny - 1.18.17-1 - Update to 1.18.17. From c1c0ae2a9408843d98b28d97cccb6a72c8178392 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 02:32:53 +0000 Subject: [PATCH 101/128] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- etckeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/etckeeper.spec b/etckeeper.spec index 6d95a13..23c5983 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -18,7 +18,7 @@ Name: etckeeper Version: 1.18.17 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) License: GPLv2+ URL: https://etckeeper.branchable.com/ @@ -288,6 +288,9 @@ fi %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 1.18.17-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Jun 15 2022 Python Maint - 1.18.17-2 - Rebuilt for Python 3.11 From 7a7d0e9726d50aab13ebfffe9eed202c7c3b2d90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 21 Oct 2022 12:01:10 +0200 Subject: [PATCH 102/128] BuilRequire setuptools when Python >= 3.12 The dnf and brz setups use distutils. Python 3.12 removes distutils, but setuptools can provide it instead. --- etckeeper.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/etckeeper.spec b/etckeeper.spec index 23c5983..c2c7a66 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -85,6 +85,7 @@ etckeeper with bzr backend, install this package. %package brz Summary: Support for bzr with etckeeper (via breezy) BuildRequires: python3-devel +BuildRequires: (python3-setuptools if python3-devel >= 3.12) BuildRequires: brz Requires: %{name} = %{version}-%{release} Requires: brz @@ -99,6 +100,7 @@ etckeeper with (bzr) bazaar repositories, install this package. Summary: DNF plugin for etckeeper support %if 0%{?dnf_uses_python3} BuildRequires: python3-devel +BuildRequires: (python3-setuptools if python3-devel >= 3.12) %else BuildRequires: python2-devel %endif # dnf_uses_python3 From 271a95d1f06422d6a5b8d434ce9a551f7159868e Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Sat, 3 Dec 2022 12:11:17 +0100 Subject: [PATCH 103/128] Update to 1.18.18. Rebase patches. Update patch to fix logging with Ansible (#1917461). BuilRequire setuptools when Python >= 3.12. --- ...eeper-1.18.12-fix-output-for-ansible.patch | 162 ------------------ ...=> etckeeper-1.18.18-fix-hg-warnings.patch | 4 +- ...eeper-1.18.18-fix-output-for-ansible.patch | 52 ++++++ etckeeper.spec | 15 +- sources | 2 +- 5 files changed, 66 insertions(+), 169 deletions(-) delete mode 100644 etckeeper-1.18.12-fix-output-for-ansible.patch rename etckeeper-1.18.7-fix-hg-warnings.patch => etckeeper-1.18.18-fix-hg-warnings.patch (95%) create mode 100644 etckeeper-1.18.18-fix-output-for-ansible.patch diff --git a/etckeeper-1.18.12-fix-output-for-ansible.patch b/etckeeper-1.18.12-fix-output-for-ansible.patch deleted file mode 100644 index 7ca4b4f..0000000 --- a/etckeeper-1.18.12-fix-output-for-ansible.patch +++ /dev/null @@ -1,162 +0,0 @@ -From 8266a4fb45621e08085c58537a531f33fc7eca74 Mon Sep 17 00:00:00 2001 -From: Alan Jenkins -Date: Wed, 10 Apr 2019 00:19:14 +0100 -Subject: [PATCH 1/2] DNF: stderr is not ours to log to (and doing so breaks - Ansible) - -stderr does not belong to etckeeper-dnf ---------------------------------------- - -The Ansible dnf module uses the python dnf bindings. In contexts like -these, stdout/stderr is owned by the host app (Ansible). dnf should not -mess with stdout/stderr, unless the host app asks it to log there. - -Specifically, we were breaking the JSON output of the Ansible dnf module. -This was only noticeable when the etckeeper message began with a "[" -character. Ansible has a mechanism to try and skip header messages like -login banners. However, "[" is a valid character to start a JSON document. - -https://unix.stackexchange.com/questions/511210/ansible-dnf-module-module-failure/ - -Solution --------- - -Instead, log any non-zero exit status through the dnf logger. - -For the pre-transaction etckeeper run, this message replaces an exception. -So we now avoid logging a traceback, which did not appear to add anything -useful. (In my testing, dnf was continued to install after the exception -was logged). - -I have also added a warning message for the post-transaction etckeeper run. - -I switched from os.system() to subprocess.call(). The latter interface -supports better error reporting. (When I tested os.system(), it returned -an errno number which was indistinguishable from an exit code). - -etckeeper >/dev/null 2>&1 --------------------------- - -Any specific error messages from etckeeper are now discarded. Because -unfortunately, python conventions about passing text strings have been -somewhat unclear. It is an error to log strings if the encoding settings -of a registered logger cannot handle them. Because a "bad" character -causes the entire string to be discarded, and optionally an exception -printed to stderr. In a previous proposal I showed code that should be -correct in all expected cases. However, the length of comment required to -define "all expected cases" was not very reassuring. - -That was on top of explaining that dnf has a workaround that will avoid -raising exceptions when arbitrary unicode is logged to stdout. My proposal -had to include that explanation, to show that we were not breaking a -system package manager. - -It might sound strange to talk about error messages with characters -we cannot encode. But I have one word for you: "filenames". - -(After the recent python PR #14008[1], logging.basicConfig() defaults -to errors='backslashreplace'. Also, errors= can be manually specified when -creating a lower-level logging "Handler". I think this will resolve the -problem in the future. It means that when programs are written for this -new version of python, it should be the responsibility of the log setup -code to prevent UnicodeEncodeError.) - -[1] https://github.com/python/cpython/pull/14008 ---- - etckeeper-dnf/etckeeper.py | 27 ++++++++++++++++----------- - 1 file changed, 16 insertions(+), 11 deletions(-) - -diff --git a/etckeeper-dnf/etckeeper.py b/etckeeper-dnf/etckeeper.py -index e8a1a51..69edd88 100644 ---- a/etckeeper-dnf/etckeeper.py -+++ b/etckeeper-dnf/etckeeper.py -@@ -9,7 +9,7 @@ - - from dnfpluginscore import logger - --import os -+import subprocess - import dnf - - -@@ -17,20 +17,25 @@ class Etckeeper(dnf.Plugin): - - name = 'etckeeper' - -- def _out(self, msg): -- logger.debug('Etckeeper plugin: %s', msg) -+ def _run_command(self, command): -+ logger.debug('Etckeeper plugin: %s', command) -+ try: -+ with open("/dev/null", "wb") as devnull: -+ ret = subprocess.call(("etckeeper", command), -+ stdout=devnull, stderr=devnull, -+ close_fds=True) -+ if ret > 0: -+ logger.warning('"etckeeper %s" failed (exit code %d)' % (command, ret)) -+ if ret < 0: -+ logger.warning('"etckeeper %s" died (signal %d)' % (command, -ret)) -+ except OSError as err: -+ logger.warning('Failed to run "etckeeper %s": %s' % (command, err)) - - def resolved(self): -- self._out('pre transaction commit') -- command = '%s %s' % ('etckeeper', " pre-install") -- ret = os.system(command) -- if ret != 0: -- raise dnf.exceptions.Error('etckeeper returned %d' % (ret >> 8)) -+ self._run_command("pre-install") - - def transaction(self): -- self._out('post transaction commit') -- command = '%s %s > /dev/null' % ('etckeeper', "post-install") -- os.system(command) -+ self._run_command("post-install") - - if __name__ == "__main__": - from distutils.core import setup --- -2.23.0 - - -From 7cda9678b1e60c0495a2a522721b319843d5fae0 Mon Sep 17 00:00:00 2001 -From: Alan Jenkins -Date: Tue, 23 Apr 2019 20:15:01 +0100 -Subject: [PATCH 2/2] Do not use dnfpluginscore.logger - -dnfpluginscore is not core support for dnf plugins, it is just a -collection of "core plugins" for dnf. There is equally -dnfpluginsextras and dnfpluginsextras.logger. - -A comment in dnf.logger comment says the logger name 'dnf.plugin' is "api". -So we can safely rely on that name. - -Technically you can install etckeeper without the dnfpluginscore package -(at least I managed to run into this for python2, on a Fedora 29 system -which uses python3 for dnf by default). ---- - etckeeper-dnf/etckeeper.py | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/etckeeper-dnf/etckeeper.py b/etckeeper-dnf/etckeeper.py -index 69edd88..d9dd2c3 100644 ---- a/etckeeper-dnf/etckeeper.py -+++ b/etckeeper-dnf/etckeeper.py -@@ -7,11 +7,12 @@ - # Distutils code below was copied from etckeeper-bzr distributed with v1.15 - # - --from dnfpluginscore import logger -- -+import logging - import subprocess - import dnf - -+logger = logging.getLogger('dnf.plugin') -+ - - class Etckeeper(dnf.Plugin): - --- -2.23.0 - diff --git a/etckeeper-1.18.7-fix-hg-warnings.patch b/etckeeper-1.18.18-fix-hg-warnings.patch similarity index 95% rename from etckeeper-1.18.7-fix-hg-warnings.patch rename to etckeeper-1.18.18-fix-hg-warnings.patch index 90c6818..7a74e70 100644 --- a/etckeeper-1.18.7-fix-hg-warnings.patch +++ b/etckeeper-1.18.18-fix-hg-warnings.patch @@ -1,5 +1,5 @@ diff --git a/pre-commit.d/20warn-problem-files b/pre-commit.d/20warn-problem-files -index 6bd5c2b..7899268 100755 +index 43320e4..7899268 100755 --- a/pre-commit.d/20warn-problem-files +++ b/pre-commit.d/20warn-problem-files @@ -1,19 +1,20 @@ @@ -7,7 +7,7 @@ index 6bd5c2b..7899268 100755 set -e -exclude_internal () { -- egrep -v '(^|/)(\.git|\.hg|\.bzr|_darcs)/' +- grep -E -v '(^|/)(\.git|\.hg|\.bzr|_darcs)/' -} +# (Note that when using this, the find expression must end with +# -print or -exec, else the excluded directories will actually be diff --git a/etckeeper-1.18.18-fix-output-for-ansible.patch b/etckeeper-1.18.18-fix-output-for-ansible.patch new file mode 100644 index 0000000..b36af3c --- /dev/null +++ b/etckeeper-1.18.18-fix-output-for-ansible.patch @@ -0,0 +1,52 @@ +diff --git a/etckeeper-dnf/etckeeper.py b/etckeeper-dnf/etckeeper.py +index e8a1a51..7c3210b 100644 +--- a/etckeeper-dnf/etckeeper.py ++++ b/etckeeper-dnf/etckeeper.py +@@ -7,30 +7,34 @@ + # Distutils code below was copied from etckeeper-bzr distributed with v1.15 + # + +-from dnfpluginscore import logger +- +-import os ++import logging ++import subprocess + import dnf + ++logger = logging.getLogger('dnf.plugin') ++ + + class Etckeeper(dnf.Plugin): + + name = 'etckeeper' + +- def _out(self, msg): +- logger.debug('Etckeeper plugin: %s', msg) ++ def _run_command(self, command): ++ logger.debug('Etckeeper plugin: %s', command) ++ try: ++ with open("/dev/null", "wb") as devnull: ++ ret = subprocess.call(("etckeeper", command), ++ stdout=devnull, stderr=devnull, ++ close_fds=True) ++ if ret != 0: ++ raise dnf.exceptions.Error('"etckeeper %s" returned: %d' % (command, ret)) ++ except OSError as err: ++ logger.warning('Failed to run "etckeeper %s": %s' % (command, err)) + + def resolved(self): +- self._out('pre transaction commit') +- command = '%s %s' % ('etckeeper', " pre-install") +- ret = os.system(command) +- if ret != 0: +- raise dnf.exceptions.Error('etckeeper returned %d' % (ret >> 8)) ++ self._run_command("pre-install") + + def transaction(self): +- self._out('post transaction commit') +- command = '%s %s > /dev/null' % ('etckeeper', "post-install") +- os.system(command) ++ self._run_command("post-install") + + if __name__ == "__main__": + from distutils.core import setup diff --git a/etckeeper.spec b/etckeeper.spec index c2c7a66..9debc57 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -17,8 +17,8 @@ %endif Name: etckeeper -Version: 1.18.17 -Release: 3%{?dist} +Version: 1.18.18 +Release: 1%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) License: GPLv2+ URL: https://etckeeper.branchable.com/ @@ -30,11 +30,12 @@ Patch0: etckeeper-makefile-remove-python-plugins.patch # see rhbz#1460461 Patch1: etckeeper-1.18.7-fix-rpm-ignores.patch # see rhbz#1480843 -Patch2: etckeeper-1.18.7-fix-hg-warnings.patch +Patch2: etckeeper-1.18.18-fix-hg-warnings.patch # From https://bugs.launchpad.net/ubuntu/+source/etckeeper/+bug/1826855 Patch3: etckeeper-add-breezy-python3-plugin.patch # see rhbz#1762693 and https://github.com/ansible/ansible/issues/54949 -Patch4: etckeeper-1.18.12-fix-output-for-ansible.patch +# see also rhbz#1917461 +Patch4: etckeeper-1.18.18-fix-output-for-ansible.patch BuildArch: noarch BuildRequires: %{_bindir}/markdown_py Requires: git-core @@ -290,6 +291,12 @@ fi %changelog +* Fri Dec 2 2022 Thomas Moschny - 1.18.18-1 +- Update to 1.18.18. +- Rebase patches. +- Update patch to fix logging with Ansible (#1917461). +- BuilRequire setuptools when Python >= 3.12. + * Thu Jul 21 2022 Fedora Release Engineering - 1.18.17-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 73fac7e..9afa13c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (etckeeper-1.18.17.tar.gz) = 6e75d0f38c8d27ba290ab6e1a51d50ca7a736c958da7a1edb792a5c7f1eedd4848adbb43571425f127bf2c5fe39d5b7887968b09178ca5385ec0abeaeb6cfa00 +SHA512 (etckeeper-1.18.18.tar.gz) = 57b2f7297c0b71e3d39a7838dd3e6599bb3f1275d86200be9d7986f46f0392aa0ba130cb38ba7a5757fcb5d6fa33b4d32233237dba15e8ce9fb8c52565cf251b From 1b9858c84cb4d4411b4dc245ead537217c750f5a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 02:49:56 +0000 Subject: [PATCH 104/128] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- etckeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/etckeeper.spec b/etckeeper.spec index 9debc57..d2e13d3 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -18,7 +18,7 @@ Name: etckeeper Version: 1.18.18 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) License: GPLv2+ URL: https://etckeeper.branchable.com/ @@ -291,6 +291,9 @@ fi %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 1.18.18-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Fri Dec 2 2022 Thomas Moschny - 1.18.18-1 - Update to 1.18.18. - Rebase patches. From c9ab258fe63b0d20f1f698c294e5b505d99ef676 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Sat, 28 Jan 2023 10:13:06 +0100 Subject: [PATCH 105/128] Update to 1.18.20. --- etckeeper.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/etckeeper.spec b/etckeeper.spec index d2e13d3..4c40156 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -17,8 +17,8 @@ %endif Name: etckeeper -Version: 1.18.18 -Release: 2%{?dist} +Version: 1.18.20 +Release: 1%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) License: GPLv2+ URL: https://etckeeper.branchable.com/ @@ -291,6 +291,9 @@ fi %changelog +* Sat Jan 28 2023 Thomas Moschny - 1.18.20-1 +- Update to 1.18.20. + * Thu Jan 19 2023 Fedora Release Engineering - 1.18.18-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild @@ -298,7 +301,7 @@ fi - Update to 1.18.18. - Rebase patches. - Update patch to fix logging with Ansible (#1917461). -- BuilRequire setuptools when Python >= 3.12. +- BuildRequire setuptools when Python >= 3.12. * Thu Jul 21 2022 Fedora Release Engineering - 1.18.17-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 9afa13c..5d4192f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (etckeeper-1.18.18.tar.gz) = 57b2f7297c0b71e3d39a7838dd3e6599bb3f1275d86200be9d7986f46f0392aa0ba130cb38ba7a5757fcb5d6fa33b4d32233237dba15e8ce9fb8c52565cf251b +SHA512 (etckeeper-1.18.20.tar.gz) = b190da11ac589d6240c8293d961b75efe01e835091f9b5fba84c3c9062ffb4cb1dc52c9ea2bdf881f021c7d5584c4487d3c60121fdcb0a2a35e349c8321422c6 From 87aff6b5d0c02135b2bfaa0998cbeb5a816768cd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 19:02:32 +0000 Subject: [PATCH 106/128] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- etckeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/etckeeper.spec b/etckeeper.spec index 4c40156..3825fd2 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -18,7 +18,7 @@ Name: etckeeper Version: 1.18.20 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) License: GPLv2+ URL: https://etckeeper.branchable.com/ @@ -291,6 +291,9 @@ fi %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 1.18.20-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 28 2023 Thomas Moschny - 1.18.20-1 - Update to 1.18.20. From 02c3e185a70d54ffc2523e7fa1367d52796e9b83 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 25 Jul 2023 12:22:02 +0200 Subject: [PATCH 107/128] Rebuilt for Python 3.12 --- etckeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/etckeeper.spec b/etckeeper.spec index 3825fd2..aa4d67d 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -18,7 +18,7 @@ Name: etckeeper Version: 1.18.20 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) License: GPLv2+ URL: https://etckeeper.branchable.com/ @@ -291,6 +291,9 @@ fi %changelog +* Tue Jul 25 2023 Python Maint - 1.18.20-3 +- Rebuilt for Python 3.12 + * Wed Jul 19 2023 Fedora Release Engineering - 1.18.20-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 42f89e1794f7254a65c2b165651f94db9eb32d02 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 18:39:10 +0000 Subject: [PATCH 108/128] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- etckeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/etckeeper.spec b/etckeeper.spec index aa4d67d..4c6e831 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -18,7 +18,7 @@ Name: etckeeper Version: 1.18.20 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) License: GPLv2+ URL: https://etckeeper.branchable.com/ @@ -291,6 +291,9 @@ fi %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 1.18.20-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Tue Jul 25 2023 Python Maint - 1.18.20-3 - Rebuilt for Python 3.12 From a5bc5650757adfbc4b2286f7019ff7db40609809 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 10:55:18 +0000 Subject: [PATCH 109/128] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- etckeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/etckeeper.spec b/etckeeper.spec index 4c6e831..42b6983 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -18,7 +18,7 @@ Name: etckeeper Version: 1.18.20 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) License: GPLv2+ URL: https://etckeeper.branchable.com/ @@ -291,6 +291,9 @@ fi %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 1.18.20-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 1.18.20-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 7daca89518bc5a8114637e86a5002250d4a397a7 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Wed, 1 May 2024 19:02:47 +0200 Subject: [PATCH 110/128] Update to 1.18.21. --- etckeeper.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/etckeeper.spec b/etckeeper.spec index 42b6983..30c7b1a 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -17,8 +17,8 @@ %endif Name: etckeeper -Version: 1.18.20 -Release: 5%{?dist} +Version: 1.18.21 +Release: 1%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) License: GPLv2+ URL: https://etckeeper.branchable.com/ @@ -291,6 +291,9 @@ fi %changelog +* Wed May 1 2024 Thomas Moschny - 1.18.21-1 +- Update to 1.18.21. + * Wed Jan 24 2024 Fedora Release Engineering - 1.18.20-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index 5d4192f..cd0fb6a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (etckeeper-1.18.20.tar.gz) = b190da11ac589d6240c8293d961b75efe01e835091f9b5fba84c3c9062ffb4cb1dc52c9ea2bdf881f021c7d5584c4487d3c60121fdcb0a2a35e349c8321422c6 +SHA512 (etckeeper-1.18.21.tar.gz) = c23bd0f24e04b565ceae77e552eb00926dae16f4a6c8c183c5a6bb404d5351ee7a040e01287b7c0d3d530bc8dea62cd2336b3151a349998aa9c145f1258ac2a0 From d1ea1e7de658e3263c0cbea20e8051f0d575c914 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Wed, 1 May 2024 19:37:30 +0200 Subject: [PATCH 111/128] Add patch for rhbz#2203408 from pr#7. --- etckeeper-1.18.21-bz2203408.patch | 11 +++++++++++ etckeeper.spec | 3 +++ 2 files changed, 14 insertions(+) create mode 100644 etckeeper-1.18.21-bz2203408.patch diff --git a/etckeeper-1.18.21-bz2203408.patch b/etckeeper-1.18.21-bz2203408.patch new file mode 100644 index 0000000..537192b --- /dev/null +++ b/etckeeper-1.18.21-bz2203408.patch @@ -0,0 +1,11 @@ +--- a/post-install.d/50vcs-commit 2023-12-05 10:45:18.967497833 +0100 ++++ b/post-install.d/50vcs-commit 2023-12-05 10:46:00.848138455 +0100 +@@ -6,7 +6,7 @@ + # Parent process is etckeeper + # (Only procps ps is currently supported, others will fail, + # so this may end up empty.) +-ETCKEEPER_PID=$( ps --no-headers -o ppid "${PPID}" 2>/dev/null | sed 's/^ *//' ) ++ETCKEEPER_PID=$( ps --no-headers -o ppid "$$" 2>/dev/null | sed 's/^ *//' ) + + # Find the parent of etckeeper and get the command line of the process + if ! [ -z "${ETCKEEPER_PID}" ]; then diff --git a/etckeeper.spec b/etckeeper.spec index 30c7b1a..a38dfb8 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -36,6 +36,8 @@ Patch3: etckeeper-add-breezy-python3-plugin.patch # see rhbz#1762693 and https://github.com/ansible/ansible/issues/54949 # see also rhbz#1917461 Patch4: etckeeper-1.18.18-fix-output-for-ansible.patch +# see rhbz#2203408 and pr#7 +Patch5: etckeeper-1.18.21-bz2203408.patch BuildArch: noarch BuildRequires: %{_bindir}/markdown_py Requires: git-core @@ -293,6 +295,7 @@ fi %changelog * Wed May 1 2024 Thomas Moschny - 1.18.21-1 - Update to 1.18.21. +- Add patch for rhbz#2203408 from pr#7. * Wed Jan 24 2024 Fedora Release Engineering - 1.18.20-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From f01b9f8030ba65a4b01b45a3d55a781cc055a6fc Mon Sep 17 00:00:00 2001 From: Evan Goode Date: Tue, 23 May 2023 12:26:57 -0400 Subject: [PATCH 112/128] Depend on python3-dnf, not dnf DNF is being replaced by a new package manager, DNF 5, in Fedora 39+. The `dnf` package will soon be obsoleted by the `dnf5` package. The old DNF 4 library functionality will still be (and always has been) available under the `python3-dnf` package; the `dnf` package only provides `/usr/bin/dnf`. Eventually, etckeeper should switch to using libdnf5. --- etckeeper.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/etckeeper.spec b/etckeeper.spec index a38dfb8..8ec6022 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -104,14 +104,16 @@ Summary: DNF plugin for etckeeper support %if 0%{?dnf_uses_python3} BuildRequires: python3-devel BuildRequires: (python3-setuptools if python3-devel >= 3.12) +BuildRequires: python3-dnf +Requires: python3-dnf %else BuildRequires: python2-devel -%endif # dnf_uses_python3 BuildRequires: dnf +Requires: dnf +%endif # dnf_uses_python3 BuildRequires: dnf-plugins-core BuildRequires: make Requires: %{name} = %{version}-%{release} -Requires: dnf Requires: dnf-plugins-core %description dnf From 589409b24c2049234829e2be294fbc8679979707 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Wed, 1 May 2024 20:59:58 +0200 Subject: [PATCH 113/128] Merged PR#6. --- etckeeper.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/etckeeper.spec b/etckeeper.spec index 8ec6022..25b7112 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -298,6 +298,7 @@ fi * Wed May 1 2024 Thomas Moschny - 1.18.21-1 - Update to 1.18.21. - Add patch for rhbz#2203408 from pr#7. +- Depend on python3-dnf, not dnf (pr#6). * Wed Jan 24 2024 Fedora Release Engineering - 1.18.20-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 4482a1283a6fc040c4ebd6617a8de904e9137e55 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 7 Jun 2024 22:43:55 +0200 Subject: [PATCH 114/128] Rebuilt for Python 3.13 --- etckeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/etckeeper.spec b/etckeeper.spec index 25b7112..a651af2 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -18,7 +18,7 @@ Name: etckeeper Version: 1.18.21 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) License: GPLv2+ URL: https://etckeeper.branchable.com/ @@ -295,6 +295,9 @@ fi %changelog +* Fri Jun 07 2024 Python Maint - 1.18.21-2 +- Rebuilt for Python 3.13 + * Wed May 1 2024 Thomas Moschny - 1.18.21-1 - Update to 1.18.21. - Add patch for rhbz#2203408 from pr#7. From c40275ea18448958b44d24f8885fb46e825d117d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 22:29:26 +0000 Subject: [PATCH 115/128] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- etckeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/etckeeper.spec b/etckeeper.spec index a651af2..6d39921 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -18,7 +18,7 @@ Name: etckeeper Version: 1.18.21 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) License: GPLv2+ URL: https://etckeeper.branchable.com/ @@ -295,6 +295,9 @@ fi %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 1.18.21-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Fri Jun 07 2024 Python Maint - 1.18.21-2 - Rebuilt for Python 3.13 From 922d9a0613dad7b10129cb499b2e747aee7b227f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Thu, 25 Jul 2024 23:42:02 +0200 Subject: [PATCH 116/128] convert GPLv2+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- etckeeper.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/etckeeper.spec b/etckeeper.spec index 6d39921..3720976 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -18,9 +18,10 @@ Name: etckeeper Version: 1.18.21 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) -License: GPLv2+ +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later URL: https://etckeeper.branchable.com/ Source0: https://git.joeyh.name/index.cgi/etckeeper.git/snapshot/%{name}-%{version}.tar.gz Source1: README.fedora @@ -295,6 +296,9 @@ fi %changelog +* Thu Jul 25 2024 Miroslav Suchý - 1.18.21-4 +- convert license to SPDX + * Wed Jul 17 2024 Fedora Release Engineering - 1.18.21-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From fde6b6dbd954a87f58bf10e1032a6300e93be4da Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 17:32:22 +0000 Subject: [PATCH 117/128] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- etckeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/etckeeper.spec b/etckeeper.spec index 3720976..1ed606d 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -18,7 +18,7 @@ Name: etckeeper Version: 1.18.21 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later @@ -296,6 +296,9 @@ fi %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 1.18.21-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Jul 25 2024 Miroslav Suchý - 1.18.21-4 - convert license to SPDX From 4958724e4dcaf9f022392f1cbc4c145afd797879 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 3 Jun 2025 15:25:40 +0200 Subject: [PATCH 118/128] Rebuilt for Python 3.14 --- etckeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/etckeeper.spec b/etckeeper.spec index 1ed606d..ef5a149 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -18,7 +18,7 @@ Name: etckeeper Version: 1.18.21 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later @@ -296,6 +296,9 @@ fi %changelog +* Tue Jun 03 2025 Python Maint - 1.18.21-6 +- Rebuilt for Python 3.14 + * Thu Jan 16 2025 Fedora Release Engineering - 1.18.21-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 79b07d68a8420a84cc7fab928728dda70428784f Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Sun, 29 Jun 2025 20:29:30 +0200 Subject: [PATCH 119/128] Update to 1.18.22. --- etckeeper.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/etckeeper.spec b/etckeeper.spec index ef5a149..e6919b9 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -17,8 +17,8 @@ %endif Name: etckeeper -Version: 1.18.21 -Release: 6%{?dist} +Version: 1.18.22 +Release: 1%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later @@ -296,6 +296,9 @@ fi %changelog +* Sun Jun 29 2025 Thomas Moschny - 1.18.22-1 +- Update to 1.18.22. + * Tue Jun 03 2025 Python Maint - 1.18.21-6 - Rebuilt for Python 3.14 diff --git a/sources b/sources index cd0fb6a..1412813 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (etckeeper-1.18.21.tar.gz) = c23bd0f24e04b565ceae77e552eb00926dae16f4a6c8c183c5a6bb404d5351ee7a040e01287b7c0d3d530bc8dea62cd2336b3151a349998aa9c145f1258ac2a0 +SHA512 (etckeeper-1.18.22.tar.gz) = e35ab90862c1f4426c17aec4d9ffe5975c652b290645ac333e9f27fcc157b9eba5e0efe73553a400464102c939f085f4e08f4b04564a015ad6941b1d50dbbe76 From 9bb9852468381f773d12aa521597e50fae8fe47c Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Mon, 14 Jul 2025 15:36:31 +0200 Subject: [PATCH 120/128] Remove all EL7-related conditionals and parts. --- etckeeper.spec | 94 ++------------------------------------------------ 1 file changed, 3 insertions(+), 91 deletions(-) diff --git a/etckeeper.spec b/etckeeper.spec index e6919b9..e962e5d 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -1,19 +1,7 @@ %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} -%if 0%{?rhel} && 0%{?rhel} <= 7 -%global with_yum 1 -%global with_bzr 1 -%global bazaar bzr -%endif - %if 0%{?fedora} %global with_brz 1 -%global bazaar brz -%endif - -%if 0%{?fedora} || 0%{?rhel} >= 8 -%global dnf_is_mandatory 1 -%global dnf_uses_python3 1 %endif Name: etckeeper @@ -47,9 +35,7 @@ Requires: crontabs Requires: findutils Requires: hostname Requires: which -%if 0%{?dnf_is_mandatory} Requires: %{name}-dnf = %{version}-%{release} -%endif # dnf_is_mandatory BuildRequires: systemd Requires(post): systemd Requires(preun): systemd @@ -66,25 +52,11 @@ understand the basics of working with version control. The default backend is git, if want to use a another backend please install the appropriate tool (mercurial, darcs or bzr). -%{?bazaar: To use bazaar/breezy as backend, please also install the %{name}-%{bazaar} package.} +%{?with_brz: To use breezy as bzr backend, please also install the %{name}-brz package.} To start using the package please read %{_pkgdocdir}/README. -%if 0%{?with_bzr} -%package bzr -Summary: Support for bzr with etckeeper -BuildRequires: python2-devel -BuildRequires: bzr -Requires: %{name} = %{version}-%{release} -Requires: bzr - -%description bzr -This package provides a bzr backend for etckeeper, if you want to use -etckeeper with bzr backend, install this package. -%endif # with_bzr - - %if 0%{?with_brz} %package brz Summary: Support for bzr with etckeeper (via breezy) @@ -102,16 +74,10 @@ etckeeper with (bzr) bazaar repositories, install this package. %package dnf Summary: DNF plugin for etckeeper support -%if 0%{?dnf_uses_python3} BuildRequires: python3-devel BuildRequires: (python3-setuptools if python3-devel >= 3.12) BuildRequires: python3-dnf Requires: python3-dnf -%else -BuildRequires: python2-devel -BuildRequires: dnf -Requires: dnf -%endif # dnf_uses_python3 BuildRequires: dnf-plugins-core BuildRequires: make Requires: %{name} = %{version}-%{release} @@ -124,13 +90,7 @@ etckeeper with DNF, install this package. %prep %autosetup -p1 -%if 0%{?with_yum} -# we set yum here, so the yum plugin gets built, and change that to -# dnf later, if needed -sed -e 's|HIGHLEVEL_PACKAGE_MANAGER=.*|HIGHLEVEL_PACKAGE_MANAGER=yum|' \ -%else sed -e 's|HIGHLEVEL_PACKAGE_MANAGER=.*|HIGHLEVEL_PACKAGE_MANAGER=dnf|' \ -%endif # with_yum -e 's|LOWLEVEL_PACKAGE_MANAGER=.*|LOWLEVEL_PACKAGE_MANAGER=rpm|' \ -i etckeeper.conf sed -e 's|^prefix=.*|prefix=%{_prefix}|' \ @@ -144,7 +104,6 @@ sed -e 's|^prefix=.*|prefix=%{_prefix}|' \ -i Makefile # move each plugin in its own subdirectory, so each has its own build/ # directory -mkdir bzr-plugin ; mv etckeeper-bzr bzr-plugin mkdir brz-plugin ; mv etckeeper-brz brz-plugin mkdir dnf-plugin ; mv etckeeper-dnf dnf-plugin cp -av %{SOURCE1} . @@ -153,13 +112,6 @@ cp -av %{SOURCE1} . %build %make_build -%if 0%{?with_bzr} -pushd bzr-plugin -%define py_setup etckeeper-bzr/__init__.py -%py2_build -popd -%endif # with_bzr - %if 0%{?with_brz} pushd brz-plugin %define py_setup etckeeper-brz/__init__.py @@ -169,11 +121,7 @@ popd pushd dnf-plugin %define py_setup etckeeper-dnf/etckeeper.py build -%if 0%{?dnf_uses_python3} %py3_build -%else -%py2_build -%endif # dnf_uses_python3 popd markdown_py -f README.html README.md @@ -182,13 +130,6 @@ markdown_py -f README.html README.md %install %make_install -%if 0%{?with_bzr} -pushd bzr-plugin -%define py_setup etckeeper-bzr/__init__.py -%py2_install -popd -%endif # with_bzr - %if 0%{?with_brz} pushd brz-plugin %define py_setup etckeeper-brz/__init__.py @@ -198,18 +139,9 @@ popd pushd dnf-plugin %define py_setup etckeeper-dnf/etckeeper.py build -%if 0%{?dnf_uses_python3} %py3_install -%else -%py2_install -%endif # dnf_uses_python3 popd -%if 0%{?dnf_is_mandatory} -sed -e 's|HIGHLEVEL_PACKAGE_MANAGER=.*|HIGHLEVEL_PACKAGE_MANAGER=dnf|' \ - -i %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf -%endif # dnf_is_mandatory - install -D -p %{SOURCE2} %{buildroot}%{_sysconfdir}/cron.daily/%{name} install -d %{buildroot}%{_localstatedir}/cache/%{name} @@ -248,25 +180,11 @@ fi %dir %{_datadir}/zsh %dir %{_datadir}/zsh/vendor-completions %{_datadir}/zsh/vendor-completions/_%{name} -%if 0%{?with_yum} -%dir %{_prefix}/lib/yum-plugins -%{_prefix}/lib/yum-plugins/%{name}.* -%dir %{_sysconfdir}/yum/pluginconf.d -%config(noreplace) %{_sysconfdir}/yum/pluginconf.d/%{name}.conf -%endif # with_yum %{_localstatedir}/cache/%{name} %{_unitdir}/%{name}.service %{_unitdir}/%{name}.timer -%if 0%{?with_bzr} -%files bzr -%{python2_sitelib}/bzrlib/plugins/%{name} -# exclude egg-info dir, doesn't contain meaningful information -%exclude %{python2_sitelib}/bzr_%{name}-*.egg-info -%endif # with_bzr - - %if 0%{?with_brz} %files brz # co-own the plugins directories @@ -280,24 +198,18 @@ fi %files dnf -%if 0%{?dnf_uses_python3} %{python3_sitelib}/dnf-plugins/%{name}.py %exclude %{python3_sitelib}/dnf-plugins/__init__.py %{python3_sitelib}/dnf-plugins/__pycache__/%{name}.* %exclude %{python3_sitelib}/dnf-plugins/__pycache__/__init__.* # exclude egg-info dir, doesn't contain meaningful information %exclude %{python3_sitelib}/dnf_%{name}-*.egg-info -%else -%{python2_sitelib}/dnf-plugins/%{name}.py* -%exclude %{python2_sitelib}/dnf-plugins/__init__.py* -# exclude egg-info dir, doesn't contain meaningful information -%exclude %{python2_sitelib}/dnf_%{name}-*.egg-info -%endif # dnf_uses_python3 %changelog -* Sun Jun 29 2025 Thomas Moschny - 1.18.22-1 +* Mon Jul 14 2025 Thomas Moschny - 1.18.22-1 - Update to 1.18.22. +- Remove all EL7-related conditionals and parts. * Tue Jun 03 2025 Python Maint - 1.18.21-6 - Rebuilt for Python 3.14 From e0589d4bdf37a99e8d97927753e8d29bb18db344 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Mon, 14 Jul 2025 19:56:05 +0200 Subject: [PATCH 121/128] Update for current Python packaging guidelines (rhbz#2377253). --- etckeeper.spec | 57 +++++++++++++++++++++++++++++++------------------- 1 file changed, 35 insertions(+), 22 deletions(-) diff --git a/etckeeper.spec b/etckeeper.spec index e962e5d..0736a37 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -61,7 +61,6 @@ To start using the package please read %{_pkgdocdir}/README. %package brz Summary: Support for bzr with etckeeper (via breezy) BuildRequires: python3-devel -BuildRequires: (python3-setuptools if python3-devel >= 3.12) BuildRequires: brz Requires: %{name} = %{version}-%{release} Requires: brz @@ -75,7 +74,6 @@ etckeeper with (bzr) bazaar repositories, install this package. %package dnf Summary: DNF plugin for etckeeper support BuildRequires: python3-devel -BuildRequires: (python3-setuptools if python3-devel >= 3.12) BuildRequires: python3-dnf Requires: python3-dnf BuildRequires: dnf-plugins-core @@ -104,25 +102,41 @@ sed -e 's|^prefix=.*|prefix=%{_prefix}|' \ -i Makefile # move each plugin in its own subdirectory, so each has its own build/ # directory -mkdir brz-plugin ; mv etckeeper-brz brz-plugin -mkdir dnf-plugin ; mv etckeeper-dnf dnf-plugin +mkdir brz-plugin +mv etckeeper-brz brz-plugin +ln -snf etckeeper-brz/__init__.py brz-plugin/setup.py + +mkdir dnf-plugin +mv etckeeper-dnf dnf-plugin +ln -snf etckeeper-dnf/etckeeper.py dnf-plugin/setup.py + cp -av %{SOURCE1} . +%generate_buildrequires +%if 0%{?with_brz} +cd brz-plugin +%pyproject_buildrequires +cd .. +%endif # with_brz + +cd dnf-plugin +%pyproject_buildrequires +cd .. + + %build %make_build %if 0%{?with_brz} -pushd brz-plugin -%define py_setup etckeeper-brz/__init__.py -%py3_build -popd +cd brz-plugin +%pyproject_wheel +cd .. %endif # with_brz -pushd dnf-plugin -%define py_setup etckeeper-dnf/etckeeper.py build -%py3_build -popd +cd dnf-plugin +%pyproject_wheel +cd .. markdown_py -f README.html README.md @@ -131,16 +145,14 @@ markdown_py -f README.html README.md %make_install %if 0%{?with_brz} -pushd brz-plugin -%define py_setup etckeeper-brz/__init__.py -%py3_install -popd +cd brz-plugin +%pyproject_install +cd .. %endif # with_brz -pushd dnf-plugin -%define py_setup etckeeper-dnf/etckeeper.py build -%py3_install -popd +cd dnf-plugin +%pyproject_install +cd .. install -D -p %{SOURCE2} %{buildroot}%{_sysconfdir}/cron.daily/%{name} install -d %{buildroot}%{_localstatedir}/cache/%{name} @@ -193,7 +205,7 @@ fi %dir %{python3_sitelib}/breezy/plugins/ %{python3_sitelib}/breezy/plugins/%{name}/ # exclude egg-info dir, doesn't contain meaningful information -%exclude %{python3_sitelib}/brz_%{name}-*.egg-info +%exclude %{python3_sitelib}/brz_%{name}-*.dist-info %endif # with_brz @@ -203,13 +215,14 @@ fi %{python3_sitelib}/dnf-plugins/__pycache__/%{name}.* %exclude %{python3_sitelib}/dnf-plugins/__pycache__/__init__.* # exclude egg-info dir, doesn't contain meaningful information -%exclude %{python3_sitelib}/dnf_%{name}-*.egg-info +%exclude %{python3_sitelib}/dnf_%{name}-*.dist-info %changelog * Mon Jul 14 2025 Thomas Moschny - 1.18.22-1 - Update to 1.18.22. - Remove all EL7-related conditionals and parts. +- Update for current Python packaging guidelines. * Tue Jun 03 2025 Python Maint - 1.18.21-6 - Rebuilt for Python 3.14 From cb78c6e477cdd6f7c690060ebd734c6fa0c4be1f Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Mon, 14 Jul 2025 22:28:31 +0200 Subject: [PATCH 122/128] Add support for DNF5 (rhbz#2326283). --- etckeeper.spec | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/etckeeper.spec b/etckeeper.spec index 0736a37..8cf7df9 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -2,6 +2,7 @@ %if 0%{?fedora} %global with_brz 1 +%global with_dnf5 1 %endif Name: etckeeper @@ -14,6 +15,7 @@ URL: https://etckeeper.branchable.com/ Source0: https://git.joeyh.name/index.cgi/etckeeper.git/snapshot/%{name}-%{version}.tar.gz Source1: README.fedora Source2: cron.daily +Source3: etckeeper.actions # build plugins separately Patch0: etckeeper-makefile-remove-python-plugins.patch # see rhbz#1460461 @@ -28,6 +30,7 @@ Patch4: etckeeper-1.18.18-fix-output-for-ansible.patch # see rhbz#2203408 and pr#7 Patch5: etckeeper-1.18.21-bz2203408.patch BuildArch: noarch +BuildRequires: make BuildRequires: %{_bindir}/markdown_py Requires: git-core Requires: perl-interpreter @@ -36,6 +39,9 @@ Requires: findutils Requires: hostname Requires: which Requires: %{name}-dnf = %{version}-%{release} +%if 0%{?with_dnf5} +Requires: %{name}-dnf5 = %{version}-%{release} +%endif # with_dnf5 BuildRequires: systemd Requires(post): systemd Requires(preun): systemd @@ -77,7 +83,6 @@ BuildRequires: python3-devel BuildRequires: python3-dnf Requires: python3-dnf BuildRequires: dnf-plugins-core -BuildRequires: make Requires: %{name} = %{version}-%{release} Requires: dnf-plugins-core @@ -86,6 +91,18 @@ This package provides a DNF plugin for etckeeper. If you want to use etckeeper with DNF, install this package. +%if 0%{?with_dnf5} +%package dnf5 +Summary: DNF5 plugin for etckeeper support +Requires: %{name} = %{version}-%{release} +Requires: libdnf5-plugin-actions >= 5.2.11.0 + +%description dnf5 +This package provides a DNF5 plugin for etckeeper. If you want to use +etckeeper with DNF5, install this package. +%endif # with_dnf5 + + %prep %autosetup -p1 sed -e 's|HIGHLEVEL_PACKAGE_MANAGER=.*|HIGHLEVEL_PACKAGE_MANAGER=dnf|' \ @@ -157,6 +174,10 @@ cd .. install -D -p %{SOURCE2} %{buildroot}%{_sysconfdir}/cron.daily/%{name} install -d %{buildroot}%{_localstatedir}/cache/%{name} +%if 0%{?with_dnf5} +install -D -p %{SOURCE3} %{buildroot}%{_sysconfdir}/dnf/libdnf5-plugins/actions.d/%{name}.actions +%endif # with_dnf5 + %post if [ $1 -gt 1 ] ; then @@ -218,11 +239,18 @@ fi %exclude %{python3_sitelib}/dnf_%{name}-*.dist-info +%if 0%{with_dnf5} +%files dnf5 +%{_sysconfdir}/dnf/libdnf5-plugins/actions.d/%{name}.actions +%endif # with_dnf5 + + %changelog * Mon Jul 14 2025 Thomas Moschny - 1.18.22-1 - Update to 1.18.22. - Remove all EL7-related conditionals and parts. -- Update for current Python packaging guidelines. +- Update for current Python packaging guidelines (rhbz#2377253). +- Add support for DNF5 (rhbz#2326283). * Tue Jun 03 2025 Python Maint - 1.18.21-6 - Rebuilt for Python 3.14 From b0bd45069e4e49cac25c93c474dc2a4c501895f6 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Mon, 14 Jul 2025 22:41:21 +0200 Subject: [PATCH 123/128] Add missing source file. --- etckeeper.actions | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 etckeeper.actions diff --git a/etckeeper.actions b/etckeeper.actions new file mode 100644 index 0000000..6ed21ac --- /dev/null +++ b/etckeeper.actions @@ -0,0 +1,4 @@ +# to be placed in /etc/dnf/libdnf5-plugins/actions.d +# requires dnf5 5.2.11.0 or later +pre_base_setup:::raise_error=1:etckeeper pre-install +post_transaction::::etckeeper post-install From 5c5e2591b222a0d6b6db6854cb1dbe39671cde05 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Tue, 15 Jul 2025 11:27:31 +0200 Subject: [PATCH 124/128] Update action file to produce expected action output. --- etckeeper.actions | 4 ++-- etckeeper.spec | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/etckeeper.actions b/etckeeper.actions index 6ed21ac..f654e21 100644 --- a/etckeeper.actions +++ b/etckeeper.actions @@ -1,4 +1,4 @@ # to be placed in /etc/dnf/libdnf5-plugins/actions.d # requires dnf5 5.2.11.0 or later -pre_base_setup:::raise_error=1:etckeeper pre-install -post_transaction::::etckeeper post-install +pre_base_setup:::raise_error=1:/usr/bin/sh -c /usr/bin/etckeeper\ pre-install\ \|\ /usr/bin/sed\ -e\ 's/^/log.INFO=/' +post_transaction::::/usr/bin/sh -c /usr/bin/etckeeper\ post-install\ \|\ /usr/bin/sed\ -e\ 's/^/log.INFO=/' diff --git a/etckeeper.spec b/etckeeper.spec index 8cf7df9..74f061d 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -7,7 +7,7 @@ Name: etckeeper Version: 1.18.22 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later @@ -96,6 +96,7 @@ etckeeper with DNF, install this package. Summary: DNF5 plugin for etckeeper support Requires: %{name} = %{version}-%{release} Requires: libdnf5-plugin-actions >= 5.2.11.0 +Requires: sed %description dnf5 This package provides a DNF5 plugin for etckeeper. If you want to use @@ -246,6 +247,9 @@ fi %changelog +* Tue Jul 15 2025 Thomas Moschny - 1.18.22-2 +- Update action file to produce expected action output. + * Mon Jul 14 2025 Thomas Moschny - 1.18.22-1 - Update to 1.18.22. - Remove all EL7-related conditionals and parts. From fa46cc7b0ce57f9dd4430dc2f86fa9afe399bd5b Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Tue, 15 Jul 2025 12:50:14 +0200 Subject: [PATCH 125/128] Fix conditional. --- etckeeper.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/etckeeper.spec b/etckeeper.spec index 74f061d..4a85d12 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -7,7 +7,7 @@ Name: etckeeper Version: 1.18.22 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later @@ -240,13 +240,16 @@ fi %exclude %{python3_sitelib}/dnf_%{name}-*.dist-info -%if 0%{with_dnf5} +%if 0%{?with_dnf5} %files dnf5 %{_sysconfdir}/dnf/libdnf5-plugins/actions.d/%{name}.actions %endif # with_dnf5 %changelog +* Tue Jul 15 2025 Thomas Moschny - 1.18.22-3 +- Fix conditional. + * Tue Jul 15 2025 Thomas Moschny - 1.18.22-2 - Update action file to produce expected action output. From 308dfc9c2a4fb70aec3fcb86413884d6f6717285 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 20:09:54 +0000 Subject: [PATCH 126/128] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- etckeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/etckeeper.spec b/etckeeper.spec index 4a85d12..31e0673 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -7,7 +7,7 @@ Name: etckeeper Version: 1.18.22 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later @@ -247,6 +247,9 @@ fi %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 1.18.22-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Tue Jul 15 2025 Thomas Moschny - 1.18.22-3 - Fix conditional. From 17530229049a2b3758fb4a9d2f69bd1b46c748e6 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 12:46:18 +0200 Subject: [PATCH 127/128] Rebuilt for Python 3.14.0rc2 bytecode --- etckeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/etckeeper.spec b/etckeeper.spec index 31e0673..62ece4c 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -7,7 +7,7 @@ Name: etckeeper Version: 1.18.22 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later @@ -247,6 +247,9 @@ fi %changelog +* Fri Aug 15 2025 Python Maint - 1.18.22-5 +- Rebuilt for Python 3.14.0rc2 bytecode + * Wed Jul 23 2025 Fedora Release Engineering - 1.18.22-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From c99b0692f0112c82f5edfdcebab4dc86c49f3897 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 12:15:49 +0200 Subject: [PATCH 128/128] Rebuilt for Python 3.14.0rc3 bytecode --- etckeeper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/etckeeper.spec b/etckeeper.spec index 62ece4c..7893c0c 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -7,7 +7,7 @@ Name: etckeeper Version: 1.18.22 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later @@ -247,6 +247,9 @@ fi %changelog +* Fri Sep 19 2025 Python Maint - 1.18.22-6 +- Rebuilt for Python 3.14.0rc3 bytecode + * Fri Aug 15 2025 Python Maint - 1.18.22-5 - Rebuilt for Python 3.14.0rc2 bytecode