packages: smartmontools/smartmontools.spec - use rpmbuild(macros) that disa...

[glen]

Author: glen                         Date: Tue Mar 13 16:24:49 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use rpmbuild(macros) that disables systemd stuff for ac

---- Files affected:
packages/smartmontools:
   smartmontools.spec (1.49 -> 1.50) 

---- Diffs:

================================================================
Index: packages/smartmontools/smartmontools.spec
diff -u packages/smartmontools/smartmontools.spec:1.49 packages/smartmontools/smartmontools.spec:1.50
--- packages/smartmontools/smartmontools.spec:1.49	Tue Mar 13 10:07:40 2012
+++ packages/smartmontools/smartmontools.spec	Tue Mar 13 17:24:43 2012
@@ -3,17 +3,8 @@
 # Conditional build:
 %if "%{pld_release}" == "ac"
 %bcond_with		capng		# build with libpcap-ng
-%bcond_with		systemd		# with systemd units
 %else
 %bcond_without	capng		# build without libpcap-ng
-%bcond_without	systemd		# without systemd units
-%endif
-
-%if %{without systemd}
-%define	systemd_post() %{nil}
-%define	systemd_preun() %{nil}
-%define	systemd_reload() %{nil}
-%define	systemd_trigger() %{nil}
 %endif
 
 Summary:	S.M.A.R.T. control and monitoring of ATA/SCSI harddisks
@@ -26,7 +17,7 @@
 Summary(pt.UTF-8):	smartmontools - para monitorar discos e dispositivos S.M.A.R.T.
 Name:		smartmontools
 Version:	5.42
-Release:	6
+Release:	7
 License:	GPL v2+
 Group:		Applications/System
 Source0:	http://downloads.sourceforge.net/smartmontools/%{name}-%{version}.tar.gz
@@ -40,10 +31,12 @@
 %{?with_capng:BuildRequires:	libcap-ng-devel}
 BuildRequires:	libstdc++-devel
 BuildRequires:	rpm >= 4.4.9-56
-BuildRequires:	rpmbuild(macros) >= 1.626
+BuildRequires:	rpmbuild(macros) >= 1.647
 Requires(post,preun):	/sbin/chkconfig
 Requires:	rc-scripts >= 0.4.3.0
-%{?with_systemd:Requires:	systemd-units >= 37-0.10}
+%if %{pld_release} != "ac"
+Requires:	systemd-units >= 37-0.10
+%endif
 Obsoletes:	smartctl
 Obsoletes:	smartmontools-systemd
 Obsoletes:	smartsuite
@@ -233,6 +226,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.50  2012/03/13 16:24:43  glen
+- use rpmbuild(macros) that disables systemd stuff for ac
+
 Revision 1.49  2012/03/13 09:07:40  glen
 - package examples, systemd, capng bcond
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/smartmontools/smartmontools.spec?r1=1.49&r2=1.50&f=u