[ip-sentinel] conditionalized upstart and disabled it by default

ensc ensc at fedoraproject.org
Sun Aug 19 12:46:58 UTC 2012


commit b61577cb2dca36739f6a23739d0b6e27f1c5cdcb
Author: Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
Date:   Sun Aug 19 14:46:16 2012 +0200

    conditionalized upstart and disabled it by default

 ip-sentinel.spec |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)
---
diff --git a/ip-sentinel.spec b/ip-sentinel.spec
index c083821..fb466bf 100644
--- a/ip-sentinel.spec
+++ b/ip-sentinel.spec
@@ -27,6 +27,7 @@
 %bcond_without			fedora
 %bcond_without			dietlibc
 %bcond_with			minit
+%bcond_with			upstart
 ##
 
 
@@ -41,7 +42,7 @@
 Summary:	Tool to prevent unauthorized usage of IP addresses
 Name:		ip-sentinel
 Version:	0.12
-Release:	%release_func 1303
+Release:	%release_func 1900
 License:	GPLv2
 Group:		System Environment/Daemons
 URL:		http://www.nongnu.org/ip-sentinel/
@@ -144,7 +145,8 @@ rm -rf $RPM_BUILD_ROOT
 %__install -m750 -d $RPM_BUILD_ROOT%homedir
 %__install -pD -m 0644 %SOURCE10 $RPM_BUILD_ROOT/etc/init/ip-sentinel.conf
 
-%{!?with_minit:rm -rf $RPM_BUILD_ROOT%minitsvcdir}
+%{!?with_upstart: rm -rf $RPM_BUILD_ROOT%_sysconfdir/init}
+%{!?with_minit:   rm -rf $RPM_BUILD_ROOT%minitsvcdir}
 
 
 %check
@@ -200,9 +202,11 @@ test "$1" != "0" || /sbin/initctl -q stop ip-sentinel || :
 %config(noreplace) %_sysconfdir/sysconfig/*
 
 
+%if 0%{?with_upstart:1}
 %files upstart
-%defattr(-,root,root,-)
-%config(noreplace) /etc/init/*
+  %defattr(-,root,root,-)
+  %config(noreplace) /etc/init/*
+%endif
 
 
 %if 0%{?with_minit:1}
@@ -218,6 +222,9 @@ test "$1" != "0" || /sbin/initctl -q stop ip-sentinel || :
 
 
 %changelog
+* Sun Aug 19 2012 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.12-1900
+- conditionalized upstart and disabled it by default
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12-1303
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 


More information about the scm-commits mailing list