[lcgdm] up release number - cleanup sysv scripts when building systemd.

[Ricardo Rocha]

commit 507a459733f797141cffb2f133ef197041b56e63
Author: Ricardo Rocha <rocha at rocha-fedora16.cern.ch>
Date:   Tue Jun 5 11:10:03 2012 +0200

    up release number - cleanup sysv scripts when building systemd.

 lcgdm.spec |   19 ++++++++++++++++++-
 1 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/lcgdm.spec b/lcgdm.spec
index e0b6473..c2db5aa 100644
--- a/lcgdm.spec
+++ b/lcgdm.spec
@@ -35,7 +35,7 @@
 
 Name:		lcgdm
 Version:	1.8.3.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	LHC Computing Grid Data Management
 
 Group:		Applications/Internet
@@ -587,6 +587,8 @@ mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/lfc-mysql
 
 # lfcdaemon unit file / startup script
 %if %systemd
+rm ${RPM_BUILD_ROOT}/%{_sysconfdir}/lfc-mysql/lfcdaemon.conf
+rm ${RPM_BUILD_ROOT}/%{_sysconfdir}/lfc-mysql/lfcdaemon.init
 install -m 644 -p ../../lcgdm-unitfiles/mysql/lfcdaemon.service \
     ${RPM_BUILD_ROOT}%{_datadir}/lfc-mysql
 touch ${RPM_BUILD_ROOT}%{_unitdir}/lfcdaemon.service
@@ -607,6 +609,8 @@ touch ${RPM_BUILD_ROOT}%{_mandir}/man8/lfc-shutdown.8
 
 # lfc-dli unit file / startup script
 %if %systemd
+rm ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/lfc-dli
+rm ${RPM_BUILD_ROOT}/%{_initrddir}/lfc-dli
 install -m 644 -p ../../lcgdm-unitfiles/lfc-dli.service \
     ${RPM_BUILD_ROOT}%{_unitdir}
 %endif
@@ -626,6 +630,8 @@ mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/dpm-mysql
 
 # dpm unit file / startup script
 %if %systemd
+rm ${RPM_BUILD_ROOT}/%{_sysconfdir}/dpm-mysql/dpm.conf
+rm ${RPM_BUILD_ROOT}/%{_sysconfdir}/dpm-mysql/dpm.init
 install -m 644 -p ../../lcgdm-unitfiles/mysql/dpm.service \
     ${RPM_BUILD_ROOT}%{_datadir}/dpm-mysql
 touch ${RPM_BUILD_ROOT}%{_unitdir}/dpm.service
@@ -649,6 +655,8 @@ touch ${RPM_BUILD_ROOT}%{_mandir}/man8/dpm-buildfsv.8
 
 # dpnsdaemon unit file / startup script
 %if %systemd
+rm ${RPM_BUILD_ROOT}/%{_sysconfdir}/dpm-mysql/dpnsdaemon.conf
+rm ${RPM_BUILD_ROOT}/%{_sysconfdir}/dpm-mysql/dpnsdaemon.init
 install -m 644 -p ../../lcgdm-unitfiles/mysql/dpnsdaemon.service \
     ${RPM_BUILD_ROOT}%{_datadir}/dpm-mysql
 touch ${RPM_BUILD_ROOT}%{_unitdir}/dpnsdaemon.service
@@ -668,6 +676,8 @@ touch ${RPM_BUILD_ROOT}%{_mandir}/man8/dpns-shutdown.8
 
 # dpmcopyd unit file / startup script
 %if %systemd
+rm ${RPM_BUILD_ROOT}/%{_sysconfdir}/dpm-mysql/dpmcopyd.conf
+rm ${RPM_BUILD_ROOT}/%{_sysconfdir}/dpm-mysql/dpmcopyd.init
 install -m 644 -p ../../lcgdm-unitfiles/mysql/dpmcopyd.service \
     ${RPM_BUILD_ROOT}%{_datadir}/dpm-mysql
 touch ${RPM_BUILD_ROOT}%{_unitdir}/dpmcopyd.service
@@ -685,6 +695,8 @@ touch ${RPM_BUILD_ROOT}%{_mandir}/man8/dpmcopyd.8
 for svc in srmv1 srmv2 srmv2.2 ; do
     # unit file / startup script
 %if %systemd
+    rm ${RPM_BUILD_ROOT}/%{_sysconfdir}/dpm-mysql/${svc}.conf
+    rm ${RPM_BUILD_ROOT}/%{_sysconfdir}/dpm-mysql/${svc}.init
     install -m 644 -p ../../lcgdm-unitfiles/mysql/${svc}.service \
 	${RPM_BUILD_ROOT}%{_datadir}/dpm-mysql
     touch ${RPM_BUILD_ROOT}%{_unitdir}/${svc}.service
@@ -702,6 +714,8 @@ done
 
 # dpm-rfiod unit file / startup script
 %if %systemd
+rm ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/rfiod
+rm ${RPM_BUILD_ROOT}/%{_initrddir}/rfiod
 install -m 644 -p ../../lcgdm-unitfiles/rfiod.service \
     ${RPM_BUILD_ROOT}%{_unitdir}
 %endif
@@ -1586,6 +1600,9 @@ fi
 %doc %{_mandir}/man8/rfiod.8*
 
 %changelog
+* Tue Jun 05 2012 Ricardo Rocha <ricardo.rocha at cern.ch> - 1.8.3.1-2
+- Cleanup sysv scripts from upstream when using systemd
+
 * Mon Jun 04 2012 Ricardo Rocha <ricardo.rocha at cern.ch> - 1.8.3.1-1
 - Update for new upstream release
 - Dropped postgresql packages (unsupported by upstream)