[packages/sysstat] install cron even if systemd units are installed (configure opt says to install)

glen glen at pld-linux.org
Wed Oct 28 12:00:39 CET 2015


commit f9429cf7c9edaad50eedbf42e5b511996210a8d8
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed Oct 28 12:52:56 2015 +0200

    install cron even if systemd units are installed (configure opt says to install)

 install.patch | 30 ++++++++++++++++++++++++++++++
 sysstat.spec  |  2 ++
 2 files changed, 32 insertions(+)
---
diff --git a/sysstat.spec b/sysstat.spec
index a30f134..6091d96 100644
--- a/sysstat.spec
+++ b/sysstat.spec
@@ -18,6 +18,7 @@ Source0:	http://pagesperso-orange.fr/sebastien.godard/%{name}-%{version}.tar.xz
 # Source0-md5:	9a60d786c928b4006f1445c71eeb0e3d
 Source2:	%{name}.init
 Patch0:		%{name}-opt.patch
+Patch1:		install.patch
 URL:		http://perso.wanadoo.fr/sebastien.godard/
 BuildRequires:	autoconf >= 2.53
 BuildRequires:	automake
@@ -59,6 +60,7 @@ sieciowych i innych operacji wejścia/wyjścia.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__aclocal}
diff --git a/install.patch b/install.patch
new file mode 100644
index 0000000..88539bc
--- /dev/null
+++ b/install.patch
@@ -0,0 +1,30 @@
+--- sysstat-11.0.8/Makefile.in	2015-10-28 12:55:45.551618897 +0200
++++ sysstat-11.0.8/Makefile.in	2015-10-28 12:57:20.463217311 +0200
+@@ -364,7 +364,8 @@
+ 	$(CHOWN) $(CRON_OWNER) $(DESTDIR)$(SA_DIR)
+ ifdef SYSTEMD_UNIT_DIR
+ 	mkdir -p $(DESTDIR)$(SYSTEMD_UNIT_DIR)
+-else
++endif
++ifeq ($(INSTALL_CRON),y)
+ 	if [ -d /etc/cron.d ]; then \
+ 		mkdir -p $(DESTDIR)/etc/cron.d; \
+ 	elif [ -d /etc/cron.hourly -a -d /etc/cron.daily ]; then \
+@@ -375,15 +376,13 @@
+ 	elif [ -d $(RC_DIR) ]; then \
+ 		mkdir -p $(DESTDIR)$(RC_DIR); \
+ 	fi
+-endif
+-	if [ -z "$(SYSTEMD_UNIT_DIR)" -o ! -d "$(DESTDIR)$(SYSTEMD_UNIT_DIR)" ]; then \
+ 		if [ -d $(DESTDIR)/etc/cron.d ]; then \
+ 			$(INSTALL_DATA) cron/sysstat.crond $(DESTDIR)/etc/cron.d/sysstat; \
+ 		elif [ -d $(DESTDIR)/etc/cron.hourly -a -d $(DESTDIR)/etc/cron.daily ]; then \
+ 			$(INSTALL_BIN) cron/sysstat.cron.hourly $(DESTDIR)/etc/cron.hourly/sysstat; \
+ 			$(INSTALL_BIN) cron/sysstat.cron.daily $(DESTDIR)/etc/cron.daily/sysstat; \
+-		fi \
+-	fi
++		fi
++endif
+ ifeq ($(COPY_ONLY),n)
+ 	if [ \( -z "$(SYSTEMD_UNIT_DIR)" -o ! -d "$(DESTDIR)$(SYSTEMD_UNIT_DIR)" \) -a ! -d $(DESTDIR)/etc/cron.d ]; then \
+ 		if [ ! -d $(DESTDIR)/etc/cron.hourly -o ! -d $(DESTDIR)/etc/cron.daily ]; then \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/sysstat.git/commitdiff/659ee082482b478f70663330e40a0feea687b49f



More information about the pld-cvs-commit mailing list