Accepting request 239404 from home:Mitsutoshi:branches:utilities

I resubmitrequest etckeeper 1.12.
Changed:
- etckeeper.changes - I wrote "added etckeeper-zypp.patch", and "bnc#884154".
- etckeeper.spec - I added "bnc#884154" in patche's comment line.
- etckeeper-zypp.patch - I added comments about "bnc#884154"

--------
I changed etckeeper 1.7->1.12,
And I fixed bnc#884154.

OBS-URL: https://build.opensuse.org/request/show/239404
OBS-URL: https://build.opensuse.org/package/show/utilities/etckeeper?expand=0&rev=6

etckeeper-zypp.patch

@@ -0,0 +1,46 @@
+From: Mitsutoshi NAKANO <bkbin005@rinku.zaq.ne.jp>
+Date: 2014-06-18 20:14:28 +0900
+Subject: zypper-etckeeper.py: change permission and locale .
+References: bnc#884154
+ http://lists.opensuse.org/archive/opensuse-factory/2014-06/msg00090.html
+Upstream: merged
+
+This patch fixed bnc#884154 .
+I changed zypper-etckeeper.py 's permission from 644 to 755.
+I changed zypper-etckeeper.py's LANG to C.
+
+
+---
+diff --git a/Makefile b/Makefile
+index 13ce4fe..cf034a2 100644
+--- a/Makefile
++++ b/Makefile
+@@ -45,7 +45,7 @@ ifeq ($(HIGHLEVEL_PACKAGE_MANAGER),yum)
+ endif
+ ifeq ($(HIGHLEVEL_PACKAGE_MANAGER),zypper)
+ 	mkdir -p $(DESTDIR)$(prefix)/lib/zypp/plugins/commit
+-	$(INSTALL_DATA) zypper-etckeeper.py $(DESTDIR)$(prefix)/lib/zypp/plugins/commit/zypper-etckeeper.py
++	$(INSTALL) zypper-etckeeper.py $(DESTDIR)$(prefix)/lib/zypp/plugins/commit/zypper-etckeeper.py
+ endif
+ 	-./etckeeper-bzr/__init__.py install --root=$(DESTDIR) ${PYTHON_INSTALL_OPTS} || echo "** bzr support not installed"
+ 	echo "** installation successful"
+diff --git a/zypper-etckeeper.py b/zypper-etckeeper.py
+index b21f23d..daa2ff2 100755
+--- a/zypper-etckeeper.py
++++ b/zypper-etckeeper.py
+@@ -3,7 +3,7 @@
+ import errno
+ import subprocess
+ import zypp_plugin
+-
++import os
+ 
+ def _call_etckeeper(install_arg):
+     # zypper interprets the plugin's stdout as described in
+@@ -34,5 +34,6 @@ class EtckeeperPlugin(zypp_plugin.Plugin):
+         self.ack()
+ 
+ 
++os.environ["LANG"] = "C"
+ plugin = EtckeeperPlugin()
+ plugin.main()

etckeeper.changes

@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Wed Jul  2 20:33:59 UTC 2014 - bkbin005@rinku.zaq.ne.jp
+
+- fix (bnc#884154).  change permission and locale.
+  + added etckeeper-zypp.patch
+    1) changed zypper-etckeeper.py 's permission from 644 to 755
+      (in Makefile).
+    2) in zypper-etckeeper.py set LANG to C.
+  please see also:
+  http://lists.opensuse.org/archive/opensuse-factory/2014-06/msg00090.html
+- version up to 1.12 from 1.7
+  + README's filename changed from README to README.md.
+  + fix some bugs.
+  + fix some typos.
+  for detail,
+  please do "git clone git://git.kitenet.net/etckeeper.git"
+  and "git log".
+
 -------------------------------------------------------------------
 Wed Aug 21 16:59:59 UTC 2013 - dvaleev@suse.com
 

etckeeper.spec

@@ -1,6 +1,6 @@
 # vim: set sw=4 ts=4 et nu:
 
-# Copyright (c) 2013 Pascal Bleser <pascal.bleser@opensuse.org>
+# Copyright (c) 2014 Pascal Bleser <pascal.bleser@opensuse.org>
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -14,11 +14,13 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 
 Name:               etckeeper
-Version:            1.7
+Version:            1.12
 Release:            0
 Summary:            Store /etc under Version Control
 Source:             http://ftp.debian.org/debian/pool/main/e/etckeeper/etckeeper_%{version}.tar.gz
 Source99:           etckeeper.rpmlintrc
+# PATCH-FIX-UPSTREAM etckeeper-zypp.patch bnc#884154 bkbin005@rinku.zaq.ne.jp -- fix for ZYpp
+Patch0:             etckeeper-zypp.patch
 URL:                http://joeyh.name/code/etckeeper/
 Group:              System/Management
 License:            GPL-2.0+
@@ -48,6 +50,7 @@ understand the basics of working with version control.
 
 %prep
 %setup -q -n "%{name}"
+%patch0 -p1
 
 %__perl -pi -e '
 s|^(\s*)(HIGHLEVEL_PACKAGE_MANAGER)=.+|$1$2=%{HPM}|;
@@ -75,7 +78,7 @@ install -D debian/cron.daily "%{buildroot}/etc/cron.daily/%{name}"
 
 %files
 %defattr(-,root,root)
-%doc GPL TODO README
+%doc GPL TODO README.md
 %{_bindir}/etckeeper
 %config(noreplace) /etc/cron.daily/etckeeper
 %dir %{_sysconfdir}/etckeeper

etckeeper_1.12.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:86b77c9e375cdd09ed96c3c120e10c18d8d9ec4fa114622050b34552c36d5e31
+size 49013

etckeeper_1.7.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4b5a458dc91bb1c2075640301dcde1596b8adebe239b2db9f22f66de55c0496e
-size 47790