From 91e68df6fd531fb9d23e91b71c27d0c98a1526590e6307441488410c4a2f07ce Mon Sep 17 00:00:00 2001 From: Mitsutoshi NAKANO Date: Fri, 3 Nov 2017 00:13:02 +0000 Subject: [PATCH] Accepting request 537429 from home:avindra - update to 1.18.7: * Will work on systems that don't have perl. (Perl is still used when available). * Prevent LC_ALL overriding the LC_COLLATE used to sort metadata. - includes changes from 1.18.6: * Only show errors (no progress indicators) when pushing Git/Mercurial repos to avoid unecessary cron mails. * Fix regex in 20-warn-problem-files. * Support added for apk (alpine linux) - Lint spec file - Point source URL to upstream tarball - Mark dependency on python-base per rpmlint - Patches / source modifications: * Add 0001-Remove-env-from-shebang-in-zypper-plugin.patch - fixes rpmlint warning about dependency detection * Rebase etckeeeper-avoid-packagelist.patch * Remove junk file caught by rpmlint (.mdwn) OBS-URL: https://build.opensuse.org/request/show/537429 OBS-URL: https://build.opensuse.org/package/show/utilities/etckeeper?expand=0&rev=15 --- ...ve-env-from-shebang-in-zypper-plugin.patch | 22 +++++++++++++++++++ 1.18.5.tar.gz | 3 --- etckeeper-1.18.7.tar.gz | 3 +++ etckeeper-avoid-packagelist.patch | 22 +++++++++---------- etckeeper.changes | 21 ++++++++++++++++++ etckeeper.spec | 16 +++++++------- 6 files changed, 65 insertions(+), 22 deletions(-) create mode 100644 0001-Remove-env-from-shebang-in-zypper-plugin.patch delete mode 100644 1.18.5.tar.gz create mode 100644 etckeeper-1.18.7.tar.gz diff --git a/0001-Remove-env-from-shebang-in-zypper-plugin.patch b/0001-Remove-env-from-shebang-in-zypper-plugin.patch new file mode 100644 index 0000000..8f5e6a8 --- /dev/null +++ b/0001-Remove-env-from-shebang-in-zypper-plugin.patch @@ -0,0 +1,22 @@ +From 86700d49eac01eb070c4581e0729ba107370e105 Mon Sep 17 00:00:00 2001 +From: Avindra Goolcharan +Date: Sun, 29 Oct 2017 11:54:49 -0400 +Subject: [PATCH] Remove env from shebang in zypper plugin + +--- + zypper-etckeeper.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/zypper-etckeeper.py b/zypper-etckeeper.py +index daa2ff2..0b21881 100755 +--- a/zypper-etckeeper.py ++++ b/zypper-etckeeper.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python + + import errno + import subprocess +-- +2.14.3 + diff --git a/1.18.5.tar.gz b/1.18.5.tar.gz deleted file mode 100644 index 26a9d93..0000000 --- a/1.18.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a4ddb313037c6861efbc24a55ed8e66cd98591e190aedf2657c8a1071f821889 -size 68041 diff --git a/etckeeper-1.18.7.tar.gz b/etckeeper-1.18.7.tar.gz new file mode 100644 index 0000000..3c27705 --- /dev/null +++ b/etckeeper-1.18.7.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7abde0e029abd06351d0e98c067a98dd7da3a22d9627c83c95e2eb90d29066cd +size 77568 diff --git a/etckeeper-avoid-packagelist.patch b/etckeeper-avoid-packagelist.patch index f900749..8a09f66 100644 --- a/etckeeper-avoid-packagelist.patch +++ b/etckeeper-avoid-packagelist.patch @@ -18,20 +18,20 @@ Index: etckeeper-1.18.5/etckeeper =================================================================== --- etckeeper-1.18.5.orig/etckeeper +++ etckeeper-1.18.5/etckeeper -@@ -125,6 +125,13 @@ if [ -z "$VCS" ]; then - fi +@@ -126,6 +126,13 @@ export VCS -+#If environment variable ETCKEEPER_AVOID_PACKAGELIST is not null, -+# AVOID_PACKAGELIST in etckeeper.conf is overridden here. -+if [ -n "$ETCKEEPER_AVOID_PACKAGELIST" ]; then -+ AVOID_PACKAGELIST="$ETCKEEPER_AVOID_PACKAGELIST" -+fi -+export AVOID_PACKAGELIST + if [ "$(which perl 2>/dev/null)" != "" ]; then ++ #If environment variable ETCKEEPER_AVOID_PACKAGELIST is not null, ++ # AVOID_PACKAGELIST in etckeeper.conf is overridden here. ++ if [ -n "$ETCKEEPER_AVOID_PACKAGELIST" ]; then ++ AVOID_PACKAGELIST="$ETCKEEPER_AVOID_PACKAGELIST" ++ fi ++ export AVOID_PACKAGELIST + - lsscripts() { - LANG=C perl -e ' - $dir=shift; + lsscripts() { + LANG=C perl -e ' + $dir=shift; Index: etckeeper-1.18.5/etckeeper.8 =================================================================== --- etckeeper-1.18.5.orig/etckeeper.8 diff --git a/etckeeper.changes b/etckeeper.changes index 46099f6..30a788b 100644 --- a/etckeeper.changes +++ b/etckeeper.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Wed Oct 18 07:35:13 UTC 2017 - aavindraa@gmail.com + +- update to 1.18.7: + * Will work on systems that don't have perl. (Perl is still used + when available). + * Prevent LC_ALL overriding the LC_COLLATE used to sort metadata. +- includes changes from 1.18.6: + * Only show errors (no progress indicators) when pushing + Git/Mercurial repos to avoid unecessary cron mails. + * Fix regex in 20-warn-problem-files. + * Support added for apk (alpine linux) +- Lint spec file +- Point source URL to upstream tarball +- Mark dependency on python-base per rpmlint +- Patches / source modifications: + * Add 0001-Remove-env-from-shebang-in-zypper-plugin.patch + - fixes rpmlint warning about dependency detection + * Rebase etckeeeper-avoid-packagelist.patch + * Remove junk file caught by rpmlint (.mdwn) + ------------------------------------------------------------------- Sat Oct 22 17:39:27 UTC 2016 - jengelh@inai.de diff --git a/etckeeper.spec b/etckeeper.spec index 20975ff..b8a748a 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -2,7 +2,7 @@ # # spec file for package etckeeper # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2014 Mitsutoshi NAKANO # Copyright (c) 2013 Pascal Bleser # @@ -23,18 +23,20 @@ %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} Name: etckeeper -Version: 1.18.5 +Version: 1.18.7 Release: 0 Summary: Store /etc under Version Control License: GPL-2.0+ Group: System/Management -#Source: http://ftp.debian.org/debian/pool/main/e/etckeeper/%%{name}_%%{version}.orig.tar.gz -Source: https://github.com/joeyh/%{name}/archive/%{version}.tar.gz +Source: https://git.joeyh.name/index.cgi/etckeeper.git/snapshot/%{name}-%{version}.tar.gz # PATCH-FIX-UPSTREAM etckeeper-avoid-packagelist.patch gh#joeyh/etckeeper#17 bkbin005@rinku.zaq.ne.jp -- add AVOID_PACKAGELIST Patch0: etckeeper-avoid-packagelist.patch +# PATCH-FIX-UPSTREAM 0001-Remove-env-from-shebang-in-zypper-plugin.patch +Patch1: 0001-Remove-env-from-shebang-in-zypper-plugin.patch Url: http://etckeeper.branchable.com/ BuildRoot: %{_tmppath}/%{name}-%{version}-build %define LPM rpm +Requires: python-base >= 2.7 BuildRequires: make # added for bzr 2014-07-10 bkbin005@rinku.zaq.ne.jp BuildRequires: bzr @@ -110,6 +112,7 @@ The etckeeper-zypp-plugin calls etckeeper from YUM. %prep %setup -q %patch0 -p1 +%patch1 -p1 %__perl -pi -e ' s|^(\s*)(HIGHLEVEL_PACKAGE_MANAGER)=.+|$1$2=%{HPM}|; @@ -119,6 +122,7 @@ s|^(\s*)(VCS)=.+|$1$2=git|; # rpmlint find -type f -name ".gitignore" -delete +rm -f ./doc/todo/.mdwn # use %%{_unitdir} for rpm-based distros sed -i 's:systemddir=/lib/systemd/system:systemddir=%{_unitdir}:g' Makefile @@ -150,7 +154,6 @@ ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rc%{name} %service_del_postun etckeeper.service %files -%defattr(-,root,root) %doc GPL README.md doc %{_unitdir}/etckeeper* %{_bindir}/etckeeper @@ -168,16 +171,13 @@ ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rc%{name} %{python_sitearch}/bzr_%{name}-*.egg-info %files cron -%defattr(-,root,root) %config(noreplace) %{_sysconfdir}/cron.daily/etckeeper %if 0%{?suse_version} %files zypp-plugin -%defattr(-,root,root) %{_prefix}/lib/zypp/plugins/commit/zypper-etckeeper.py %else %files yum-plugin -%defattr(-,root,root) %config(noreplace) %{_sysconfdir}/yum/pluginconf.d/etckeeper.conf %{_prefix}/lib/yum-plugins/etckeeper.* %endif