pool/etckeeper
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 435735 from utilities

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/435735
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/etckeeper?expand=0&rev=3
This commit is contained in:
Dominique Leuenberger 2016-10-20 21:09:10 +00:00 committed by Git OBS Bridge
commit 3c8b301550
6 changed files with 134 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
1.18.5.tar.gz Normal file
View File

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

38
etckeeper-avoid-packagelist.patch
View File

@ -14,11 +14,11 @@ you can use environment variable ETCKEEPER_AVOID_PACKAGELIST=1 .
(eg, ETCKEEPER_AVOID_PACKAGELIST=1 zypper update).
diff --git a/etckeeper b/etckeeper
index 554ada9..463a8e1 100755
--- a/etckeeper
+++ b/etckeeper
@@ -116,6 +116,13 @@ if [ -z "$VCS" ]; then
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
export VCS
@ -30,12 +30,12 @@ index 554ada9..463a8e1 100755
+export AVOID_PACKAGELIST
+
lsscripts() {
perl -e '
LANG=C perl -e '
$dir=shift;
diff --git a/etckeeper.8 b/etckeeper.8
index 62ae976..5ecb183 100644
--- a/etckeeper.8
+++ b/etckeeper.8
Index: etckeeper-1.18.5/etckeeper.8
===================================================================
--- etckeeper-1.18.5.orig/etckeeper.8
+++ etckeeper-1.18.5/etckeeper.8
@@ -65,7 +65,19 @@ prompting.)
/etc/etckeeper also contains directories containing the programs that are
run for each of the above commands.
@ -57,11 +57,11 @@ index 62ae976..5ecb183 100644
.SH SEE ALSO
/usr/share/doc/etckeeper/README.md.gz
.SH AUTHOR
diff --git a/etckeeper.conf b/etckeeper.conf
index f988c10..43a1672 100644
--- a/etckeeper.conf
+++ b/etckeeper.conf
@@ -41,3 +41,12 @@ LOWLEVEL_PACKAGE_MANAGER=dpkg
Index: etckeeper-1.18.5/etckeeper.conf
===================================================================
--- etckeeper-1.18.5.orig/etckeeper.conf
+++ etckeeper-1.18.5/etckeeper.conf
@@ -43,3 +43,12 @@ LOWLEVEL_PACKAGE_MANAGER=dpkg
# (eg, "origin" for git). Space-separated lists of multiple remotes
# also work (eg, "origin gitlab github" for git).
PUSH_REMOTE=""
@ -74,10 +74,10 @@ index f988c10..43a1672 100644
+# you can use environment variable ETCKEEPER_AVOID_PACKAGELIST=1 .
+# (eg, ETCKEEPER_AVOID_PACKAGELIST=1 zypper update)
+#AVOID_PACKAGELIST=1
diff --git a/pre-install.d/10packagelist b/pre-install.d/10packagelist
index e5fefa8..4bc8aa4 100755
--- a/pre-install.d/10packagelist
+++ b/pre-install.d/10packagelist
Index: etckeeper-1.18.5/pre-install.d/10packagelist
===================================================================
--- etckeeper-1.18.5.orig/pre-install.d/10packagelist
+++ etckeeper-1.18.5/pre-install.d/10packagelist
@@ -1,4 +1,9 @@
#!/bin/sh
+

1
etckeeper-rpmlintrc
View File

@ -1 +0,0 @@
addFilter('python-naming-policy-not-applied')

76
etckeeper.changes
View File

@ -1,3 +1,79 @@
-------------------------------------------------------------------
Sat Oct 15 09:34:41 UTC 2016 - ecsos@opensuse.org
- update Source to 1.18.5:
- Make etckeeper commit store metadata changes. The pre-commit
hook has always (and continues) to do that, but pre-commit is
only run when there are changes to tommit. This makes
metadata-only changes get committed.
- Move systemd files to /lib/systemd; /usr/lib/systemd is not
used on Debian.
- fix wrong path for systemd in rpm based distros with sed in spec
-------------------------------------------------------------------
Sun Jul 3 10:09:23 UTC 2016 - ecsos@opensuse.org
- update Source to 1.18.4:
- Optimised find for special and hard linked files.
- Adjust when Pacman 5 calls etckeeper hooks.
- Only run Pacman hooks when files in /etc have changed.
- Added systemd timer that can run etckeeper 10 minutes after boot, and also
daily. It's not enabled by default, partly because of overlap with the
cron job.
- update Source to 1.18.3:
- Added support for pacmatic, contributed by nicolaichuk.
- bzr: make sure EMAIL is defined
- Fix Makefile version patterns to ignore non-native version number
- Support ~/.config/git/config when determining the author name and email.
- Added support for Arch's pacman package manager version 5.
- Set HOME if it's not set, as is the case when using ubuntu's
update-manager.
- Move bash completion out of etc and into usr.
- update Source to 1.18.2:
- Use getent utility instead of perl. (Elan Ruusamäe)
- Initial FreeBSD support with pkgng plugin. (William Johansson)
- Fix README.md symlink in package (Sebastian Schmidt, Antoine Beaupré,
closes: #791566)
- Fix typo of GIT_COMMITTER_EMAIL.
- update Source to 1.18.1
- Add myself as maintainer (Closes: #768516)
- Keeping the package native as I do not intend to diverge from
upstream.
- Update git URL in control file.
- update to Sourcce to 1.18:
- Send yum pre-commit output to /dev/null
- Set LANG=C internally when doing some operations that have
been reported to fail in other locales.
- update Source to 1.17:
- Fix name of DNF plugin.
- Add --version
Thanks Andreas Wansner.
- New website, http://etckeeper.branchable.com/
- Add build-depends on dh-python.
- update Source to 1.16:
- Added support for Fedora's DNF highlevel package manager.
- Add architecture info to dpkg list-installed. Closes: #768145
- Orphaned the Debian package.
- rebase patch etckeeper-avoid-packagelist.patch
- change source url to github
- remove unnecessary file etckeeper-rpmlintrc
-------------------------------------------------------------------
Fri Jun 3 09:05:31 UTC 2016 - ecsos@opensuse.org
- update Source to 1.15:
- Recommend cron-daemon, rather than cron, as etckeeper only needs
cron.daily functionality. Closes: #762721
- update Source to 1.14:
- Handle failure to commit in post-install, pre-install by showing a
warning, rather than propigating the error to apt.
This avoids breaking the apt run when eg, git is misconfigured and
cannot commit.
pre-install already did this when it was able to use debconf to display a
message, but now debconf is not used, and it always behaves this way.
Closes: #760011
- change to new url
-------------------------------------------------------------------
Mon Aug 18 11:55:42 UTC 2014 - bkbin005@rinku.zaq.ne.jp

44
etckeeper.spec
View File

@ -2,7 +2,7 @@
#
# spec file for package etckeeper
#
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2014 Mitsutoshi NAKANO <bkbin005@rinku.zaq.ne.jp>
# Copyright (c) 2013 Pascal Bleser <pascal.bleser@opensuse.org>
#
@ -23,16 +23,16 @@
%{!?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.13
Version: 1.18.5
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}.tar.gz
Source99: %{name}-rpmlintrc
#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
# PATCH-FIX-UPSTREAM etckeeper-avoid-packagelist.patch gh#joeyh/etckeeper#17 bkbin005@rinku.zaq.ne.jp -- add AVOID_PACKAGELIST
Patch0: etckeeper-avoid-packagelist.patch
Url: http://joeyh.name/code/etckeeper/
Url: http://etckeeper.branchable.com/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define LPM rpm
BuildRequires: make
@ -54,6 +54,7 @@ Requires: %{name}-cron = %{version}-%{release}
Requires: %{name}-yum-plugin = %{version}-%{release}
%define HPM yum
%endif
%{?systemd_requires}
%description
The etckeeper program is a tool to let /etc be stored in a git,
@ -107,7 +108,7 @@ The etckeeper-zypp-plugin calls etckeeper from YUM.
%endif
%prep
%setup -q -n "%{name}"
%setup -q -n %{name}-%{version}
%patch0 -p1
%__perl -pi -e '
@ -116,6 +117,12 @@ s|^(\s*)(LOWLEVEL_PACKAGE_MANAGER)=.+|$1$2=%{LPM}|;
s|^(\s*)(VCS)=.+|$1$2=git|;
' ./etckeeper.conf
# rpmlint
find -type f -name ".gitignore" -exec rm {} \;
# use %%{_unitdir} for rpm-based distros
sed -i 's:systemddir=/lib/systemd/system:systemddir=%{_unitdir}:g' Makefile
%build
make %{?_smp_mflags}
@ -126,19 +133,40 @@ make \
install
install -D debian/cron.daily "%{buildroot}/etc/cron.daily/%{name}"
mkdir %{buildroot}%{_sbindir}
ln -s ../bin/%{name} %{buildroot}%{_sbindir}/%{name}
ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rc%{name}
%clean
%{?buildroot:%__rm -rf "%{buildroot}"}
%pre
%service_add_pre etckeeper.service
%preun
%service_del_preun etckeeper.service
%post
%service_add_post etckeeper.service
%postun
%service_del_postun etckeeper.service
%files
%defattr(-,root,root)
%doc GPL README.md TODO
%doc GPL README.md doc
%{_unitdir}/etckeeper*
%{_bindir}/etckeeper
%{_sbindir}/*etckeeper
%dir %{_datadir}/bash-completion
%dir %{_datadir}/bash-completion/completions
%{_datadir}/bash-completion/completions/etckeeper
%dir %{_sysconfdir}/etckeeper
%{_sysconfdir}/etckeeper/daily
%config(noreplace) %{_sysconfdir}/etckeeper/etckeeper.conf
%dir %{_sysconfdir}/etckeeper/*.d
%config %{_sysconfdir}/etckeeper/*.d/*
%doc %{_mandir}/man8/etckeeper.8*
%config %{_sysconfdir}/bash_completion.d/etckeeper
%{python_sitearch}/bzrlib/plugins/%{name}/
%{python_sitearch}/bzr_%{name}-*.egg-info

3
etckeeper_1.13.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8d0870a4f3751aa6ccf70bbece29843ce41c6f4432e3bc0929cae4a40fcf162b
size 48518