Accepting request 634898 from home:ecsos:Backup
- update to 1.18.8: * Work around git commit's lack of robustness, by providing reasonable default values for GIT_COMMITTER_EMAIL etc. This was already done as part of the su/sudo handling, and is now always done. * Don't hardcode the master branch when pushing to PUSH_REMOTE. Instead, let git push whatever branches it is configured to push to that remote. - Drop 0001-Remove-env-from-shebang-in-zypper-plugin.patch because now in upstream. OBS-URL: https://build.opensuse.org/request/show/634898 OBS-URL: https://build.opensuse.org/package/show/utilities/etckeeper?expand=0&rev=17
This commit is contained in:
parent
91e68df6fd
commit
16d8acb8f1
@ -1,22 +0,0 @@
|
|||||||
From 86700d49eac01eb070c4581e0729ba107370e105 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Avindra Goolcharan <aavindraa@gmail.com>
|
|
||||||
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
|
|
||||||
|
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:7abde0e029abd06351d0e98c067a98dd7da3a22d9627c83c95e2eb90d29066cd
|
|
||||||
size 77568
|
|
3
etckeeper-1.18.8.tar.gz
Normal file
3
etckeeper-1.18.8.tar.gz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:97ba6908399a877b749e9137b9b71ada6db1373695da1bd646c5825e7c17d08e
|
||||||
|
size 84964
|
@ -1,3 +1,17 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Sep 11 07:34:30 UTC 2018 - ecsos@opensuse.org
|
||||||
|
|
||||||
|
- update to 1.18.8:
|
||||||
|
* Work around git commit's lack of robustness, by providing
|
||||||
|
reasonable default values for GIT_COMMITTER_EMAIL etc.
|
||||||
|
This was already done as part of the su/sudo handling,
|
||||||
|
and is now always done.
|
||||||
|
* Don't hardcode the master branch when pushing to PUSH_REMOTE.
|
||||||
|
Instead, let git push whatever branches it is configured to
|
||||||
|
push to that remote.
|
||||||
|
- Drop 0001-Remove-env-from-shebang-in-zypper-plugin.patch because
|
||||||
|
now in upstream.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Oct 18 07:35:13 UTC 2017 - aavindraa@gmail.com
|
Wed Oct 18 07:35:13 UTC 2017 - aavindraa@gmail.com
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package etckeeper
|
# spec file for package etckeeper
|
||||||
#
|
#
|
||||||
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
|
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||||
# Copyright (c) 2014 Mitsutoshi NAKANO <bkbin005@rinku.zaq.ne.jp>
|
# Copyright (c) 2014 Mitsutoshi NAKANO <bkbin005@rinku.zaq.ne.jp>
|
||||||
# Copyright (c) 2013 Pascal Bleser <pascal.bleser@opensuse.org>
|
# Copyright (c) 2013 Pascal Bleser <pascal.bleser@opensuse.org>
|
||||||
#
|
#
|
||||||
@ -23,16 +23,14 @@
|
|||||||
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
|
%{!?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))")}
|
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
|
||||||
Name: etckeeper
|
Name: etckeeper
|
||||||
Version: 1.18.7
|
Version: 1.18.8
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Store /etc under Version Control
|
Summary: Store /etc under Version Control
|
||||||
License: GPL-2.0+
|
License: GPL-2.0-or-later
|
||||||
Group: System/Management
|
Group: System/Management
|
||||||
Source: https://git.joeyh.name/index.cgi/etckeeper.git/snapshot/%{name}-%{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
|
# PATCH-FIX-UPSTREAM etckeeper-avoid-packagelist.patch gh#joeyh/etckeeper#17 bkbin005@rinku.zaq.ne.jp -- add AVOID_PACKAGELIST
|
||||||
Patch0: etckeeper-avoid-packagelist.patch
|
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/
|
Url: http://etckeeper.branchable.com/
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
%define LPM rpm
|
%define LPM rpm
|
||||||
@ -112,7 +110,6 @@ The etckeeper-zypp-plugin calls etckeeper from YUM.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
%patch1 -p1
|
|
||||||
|
|
||||||
%__perl -pi -e '
|
%__perl -pi -e '
|
||||||
s|^(\s*)(HIGHLEVEL_PACKAGE_MANAGER)=.+|$1$2=%{HPM}|;
|
s|^(\s*)(HIGHLEVEL_PACKAGE_MANAGER)=.+|$1$2=%{HPM}|;
|
||||||
|
Loading…
Reference in New Issue
Block a user