diff options
Diffstat (limited to 'misc')
-rw-r--r-- | misc/bcfg2.spec | 36 |
1 files changed, 5 insertions, 31 deletions
diff --git a/misc/bcfg2.spec b/misc/bcfg2.spec index ab1394110..3539b0dec 100644 --- a/misc/bcfg2.spec +++ b/misc/bcfg2.spec @@ -561,11 +561,7 @@ sed "s@http://www.w3.org/2001/xml.xsd@file://$(pwd)/schemas/xml.xsd@" \ %if 0%{?suse_version} %fillup_and_insserv -f bcfg2 %else - %if 0%{?fedora} >= 16 - /bin/systemctl daemon-reload >/dev/null 2>&1 || : - %else - /sbin/chkconfig --add bcfg2 - %endif + /sbin/chkconfig --add bcfg2 %endif fi %endif @@ -579,11 +575,7 @@ sed "s@http://www.w3.org/2001/xml.xsd@file://$(pwd)/schemas/xml.xsd@" \ %if 0%{?suse_version} %fillup_and_insserv -f bcfg2-server %else - %if 0%{?fedora} >= 16 - /bin/systemctl daemon-reload >/dev/null 2>&1 || : - %else - /sbin/chkconfig --add bcfg2-server - %endif + /sbin/chkconfig --add bcfg2-server %endif fi %endif @@ -597,13 +589,8 @@ sed "s@http://www.w3.org/2001/xml.xsd@file://$(pwd)/schemas/xml.xsd@" \ %if 0%{?suse_version} %stop_on_removal bcfg2 %else - %if 0%{?fedora} >= 16 - /bin/systemctl --no-reload disable bcfg2.service > /dev/null 2>&1 || : - /bin/systemctl stop bcfg2.service > /dev/null 2>&1 || : - %else /sbin/service bcfg2 stop &>/dev/null || : /sbin/chkconfig --del bcfg2 - %endif %endif fi %endif @@ -618,13 +605,8 @@ sed "s@http://www.w3.org/2001/xml.xsd@file://$(pwd)/schemas/xml.xsd@" \ %stop_on_removal bcfg2-server %stop_on_removal bcfg2-report-collector %else - %if 0%{?fedora} >= 16 - /bin/systemctl --no-reload disable bcfg2-server.service > /dev/null 2>&1 || : - /bin/systemctl stop bcfg2-server.service > /dev/null 2>&1 || : - %else /sbin/service bcfg2-server stop &>/dev/null || : /sbin/chkconfig --del bcfg2-server - %endif %endif fi %endif @@ -641,11 +623,7 @@ sed "s@http://www.w3.org/2001/xml.xsd@file://$(pwd)/schemas/xml.xsd@" \ %if 0%{?suse_version} %insserv_cleanup %else - %if 0%{?fedora} >= 16 - /bin/systemctl try-restart bcfg2.service >/dev/null 2>&1 || : - %else /sbin/service bcfg2 condrestart &>/dev/null || : - %endif %endif fi %endif @@ -654,16 +632,9 @@ sed "s@http://www.w3.org/2001/xml.xsd@file://$(pwd)/schemas/xml.xsd@" \ %if 0%{?fedora} >= 18 %systemd_postun bcfg2-server.service %else - %if 0%{?fedora} >= 16 - /bin/systemctl daemon-reload >/dev/null 2>&1 || : - %endif if [ $1 -ge 1 ] ; then # Package upgrade, not uninstall - %if 0%{?fedora} >= 16 - /bin/systemctl try-restart bcfg2-server.service >/dev/null 2>&1 || : - %else /sbin/service bcfg2-server condrestart &>/dev/null || : - %endif fi %if 0%{?suse_version} if [ $1 -eq 0 ]; then @@ -793,6 +764,9 @@ sed "s@http://www.w3.org/2001/xml.xsd@file://$(pwd)/schemas/xml.xsd@" \ %changelog +* Wed Apr 23 2014 Jonathan S. Billings <jsbillin@umich.edu> - 1.3.4-2 +- Fixed RPM scriptlet logic for el6 vs. Fedora init commands + * Sun Apr 6 2014 John Morris <john@zultron.com> - 1.3.4-1 - New upstream release |