[packages/etckeeper] Up to 1.18.23

arekm arekm at pld-linux.org
Mon Sep 15 12:03:02 CEST 2025


commit e9c47b8343561fe525d50bb785e0e81695327686
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Mon Sep 15 12:02:50 2025 +0200

    Up to 1.18.23

 etckeeper.spec   |  8 ++++----
 use-libdir.patch | 13 +++++++------
 2 files changed, 11 insertions(+), 10 deletions(-)
---
diff --git a/etckeeper.spec b/etckeeper.spec
index 7a71a4e..d1e44ae 100644
--- a/etckeeper.spec
+++ b/etckeeper.spec
@@ -3,17 +3,17 @@
 # - Subpackages for backends (darcs, git, hg)
 Summary:	Store /etc in a SCM system (git, mercurial, bzr or darcs)
 Name:		etckeeper
-Version:	1.18.22
+Version:	1.18.23
 Release:	1
 License:	GPL v2+
 Group:		Applications/System
 #Source0:	https://git.joeyh.name/index.cgi/etckeeper.git/snapshot/%{name}-%{version}.tar.gz
 Source0:	https://ftp.debian.org/debian/pool/main/e/etckeeper/%{name}_%{version}.orig.tar.gz
-# Source0-md5:	94ea406f9040fac80009ffa6b6da02e0
+# Source0-md5:	075fcafc6bd7ac0d42e20743f31517d9
 Source1:	pre-install.sh
 Source2:	post-install.sh
 Source3:	https://ftp.debian.org/debian/pool/main/e/etckeeper/etckeeper_%{version}-2.debian.tar.xz
-# Source3-md5:	349451456d729070bb93a94c914eb9ab
+# Source3-md5:	fa217e124e12f4a5752ad03f36618ae2
 Patch1:		use-libdir.patch
 Patch2:		update-ignore.patch
 URL:		http://etckeeper.branchable.com/
@@ -114,7 +114,7 @@ install -d $RPM_BUILD_ROOT{/etc/cron.daily,%{_sysconfdir}/%{name},%{_localstated
 
 mv $RPM_BUILD_ROOT{/lib,%{_sysconfdir}}/%{name}/%{name}.conf
 
-install -p debian/cron.daily $RPM_BUILD_ROOT/etc/cron.daily/%{name}
+install -p cron.daily $RPM_BUILD_ROOT/etc/cron.daily/%{name}
 install -p %{SOURCE1} $RPM_BUILD_ROOT%{_poldekconfdir}/pre-install.d/%{name}
 install -p %{SOURCE2} $RPM_BUILD_ROOT%{_poldekconfdir}/post-install.d/%{name}
 
diff --git a/use-libdir.patch b/use-libdir.patch
index 8566d5b..a6c6da1 100644
--- a/use-libdir.patch
+++ b/use-libdir.patch
@@ -56,17 +56,18 @@
 -ExecStart=/etc/etckeeper/daily
 +ExecStart=/lib/etckeeper/daily
  IOSchedulingClass=idle
---- etckeeper-1.18.16/debian/cron.daily~	2021-05-31 13:29:39.000000000 +0200
-+++ etckeeper-1.18.16/debian/cron.daily	2021-05-31 13:31:15.151417059 +0200
-@@ -1,8 +1,8 @@
+--- etckeeper-1.18.23/cron.daily~	2025-08-16 18:22:02.000000000 +0200
++++ etckeeper-1.18.23/cron.daily	2025-09-15 12:01:40.010683132 +0200
+@@ -1,10 +1,10 @@
  #!/bin/sh
  set -e
 -if [ -e /etc/etckeeper/daily ] && [ -e /etc/etckeeper/etckeeper.conf ]; then
 +if [ -e /lib/etckeeper/daily ] && [ -e /etc/etckeeper/etckeeper.conf ]; then
  	. /etc/etckeeper/etckeeper.conf
  	if [ "$AVOID_DAILY_AUTOCOMMITS" != "1" ]; then
--		/etc/etckeeper/daily
-+		/lib/etckeeper/daily
+ 		if ! systemctl --quiet is-enabled etckeeper.timer >/dev/null 2>&1; then
+-			/etc/etckeeper/daily
++			/lib/etckeeper/daily
+ 		fi
  	fi
  fi
-
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/etckeeper.git/commitdiff/e9c47b8343561fe525d50bb785e0e81695327686



More information about the pld-cvs-commit mailing list