commit etckeeper for openSUSE:Factory

Hello community, here is the log from the commit of package etckeeper for openSUSE:Factory checked in at 2017-11-03 16:29:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/etckeeper (Old) and /work/SRC/openSUSE:Factory/.etckeeper.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "etckeeper" Fri Nov 3 16:29:05 2017 rev:5 rq:538550 version:1.18.7 Changes: -------- --- /work/SRC/openSUSE:Factory/etckeeper/etckeeper.changes 2016-10-25 17:44:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.etckeeper.new/etckeeper.changes 2017-11-03 16:31:21.661992418 +0100 @@ -1,0 +2,21 @@ +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) + +------------------------------------------------------------------- Old: ---- 1.18.5.tar.gz New: ---- 0001-Remove-env-from-shebang-in-zypper-plugin.patch etckeeper-1.18.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ etckeeper.spec ++++++ --- /var/tmp/diff_new_pack.T6d3nT/_old 2017-11-03 16:31:22.917946706 +0100 +++ /var/tmp/diff_new_pack.T6d3nT/_new 2017-11-03 16:31:22.921946560 +0100 @@ -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 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %__perl -pi -e ' s|^(\s*)(HIGHLEVEL_PACKAGE_MANAGER)=.+|$1$2=%{HPM}|; @@ -119,6 +122,7 @@ # 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 @@ %service_del_postun etckeeper.service %files -%defattr(-,root,root) %doc GPL README.md doc %{_unitdir}/etckeeper* %{_bindir}/etckeeper @@ -168,16 +171,13 @@ %{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 ++++++ 0001-Remove-env-from-shebang-in-zypper-plugin.patch ++++++

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 ++++++ etckeeper-avoid-packagelist.patch ++++++ --- /var/tmp/diff_new_pack.T6d3nT/_old 2017-11-03 16:31:22.961945104 +0100 +++ /var/tmp/diff_new_pack.T6d3nT/_new 2017-11-03 16:31:22.961945104 +0100 @@ -18,20 +18,20 @@ =================================================================== --- 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