[lcgdm] Updating for 1.8.3.1 release.

Ricardo Rocha rocha at fedoraproject.org
Mon Jun 4 17:48:13 UTC 2012


commit 82ab913df02f1704d0a241f5152d8feddb876724
Author: Ricardo Rocha <rocha at rocha-fedora16.cern.ch>
Date:   Mon Jun 4 19:47:34 2012 +0200

    Updating for 1.8.3.1 release.

 README.Fedora.dpm-mysql     |   43 -
 README.Fedora.dpm-postgres  |   43 -
 README.Fedora.dpns-mysql    |   43 -
 README.Fedora.dpns-postgres |   43 -
 README.Fedora.lfc-mysql     |   43 -
 README.Fedora.lfc-postgres  |   43 -
 lcgdm-condrestart.patch     |  149 ---
 lcgdm-dbengine.patch        |  304 -----
 lcgdm-dlopen.patch          |   93 --
 lcgdm-imake.patch           |   44 -
 lcgdm-paths.patch           |  210 ----
 lcgdm-porting.patch         |  277 -----
 lcgdm-race.patch            |  172 ---
 lcgdm-shliblink.patch       |  506 --------
 lcgdm-start-deps.patch      |  216 ----
 lcgdm-usr.patch             |  139 ---
 lcgdm.spec                  | 2775 +++++--------------------------------------
 sources                     |    2 +-
 18 files changed, 274 insertions(+), 4871 deletions(-)
---
diff --git a/lcgdm.spec b/lcgdm.spec
index a908d84..e0b6473 100644
--- a/lcgdm.spec
+++ b/lcgdm.spec
@@ -34,51 +34,21 @@
 %endif
 
 Name:		lcgdm
-Version:	1.8.2
-Release:	3%{?dist}
+Version:	1.8.3.1
+Release:	1%{?dist}
 Summary:	LHC Computing Grid Data Management
 
 Group:		Applications/Internet
 License:	ASL 2.0
 URL:		http://glite.web.cern.ch/glite/
-#		LANG=C svn co http://svnweb.cern.ch/guest/lcgdm/lcg-dm/tags/LCG-DM_R_1_8_2_3 lcgdm-1.8.2
-#		tar --exclude .svn -z -c -f lcgdm-1.8.2.tar.gz lcgdm-1.8.2
+#		LANG=C svn co http://svnweb.cern.ch/guest/lcgdm/lcg-dm/tags/LCG-DM_R_1_8_3_1 lcgdm-1.8.3.1
+#		tar --exclude .svn -z -c -f lcgdm-1.8.3.1.tar.gz lcgdm-1.8.3.1
 Source0:	%{name}-%{version}.tar.gz
-Source1:	README.Fedora.lfc-mysql
-Source2:	README.Fedora.lfc-postgres
-Source3:	README.Fedora.dpm-mysql
-Source4:	README.Fedora.dpns-mysql
-Source5:	README.Fedora.dpm-postgres
-Source6:	README.Fedora.dpns-postgres
 #		Systemd unit files
-Source7:	%{name}-unitfiles.tar.gz
-#		Link binaries using shared libraries
-#		https://savannah.cern.ch/bugs/?57529
-Patch0:		%{name}-shliblink.patch
-#		Fix build on GNU/Hurd and GNU/kFreeBSD
-#		https://savannah.cern.ch/bugs/?61071
-Patch1:		%{name}-porting.patch
-#		Fix race conditions in Makefile install rules:
-#		https://savannah.cern.ch/bugs/?69233
-Patch2:		%{name}-race.patch
+Source1:	%{name}-unitfiles.tar.gz
 #		Remove deprecated python function:
 #		https://savannah.cern.ch/bugs/?69232
-Patch3:		%{name}-python-exception.patch
-#		Make condrestart work as expected
-#		https://savannah.cern.ch/bugs/?76695
-Patch4:		%{name}-condrestart.patch
-#		Add service dependencies to start-up scripts
-Patch5:		%{name}-start-deps.patch
-#		Get rid of -L/usr/lib(64)
-Patch6:		%{name}-usr.patch
-#		Fix python and perl installation paths and linking
-Patch7:		%{name}-paths.patch
-#		Allow moving plugins out of default library search path
-Patch8:		%{name}-dlopen.patch
-#		Use Fedora's imake instead of bundled version
-Patch9:		%{name}-imake.patch
-#		Update sql scripts
-Patch10:	%{name}-dbengine.patch
+Patch0:		%{name}-python-exception.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if %{?fedora}%{!?fedora:0} >= 5 || %{?rhel}%{!?rhel:0} >= 5
@@ -97,7 +67,6 @@ BuildRequires:	voms-devel%{?_isa}
 BuildRequires:	gsoap-devel%{?_isa}
 BuildRequires:	CGSI-gSOAP-devel%{?_isa} >= 1.3.4.0
 BuildRequires:	mysql-devel%{?_isa}
-BuildRequires:	postgresql-devel%{?_isa}
 %if %{?fedora}%{!?fedora:0} >= 12 || %{?rhel}%{!?rhel:0} >= 6
 BuildRequires:	libuuid-devel%{?_isa}
 %else
@@ -149,7 +118,7 @@ Obsoletes:	lfc < 1.8.1.2-2
 %description -n lfc-libs
 The LCG File Catalog (LFC) keeps track of the locations of the physical
 replicas of the logical files in a distributed storage system.
-This package contains the runtime LFC client library.
+This package contains the run time LFC client library.
 
 %package -n lfc-devel
 Summary:	LFC development libraries and header files
@@ -177,6 +146,8 @@ This package contains the command line interfaces for the LFC.
 %package -n lfc-perl
 Summary:	LCG File Catalog (LFC) perl bindings
 Group:		Applications/Internet
+Provides:	perl-lfc = %{version}-%{release}
+Obsoletes:	perl-lfc <= 1.8.2
 Requires:	lfc-libs%{?_isa} = %{version}-%{release}
 Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -188,6 +159,8 @@ This package provides Perl bindings for the LFC client library.
 %package -n lfc-python
 Summary:	LCG File Catalog (LFC) python bindings
 Group:		Applications/Internet
+Provides:	python-lfc = %{version}-%{release}
+Obsoletes:	python-lfc <= 1.8.2
 Requires:	lfc-libs%{?_isa} = %{version}-%{release}
 
 %description -n lfc-python
@@ -211,11 +184,14 @@ This package provides Python bindings for the LFC client library.
 %endif
 
 %package -n lfc-server-mysql
-Summary:	LCG File Catalog (LFC) server with MySQL database backend
+Summary:	LCG File Catalog (LFC) server with MySQL database back-end
 Group:		Applications/Internet
+Provides:	lfcdaemon = %{version}-%{release}
 Requires:	lfc-libs%{?_isa} = %{version}-%{release}
 Provides:	lfc-mysql = %{version}-%{release}
 Obsoletes:	lfc-mysql < 1.8.1.2-2
+Provides:	LFC-server-mysql = %{version}-%{release}
+Obsoletes:	LFC-server-mysql <= 1.8.2
 
 Requires(pre):		shadow-utils
 Requires(post):		mysql
@@ -234,38 +210,12 @@ Requires(postun):	initscripts
 The LCG File Catalog (LFC) keeps track of the locations of the physical
 replicas of the logical files in a distributed storage system.
 This package provides an LFC server that uses MySQL as its database
-backend.
-
-%package -n lfc-server-postgres
-Summary:	LCG File Catalog (LFC) server with postgres database backend
-Group:		Applications/Internet
-Requires:	lfc-libs%{?_isa} = %{version}-%{release}
-Provides:	lfc-postgres = %{version}-%{release}
-Obsoletes:	lfc-postgres < 1.8.1.2-2
-
-Requires(pre):		shadow-utils
-Requires(post):		postgresql
-%if %systemd
-Requires(post):		systemd-units
-Requires(preun):	systemd-units
-Requires(postun):	systemd-units
-%else
-Requires(post):		chkconfig
-Requires(preun):	chkconfig
-Requires(preun):	initscripts
-Requires(postun):	initscripts
-%endif
-
-%description -n lfc-server-postgres
-The LCG File Catalog (LFC) keeps track of the locations of the physical
-replicas of the logical files in a distributed storage system.
-This package provides an LFC server that uses postgres as its database
-backend.
+back-end.
 
 %package -n lfc-dli
 Summary:	LCG File Catalog (LFC) data location interface (dli) server
 Group:		Applications/Internet
-Requires:	lfc-libs%{?_isa} = %{version}-%{release}
+Requires:	lfcdaemon = %{version}-%{release}
 
 Requires(pre):		shadow-utils
 %if %systemd
@@ -294,7 +244,7 @@ Obsoletes:	dpm < 1.8.1.2-2
 The LCG Disk Pool Manager (DPM) creates a storage element from a set
 of disks. It provides several interfaces for storing and retrieving
 data such as RFIO and SRM version 1, version 2 and version 2.2.
-This package contains the runtime DPM client library.
+This package contains the run time DPM client library.
 
 %package -n dpm-devel
 Summary:	DPM development libraries and header files
@@ -324,6 +274,8 @@ This package contains the command line interfaces for the DPM.
 %package -n dpm-perl
 Summary:	Disk Pool Manager (DPM) perl bindings
 Group:		Applications/Internet
+Provides:	perl-dpm = %{version}-%{release}
+Obsoletes:	perl-dpm <= 1.8.2
 Requires:	dpm-libs%{?_isa} = %{version}-%{release}
 Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -336,6 +288,8 @@ This package provides Perl bindings for the DPM client library.
 %package -n dpm-python
 Summary:	Disk Pool Manager (DPM) python bindings
 Group:		Applications/Internet
+Provides:	python-dpm = %{version}-%{release}
+Obsoletes:	python-dpm <= 1.8.2
 Requires:	dpm-libs%{?_isa} = %{version}-%{release}
 
 %description -n dpm-python
@@ -361,11 +315,13 @@ This package provides Python bindings for the DPM client library.
 %endif
 
 %package -n dpm-server-mysql
-Summary:	Disk Pool Manager (DPM) server with MySQL database backend
+Summary:	Disk Pool Manager (DPM) server with MySQL database back-end
 Group:		Applications/Internet
 Requires:	dpm-libs%{?_isa} = %{version}-%{release}
 Provides:	dpm-mysql = %{version}-%{release}
 Obsoletes:	dpm-mysql < 1.8.1.2-2
+Provides:	DPM-server-mysql = %{version}-%{release}
+Obsoletes:	DPM-server-mysql <= 1.8.2
 
 Requires(pre):		shadow-utils
 %if %systemd
@@ -384,40 +340,16 @@ The LCG Disk Pool Manager (DPM) creates a storage element from a set
 of disks. It provides several interfaces for storing and retrieving
 data such as RFIO and SRM version 1, version 2 and version 2.2.
 This package provides a DPM server that uses MySQL as its database
-backend.
-
-%package -n dpm-server-postgres
-Summary:	Disk Pool Manager (DPM) server with postgres database backend
-Group:		Applications/Internet
-Requires:	dpm-libs%{?_isa} = %{version}-%{release}
-Provides:	dpm-postgres = %{version}-%{release}
-Obsoletes:	dpm-postgres < 1.8.1.2-2
-
-Requires(pre):		shadow-utils
-%if %systemd
-Requires(post):		systemd-units
-Requires(preun):	systemd-units
-Requires(postun):	systemd-units
-%else
-Requires(post):		chkconfig
-Requires(preun):	chkconfig
-Requires(preun):	initscripts
-Requires(postun):	initscripts
-%endif
-
-%description -n dpm-server-postgres
-The LCG Disk Pool Manager (DPM) creates a storage element from a set
-of disks. It provides several interfaces for storing and retrieving
-data such as RFIO and SRM version 1, version 2 and version 2.2.
-This package provides a DPM server that uses postgres as its database
-backend.
+back-end.
 
 %package -n dpm-name-server-mysql
-Summary:	DPM name server with MySQL database backend
+Summary:	DPM name server with MySQL database back-end
 Group:		Applications/Internet
 Requires:	dpm-libs%{?_isa} = %{version}-%{release}
 Provides:	dpm-mysql-nameserver = %{version}-%{release}
 Obsoletes:	dpm-mysql-nameserver < 1.8.1.2-2
+Provides:	DPM-name-server-mysql = %{version}-%{release}
+Obsoletes:	DPM-name-server-mysql <= 1.8.2
 
 Requires(pre):		shadow-utils
 Requires(post):		mysql
@@ -436,42 +368,17 @@ Requires(postun):	initscripts
 The LCG Disk Pool Manager (DPM) creates a storage element from a set
 of disks. It provides several interfaces for storing and retrieving
 data such as RFIO and SRM version 1, version 2 and version 2.2.
-This package provides a DPM nameserver that uses MySQL as its database
-backend.
-
-%package -n dpm-name-server-postgres
-Summary:	DPM nameserver with postgres database backend
-Group:		Applications/Internet
-Requires:	dpm-libs%{?_isa} = %{version}-%{release}
-Provides:	dpm-postgres-nameserver = %{version}-%{release}
-Obsoletes:	dpm-postgres-nameserver < 1.8.1.2-2
-
-Requires(pre):		shadow-utils
-Requires(post):		postgresql
-%if %systemd
-Requires(post):		systemd-units
-Requires(preun):	systemd-units
-Requires(postun):	systemd-units
-%else
-Requires(post):		chkconfig
-Requires(preun):	chkconfig
-Requires(preun):	initscripts
-Requires(postun):	initscripts
-%endif
-
-%description -n dpm-name-server-postgres
-The LCG Disk Pool Manager (DPM) creates a storage element from a set
-of disks. It provides several interfaces for storing and retrieving
-data such as RFIO and SRM version 1, version 2 and version 2.2.
-This package provides a DPM nameserver that uses postgres as its
-database backend.
+This package provides a DPM name server that uses MySQL as its database
+back-end.
 
 %package -n dpm-copy-server-mysql
-Summary:	DPM copy server with MySQL database backend
+Summary:	DPM copy server with MySQL database back-end
 Group:		Applications/Internet
 Requires:	dpm-libs%{?_isa} = %{version}-%{release}
 Provides:	dpm-mysql-copyd = %{version}-%{release}
 Obsoletes:	dpm-mysql-copyd < 1.8.1.2-2
+Provides:	DPM-copy-server-mysql = %{version}-%{release}
+Obsoletes:	DPM-copy-server-mysql <= 1.8.2
 
 Requires(pre):		shadow-utils
 %if %systemd
@@ -490,36 +397,10 @@ The LCG Disk Pool Manager (DPM) creates a storage element from a set
 of disks. It provides several interfaces for storing and retrieving
 data such as RFIO and SRM version 1, version 2 and version 2.2.
 This package provides a DPM copy server that uses MySQL as its
-database backend.
-
-%package -n dpm-copy-server-postgres
-Summary:	DPM copy server with postgres database backend
-Group:		Applications/Internet
-Requires:	dpm-libs%{?_isa} = %{version}-%{release}
-Provides:	dpm-postgres-copyd = %{version}-%{release}
-Obsoletes:	dpm-postgres-copyd < 1.8.1.2-2
-
-Requires(pre):		shadow-utils
-%if %systemd
-Requires(post):		systemd-units
-Requires(preun):	systemd-units
-Requires(postun):	systemd-units
-%else
-Requires(post):		chkconfig
-Requires(preun):	chkconfig
-Requires(preun):	initscripts
-Requires(postun):	initscripts
-%endif
-
-%description -n dpm-copy-server-postgres
-The LCG Disk Pool Manager (DPM) creates a storage element from a set
-of disks. It provides several interfaces for storing and retrieving
-data such as RFIO and SRM version 1, version 2 and version 2.2.
-This package provides a DPM copy server that uses postgres as its
-database backend.
+database back-end.
 
 %package -n dpm-srm-server-mysql
-Summary:	DPM SRM server with MySQL database backend
+Summary:	DPM SRM server with MySQL database back-end
 Group:		Applications/Internet
 Requires:	dpm-libs%{?_isa} = %{version}-%{release}
 Provides:	dpm-mysql-srmv1 = %{version}-%{release}
@@ -527,7 +408,9 @@ Obsoletes:	dpm-mysql-srmv1 < 1.8.1.2-2
 Provides:	dpm-mysql-srmv2 = %{version}-%{release}
 Obsoletes:	dpm-mysql-srmv2 < 1.8.1.2-2
 Provides:	dpm-mysql-srmv22 = %{version}-%{release}
-Obsoletes:	dpm-mysql-srmv22 < 1.8.1.2-2
+Obsoletes:	dpm-mysql-srmv22 <= 1.8.2
+Provides:	DPM-srm-server-mysql = %{version}-%{release}
+Obsoletes:	DPM-srm-server-mysql <= 1.8.2
 
 Requires(pre):		shadow-utils
 %if %systemd
@@ -546,37 +429,7 @@ The LCG Disk Pool Manager (DPM) creates a storage element from a set
 of disks. It provides several interfaces for storing and retrieving
 data such as RFIO and SRM version 1, version 2 and version 2.2.
 This package provides a DPM SRM server that uses MySQL as its
-database backend.
-
-%package -n dpm-srm-server-postgres
-Summary:	DPM SRM server with postgres database backend
-Group:		Applications/Internet
-Requires:	dpm-libs%{?_isa} = %{version}-%{release}
-Provides:	dpm-postgres-srmv1 = %{version}-%{release}
-Obsoletes:	dpm-postgres-srmv1 < 1.8.1.2-2
-Provides:	dpm-postgres-srmv2 = %{version}-%{release}
-Obsoletes:	dpm-postgres-srmv2 < 1.8.1.2-2
-Provides:	dpm-postgres-srmv22 = %{version}-%{release}
-Obsoletes:	dpm-postgres-srmv22 < 1.8.1.2-2
-
-Requires(pre):		shadow-utils
-%if %systemd
-Requires(post):		systemd-units
-Requires(preun):	systemd-units
-Requires(postun):	systemd-units
-%else
-Requires(post):		chkconfig
-Requires(preun):	chkconfig
-Requires(preun):	initscripts
-Requires(postun):	initscripts
-%endif
-
-%description -n dpm-srm-server-postgres
-The LCG Disk Pool Manager (DPM) creates a storage element from a set
-of disks. It provides several interfaces for storing and retrieving
-data such as RFIO and SRM version 1, version 2 and version 2.2.
-This package provides a DPM SRM server that uses postgres as its
-database backend.
+database back-end.
 
 %package -n dpm-rfio-server
 Summary:	DPM RFIO server
@@ -584,6 +437,8 @@ Group:		Applications/Internet
 Requires:	dpm-libs%{?_isa} = %{version}-%{release}
 Provides:	dpm-rfiod = %{version}-%{release}
 Obsoletes:	dpm-rfiod < 1.8.1.2-2
+Provides:	DPM-rfio-server = %{version}-%{release}
+Obsoletes:	DPM-rfio-server <= 1.8.2
 
 %if %systemd
 Requires(post):		systemd-units
@@ -605,27 +460,15 @@ This package provides a Remote File IO (RFIO) server for DPM.
 %prep
 %setup -T -q -c
 %setup -q -c -n %{name}-%{version}/lfc-mysql
-%setup -q -c -n %{name}-%{version}/lfc-postgres
 %setup -q -c -n %{name}-%{version}/dpm-mysql
-%setup -q -c -n %{name}-%{version}/dpm-postgres
-%setup -D -T -q -a 7
+%setup -D -T -q -a 1
 %setup -D -T -q
 
-for d in lfc-mysql lfc-postgres dpm-mysql dpm-postgres ; do
+for d in lfc-mysql dpm-mysql ; do
 
 pushd $d/%{name}-%{version}
 
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
 
 chmod 644 security/globus_gsi_gss_constants.h \
 	  security/globus_i_gsi_credential.h \
@@ -635,19 +478,13 @@ chmod 644 doc/lfc/INSTALL-*
 # The code violates the strict aliasing rules all over the place...
 # Need to use -fnostrict-aliasing so that the -O2 optimization in
 # optflags doesn't try to use them.
-sed 's/^CC +=/& %{optflags} -fno-strict-aliasing/' -i config/linux.cf
+sed 's/^CC +=/& %{optflags} -fno-strict-aliasing -fno-tree-sink/' -i config/linux.cf
+sed "s/i386/'i386'/" -i config/linux.cf
 
 popd
 
 done
 
-install -m 644 -p %{SOURCE1} lfc-mysql/%{name}-%{version}/ns/README.Fedora
-install -m 644 -p %{SOURCE2} lfc-postgres/%{name}-%{version}/ns/README.Fedora
-install -m 644 -p %{SOURCE3} dpm-mysql/%{name}-%{version}/dpm/README.Fedora
-install -m 644 -p %{SOURCE4} dpm-mysql/%{name}-%{version}/ns/README.Fedora
-install -m 644 -p %{SOURCE5} dpm-postgres/%{name}-%{version}/dpm/README.Fedora
-install -m 644 -p %{SOURCE6} dpm-postgres/%{name}-%{version}/ns/README.Fedora
-
 %build
 gsoapversion=`soapcpp2 -v 2>&1 | grep C++ | sed 's/.* //'`
 
@@ -658,46 +495,13 @@ pushd lfc-mysql/%{name}-%{version}
 	--with-gsoap-version=$gsoapversion \
 	--with-id-map-file=%{_sysconfdir}/lcgdm-mapfile \
 	--with-ns-config-file=%{_sysconfdir}/NSCONFIG \
+	--with-etc-dir='$(prefix)/../etc' \
 	--with-emi \
 	--without-argus
 
 make -f Makefile.ini Makefiles
 
-make %{?_smp_mflags} SOAPFLG="`pkg-config --cflags gsoap`" \
-     SYSCONFDIR=%{_sysconfdir} \
-     LDFLAGS="%{?__global_ldflags}"
-
-popd
-
-pushd lfc-postgres/%{name}-%{version}
-
-./configure lfc --with-postgres \
-	--libdir=%{_lib} \
-	--with-gsoap-version=$gsoapversion \
-	--with-id-map-file=%{_sysconfdir}/lcgdm-mapfile \
-	--with-ns-config-file=%{_sysconfdir}/NSCONFIG \
-	--with-emi \
-	--without-argus
-
-# Disable building things already built above
-sed -e 's/\(BuildDLI	*\)YES/\1NO/' \
-    -e 's/\(BuildInterfaces	*\)YES/\1NO/' \
-    -e 's/\(BuildNameServerClient	*\)YES/\1NO/' \
-    -e 's/\(BuildNameServerLibrary	*\)YES/\1NO/' -i config/site.def
-sed '/^\#define.*YES/d' -i config/Project.tmpl config/Library.tmpl
-sed '/^SECURITYDIR =/d' -i config/Project.tmpl
-sed 's/\(install:\).*/\1/' -i h/Imakefile
-
-make -f Makefile.ini Makefiles
-
-pushd shlib
-ln -s ../../../lfc-mysql/%{name}-%{version}/shlib/liblcgdm.so* .
-ln -s ../../../lfc-mysql/%{name}-%{version}/shlib/liblfc.so* .
-popd
-
-make %{?_smp_mflags} SOAPFLG="`pkg-config --cflags gsoap`" \
-     SYSCONFDIR=%{_sysconfdir} \
-     LDFLAGS="%{?__global_ldflags}"
+make %{?_smp_mflags} SOAPFLG="`pkg-config --cflags gsoap`"
 
 popd
 
@@ -708,59 +512,14 @@ pushd dpm-mysql/%{name}-%{version}
 	--with-gsoap-version=$gsoapversion \
 	--with-dpm-config-file=%{_sysconfdir}/DPMCONFIG \
 	--with-id-map-file=%{_sysconfdir}/lcgdm-mapfile \
-	--with-ns-config-file=%{_sysconfdir}/DPNSCONFIG \
-	--with-emi \
-	--without-argus
-
-# Disable building things already built above
-sed -e '/^SECURITYDIR =/d' -e '/^COMMONDIR =/d' -i config/Project.tmpl
-sed -e 's/:.*(lcgdm).*/:/' -i lib/Imakefile
-sed -e 's/:.*(lcgdm).*/:/' -i shlib/Imakefile
-
-make -f Makefile.ini Makefiles
-
-pushd shlib
-ln -s ../../../lfc-mysql/%{name}-%{version}/shlib/liblcgdm.so* .
-popd
-
-make %{?_smp_mflags} SOAPFLG="`pkg-config --cflags gsoap`" \
-     SYSCONFDIR=%{_sysconfdir} \
-     LDFLAGS="%{?__global_ldflags}"
-
-popd
-
-pushd dpm-postgres/%{name}-%{version}
-
-./configure dpm --with-postgres \
-	--libdir=%{_lib} \
-	--with-gsoap-version=$gsoapversion \
-	--with-dpm-config-file=%{_sysconfdir}/DPMCONFIG \
-	--with-id-map-file=%{_sysconfdir}/lcgdm-mapfile \
-	--with-ns-config-file=%{_sysconfdir}/DPNSCONFIG \
+	--with-ns-config-file=%{_sysconfdir}/NSCONFIG \
+	--with-etc-dir='$(prefix)/../etc' \
 	--with-emi \
 	--without-argus
 
-# Disable building things already built above
-sed -e 's/\(BuildDPMClient	*\)YES/\1NO/' \
-    -e 's/\(BuildInterfaces	*\)YES/\1NO/' \
-    -e 's/\(BuildNameServerClient	*\)YES/\1NO/' \
-    -e 's/\(BuildNameServerLibrary	*\)YES/\1NO/' \
-    -e 's/\(BuildRfioClient	*\)YES/\1NO/' \
-    -e 's/\(BuildRfioServer	*\)YES/\1NO/' -i config/site.def
-sed '/^\#define.*YES/d' -i config/Project.tmpl config/Library.tmpl
-sed '/^SECURITYDIR =/d' -i config/Project.tmpl
-sed 's/\(install:\).*/\1/' -i h/Imakefile
-
 make -f Makefile.ini Makefiles
 
-pushd shlib
-ln -s ../../../lfc-mysql/%{name}-%{version}/shlib/liblcgdm.so* .
-ln -s ../../../dpm-mysql/%{name}-%{version}/shlib/libdpm.so* .
-popd
-
-make %{?_smp_mflags} SOAPFLG="`pkg-config --cflags gsoap`" \
-     SYSCONFDIR=%{_sysconfdir} \
-     LDFLAGS="%{?__global_ldflags}"
+make %{?_smp_mflags} SOAPFLG="`pkg-config --cflags gsoap`"
 
 popd
 
@@ -817,833 +576,180 @@ rm -rf ${RPM_BUILD_ROOT}
 
 %if %systemd
 mkdir -p ${RPM_BUILD_ROOT}%{_unitdir}
-%else
-mkdir -p ${RPM_BUILD_ROOT}%{_initrddir}
-mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
 %endif
-mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d
-mkdir -p ${RPM_BUILD_ROOT}%{_sbindir}
-mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man8
 
 pushd lfc-mysql/%{name}-%{version}
 
 make SOAPFLG="`pkg-config --cflags gsoap`" \
-     SYSCONFDIR=${RPM_BUILD_ROOT}%{_sysconfdir} \
-     LDFLAGS="%{?__global_ldflags}" \
      prefix=${RPM_BUILD_ROOT}%{_prefix} install install.man
 
-mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/lfc
-mv ${RPM_BUILD_ROOT}%{_datadir}/LFC/* ${RPM_BUILD_ROOT}%{_datadir}/lfc
-rmdir ${RPM_BUILD_ROOT}%{_datadir}/LFC
-
-mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/lfc-mysql
-mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/lfc-mysql
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/lfc-mysql
 
 # lfcdaemon unit file / startup script
 %if %systemd
-rm ${RPM_BUILD_ROOT}%{_datadir}/lfc/rc.lfcdaemon
-rm ${RPM_BUILD_ROOT}%{_sysconfdir}/lfcdaemon.conf.templ
 install -m 644 -p ../../lcgdm-unitfiles/mysql/lfcdaemon.service \
     ${RPM_BUILD_ROOT}%{_datadir}/lfc-mysql
 touch ${RPM_BUILD_ROOT}%{_unitdir}/lfcdaemon.service
 %else
-sed -e 's/LD_LIBRARY_PATH=$LD_LIBRARY_PATH //' \
-    -e '/LD_LIBRARY_PATH/d' \
-    -e 's!\$PREFIX/bin!\$PREFIX/sbin!' \
-    -e 's!\$PREFIX/etc!/etc!' \
-    ${RPM_BUILD_ROOT}%{_datadir}/lfc/rc.lfcdaemon > \
-    ${RPM_BUILD_ROOT}%{_sysconfdir}/lfc-mysql/lfcdaemon.init
-chmod 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/lfc-mysql/lfcdaemon.init
-rm ${RPM_BUILD_ROOT}%{_datadir}/lfc/rc.lfcdaemon
 touch ${RPM_BUILD_ROOT}%{_initrddir}/lfcdaemon
 chmod 755 ${RPM_BUILD_ROOT}%{_initrddir}/lfcdaemon
-sed -e 's!/opt/lcg!!' -e 's!export SEMSGCONFIGFILE!#&!' \
-    ${RPM_BUILD_ROOT}%{_sysconfdir}/lfcdaemon.conf.templ > \
-    ${RPM_BUILD_ROOT}%{_sysconfdir}/lfc-mysql/lfcdaemon.conf
-rm ${RPM_BUILD_ROOT}%{_sysconfdir}/lfcdaemon.conf.templ
 touch ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/lfcdaemon
 %endif
 
-# lfcdaemon log directory and log rotation configuration
-mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/lfc
-install -m 644 -p ns/lfcdaemon.logrotate \
-    ${RPM_BUILD_ROOT}%{_sysconfdir}/lfc-mysql/lfcdaemon.logrotate
 touch ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/lfcdaemon
-
-# lfcdaemon binary and man page
-mv ${RPM_BUILD_ROOT}%{_bindir}/lfcdaemon \
-   ${RPM_BUILD_ROOT}%{_libdir}/lfc-mysql/lfcdaemon
 touch ${RPM_BUILD_ROOT}%{_sbindir}/lfcdaemon
 chmod 755 ${RPM_BUILD_ROOT}%{_sbindir}/lfcdaemon
-sed -e 's/\(\.TH [^ ]* \)1/\18/' \
-    -e 's!/opt/lcg!!g' \
-    -e 's/lfc-shutdown(1)/lfc-shutdown(8)/g' \
-    ${RPM_BUILD_ROOT}%{_mandir}/man1/lfcdaemon.1 | gzip -9 -n -c > \
-    ${RPM_BUILD_ROOT}%{_libdir}/lfc-mysql/lfcdaemon.8.gz
-rm ${RPM_BUILD_ROOT}%{_mandir}/man1/lfcdaemon.1
 touch ${RPM_BUILD_ROOT}%{_mandir}/man8/lfcdaemon.8
-
-mv ${RPM_BUILD_ROOT}%{_sysconfdir}/NSCONFIG.templ \
-   ${RPM_BUILD_ROOT}%{_datadir}/lfc-mysql/NSCONFIG.templ
-touch ${RPM_BUILD_ROOT}%{_datadir}/lfc/NSCONFIG.templ
-
-# lfc-shutdown binary and man page
-mv ${RPM_BUILD_ROOT}%{_bindir}/lfc-shutdown \
-   ${RPM_BUILD_ROOT}%{_libdir}/lfc-mysql/lfc-shutdown
+touch ${RPM_BUILD_ROOT}%{_datadir}/lcgdm/NSCONFIG.templ
 touch ${RPM_BUILD_ROOT}%{_sbindir}/lfc-shutdown
 chmod 755 ${RPM_BUILD_ROOT}%{_sbindir}/lfc-shutdown
-sed -e 's/\(\.TH [^ ]* \)1/\18/' \
-    ${RPM_BUILD_ROOT}%{_mandir}/man1/lfc-shutdown.1 | gzip -9 -n -c > \
-    ${RPM_BUILD_ROOT}%{_libdir}/lfc-mysql/lfc-shutdown.8.gz
-rm ${RPM_BUILD_ROOT}%{_mandir}/man1/lfc-shutdown.1
 touch ${RPM_BUILD_ROOT}%{_mandir}/man8/lfc-shutdown.8
 
 # lfc-dli unit file / startup script
 %if %systemd
-rm ${RPM_BUILD_ROOT}%{_datadir}/lfc/rc.lfc-dli
-rm ${RPM_BUILD_ROOT}%{_sysconfdir}/lfc-dli.conf.templ
 install -m 644 -p ../../lcgdm-unitfiles/lfc-dli.service \
     ${RPM_BUILD_ROOT}%{_unitdir}
-%else
-sed -e 's/LD_LIBRARY_PATH=$LD_LIBRARY_PATH //' \
-    -e '/LD_LIBRARY_PATH/d' \
-    -e 's!\$PREFIX/bin!\$PREFIX/sbin!' \
-    -e 's!\$PREFIX/etc!/etc!' \
-    -e 's!/var/log/dli!/var/log/lfc-dli!g' \
-    ${RPM_BUILD_ROOT}%{_datadir}/lfc/rc.lfc-dli > \
-    ${RPM_BUILD_ROOT}%{_initrddir}/lfc-dli
-chmod 755 ${RPM_BUILD_ROOT}%{_initrddir}/lfc-dli
-rm ${RPM_BUILD_ROOT}%{_datadir}/lfc/rc.lfc-dli
-sed -e 's!/var/log/dli!/var/log/lfc-dli!g' \
-    -e 's/\(LFC_HOST=\).*/\1`hostname -f`/' \
-    ${RPM_BUILD_ROOT}%{_sysconfdir}/lfc-dli.conf.templ > \
-    ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/lfc-dli
-rm ${RPM_BUILD_ROOT}%{_sysconfdir}/lfc-dli.conf.templ
-%endif
-
-# lfc-dli log directory and log rotation configuration
-mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/lfc-dli
-sed -e 's!/var/log/dli!/var/log/lfc-dli!g' dli/lfc-dli.logrotate > \
-    ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/lfc-dli
-
-# lfc-dli binary and man page
-mv ${RPM_BUILD_ROOT}%{_bindir}/lfc-dli ${RPM_BUILD_ROOT}%{_sbindir}/lfc-dli
-sed -e 's/\(\.TH [^ ]* \)1/\18/' \
-    -e 's!/var/log/dli!/var/log/lfc-dli!g' \
-    -e 's/lfcdaemon(1)/lfcdaemon(8)/g' \
-    ${RPM_BUILD_ROOT}%{_mandir}/man1/lfc-dli.1 > \
-    ${RPM_BUILD_ROOT}%{_mandir}/man8/lfc-dli.8
-rm ${RPM_BUILD_ROOT}%{_mandir}/man1/lfc-dli.1
-
-sed 's/\(^LFC_VERSION=\).*/\1%{version}/' scripts/lcg-info-provider-lfc > \
-    ${RPM_BUILD_ROOT}%{_datadir}/lfc/lcg-info-provider-lfc
-chmod 755 ${RPM_BUILD_ROOT}%{_datadir}/lfc/lcg-info-provider-lfc
-
-# Create lfc user home and certificate directories
-mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/lib/lfc
-mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/grid-security/lfcmgr
-
-# Remove due to name conflict
-rm ${RPM_BUILD_ROOT}%{_mandir}/man3/log.3*
+%endif
 
 # Remove static libraries
 rm ${RPM_BUILD_ROOT}%{_libdir}/liblfc.a
 rm ${RPM_BUILD_ROOT}%{_libdir}/liblcgdm.a
 
-%if %systemd == 0
-# Turn off services by default
-sed -e 's/\(chkconfig: \)\w*/\1-/' \
-    -e '/Default-Start/d' \
-    -e 's/\(Default-Stop: *\).*/\10 1 2 3 4 5 6/' \
-    -i ${RPM_BUILD_ROOT}%{_sysconfdir}/lfc-mysql/lfcdaemon.init \
-       ${RPM_BUILD_ROOT}%{_initrddir}/lfc-dli
-%endif
-
-popd
-
-pushd lfc-postgres/%{name}-%{version}
-
-make SOAPFLG="`pkg-config --cflags gsoap`" \
-     SYSCONFDIR=${RPM_BUILD_ROOT}%{_sysconfdir} \
-     LDFLAGS="%{?__global_ldflags}" \
-     prefix=${RPM_BUILD_ROOT}%{_prefix} install install.man
-
-mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/lfc
-mv ${RPM_BUILD_ROOT}%{_datadir}/LFC/* ${RPM_BUILD_ROOT}%{_datadir}/lfc
-rmdir ${RPM_BUILD_ROOT}%{_datadir}/LFC
-
-mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/lfc-postgres
-mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/lfc-postgres
-mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/lfc-postgres
-
-# lfcdaemon unit file / startup script
-%if %systemd
-rm ${RPM_BUILD_ROOT}%{_datadir}/lfc/rc.lfcdaemon
-rm ${RPM_BUILD_ROOT}%{_sysconfdir}/lfcdaemon.conf.templ
-install -m 644 -p ../../lcgdm-unitfiles/postgres/lfcdaemon.service \
-    ${RPM_BUILD_ROOT}%{_datadir}/lfc-postgres
-touch ${RPM_BUILD_ROOT}%{_unitdir}/lfcdaemon.service
-%else
-sed -e 's/LD_LIBRARY_PATH=$LD_LIBRARY_PATH //' \
-    -e '/LD_LIBRARY_PATH/d' \
-    -e 's!\$PREFIX/bin!\$PREFIX/sbin!' \
-    -e 's!\$PREFIX/etc!/etc!' \
-    ${RPM_BUILD_ROOT}%{_datadir}/lfc/rc.lfcdaemon > \
-    ${RPM_BUILD_ROOT}%{_sysconfdir}/lfc-postgres/lfcdaemon.init
-chmod 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/lfc-postgres/lfcdaemon.init
-rm ${RPM_BUILD_ROOT}%{_datadir}/lfc/rc.lfcdaemon
-touch ${RPM_BUILD_ROOT}%{_initrddir}/lfcdaemon
-chmod 755 ${RPM_BUILD_ROOT}%{_initrddir}/lfcdaemon
-sed -e 's!/opt/lcg!!' -e 's!export SEMSGCONFIGFILE!#&!' \
-    ${RPM_BUILD_ROOT}%{_sysconfdir}/lfcdaemon.conf.templ > \
-    ${RPM_BUILD_ROOT}%{_sysconfdir}/lfc-postgres/lfcdaemon.conf
-rm ${RPM_BUILD_ROOT}%{_sysconfdir}/lfcdaemon.conf.templ
-touch ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/lfcdaemon
-%endif
-
-# lfcdaemon log directory and log rotation configuration
-mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/lfc
-install -m 644 -p ns/lfcdaemon.logrotate \
-    ${RPM_BUILD_ROOT}%{_sysconfdir}/lfc-postgres/lfcdaemon.logrotate
-touch ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/lfcdaemon
-
-# lfcdaemon binary and man page
-mv ${RPM_BUILD_ROOT}%{_bindir}/lfcdaemon \
-   ${RPM_BUILD_ROOT}%{_libdir}/lfc-postgres/lfcdaemon
-touch ${RPM_BUILD_ROOT}%{_sbindir}/lfcdaemon
-chmod 755 ${RPM_BUILD_ROOT}%{_sbindir}/lfcdaemon
-sed -e 's/\(\.TH [^ ]* \)1/\18/' \
-    -e 's!/opt/lcg!!g' \
-    -e 's/lfc-shutdown(1)/lfc-shutdown(8)/g' \
-    ${RPM_BUILD_ROOT}%{_mandir}/man1/lfcdaemon.1 | gzip -9 -n -c > \
-    ${RPM_BUILD_ROOT}%{_libdir}/lfc-postgres/lfcdaemon.8.gz
-rm ${RPM_BUILD_ROOT}%{_mandir}/man1/lfcdaemon.1
-touch ${RPM_BUILD_ROOT}%{_mandir}/man8/lfcdaemon.8
-
-mv ${RPM_BUILD_ROOT}%{_sysconfdir}/NSCONFIG.templ \
-   ${RPM_BUILD_ROOT}%{_datadir}/lfc-postgres/NSCONFIG.templ
-touch ${RPM_BUILD_ROOT}%{_datadir}/lfc/NSCONFIG.templ
-
-# lfc-shutdown binary and man page
-mv ${RPM_BUILD_ROOT}%{_bindir}/lfc-shutdown \
-   ${RPM_BUILD_ROOT}%{_libdir}/lfc-postgres/lfc-shutdown
-touch ${RPM_BUILD_ROOT}%{_sbindir}/lfc-shutdown
-chmod 755 ${RPM_BUILD_ROOT}%{_sbindir}/lfc-shutdown
-sed -e 's/\(\.TH [^ ]* \)1/\18/' \
-    ${RPM_BUILD_ROOT}%{_mandir}/man1/lfc-shutdown.1 | gzip -9 -n -c > \
-    ${RPM_BUILD_ROOT}%{_libdir}/lfc-postgres/lfc-shutdown.8.gz
-rm ${RPM_BUILD_ROOT}%{_mandir}/man1/lfc-shutdown.1
-touch ${RPM_BUILD_ROOT}%{_mandir}/man8/lfc-shutdown.8
-
-# Create lfc user home and certificate directories
-mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/lib/lfc
-mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/grid-security/lfcmgr
-
-# This doesn't quite work...
-sed '/CREATE DATABASE/d' -i \
-    ${RPM_BUILD_ROOT}%{_datadir}/lfc/create_lfc_tables_postgres.sql
-
-%if %systemd == 0
-# Turn off services by default
-sed -e 's/\(chkconfig: \)\w*/\1-/' \
-    -e '/Default-Start/d' \
-    -e 's/\(Default-Stop: *\).*/\10 1 2 3 4 5 6/' \
-    -i ${RPM_BUILD_ROOT}%{_sysconfdir}/lfc-postgres/lfcdaemon.init
-%endif
-
 popd
 
 pushd dpm-mysql/%{name}-%{version}
 
 make SOAPFLG="`pkg-config --cflags gsoap`" \
-     SYSCONFDIR=${RPM_BUILD_ROOT}%{_sysconfdir} \
-     LDFLAGS="%{?__global_ldflags}" \
      prefix=${RPM_BUILD_ROOT}%{_prefix} install install.man
 
-sed 's!/usr/bin/env python!/usr/bin/python!' \
-    -i ${RPM_BUILD_ROOT}%{_bindir}/dpm-listspaces
-
-mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/dpm
-mv ${RPM_BUILD_ROOT}%{_datadir}/DPM/* ${RPM_BUILD_ROOT}%{_datadir}/dpm
-rmdir ${RPM_BUILD_ROOT}%{_datadir}/DPM
-
-mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/dpm-mysql
-mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/dpm-mysql
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/dpm-mysql
 
 # dpm unit file / startup script
 %if %systemd
-rm ${RPM_BUILD_ROOT}%{_datadir}/dpm/rc.dpm
-rm ${RPM_BUILD_ROOT}%{_sysconfdir}/dpm.conf.templ
 install -m 644 -p ../../lcgdm-unitfiles/mysql/dpm.service \
     ${RPM_BUILD_ROOT}%{_datadir}/dpm-mysql
 touch ${RPM_BUILD_ROOT}%{_unitdir}/dpm.service
 %else
-sed -e 's/LD_LIBRARY_PATH=$LD_LIBRARY_PATH //' \
-    -e '/LD_LIBRARY_PATH/d' \
-    -e 's!\$PREFIX/bin!\$PREFIX/sbin!' \
-    -e 's!\$PREFIX/etc!/etc!' \
-    ${RPM_BUILD_ROOT}%{_datadir}/dpm/rc.dpm > \
-    ${RPM_BUILD_ROOT}%{_sysconfdir}/dpm-mysql/dpm.init
-chmod 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/dpm-mysql/dpm.init
-rm ${RPM_BUILD_ROOT}%{_datadir}/dpm/rc.dpm
 touch ${RPM_BUILD_ROOT}%{_initrddir}/dpm
 chmod 755 ${RPM_BUILD_ROOT}%{_initrddir}/dpm
-sed -e 's/\(^DPNS_HOST=\).*/\1`hostname -f`/' \
-    ${RPM_BUILD_ROOT}%{_sysconfdir}/dpm.conf.templ > \
-    ${RPM_BUILD_ROOT}%{_sysconfdir}/dpm-mysql/dpm.conf
-rm ${RPM_BUILD_ROOT}%{_sysconfdir}/dpm.conf.templ
 touch ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/dpm
 %endif
 
-# dpm log directory and log rotation configuration
-mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/dpm
-install -m 644 -p dpm/dpm.logrotate \
-    ${RPM_BUILD_ROOT}%{_sysconfdir}/dpm-mysql/dpm.logrotate
 touch ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/dpm
-
-# dpm binary and man page
-mv ${RPM_BUILD_ROOT}%{_bindir}/dpm \
-   ${RPM_BUILD_ROOT}%{_libdir}/dpm-mysql/dpm
 touch ${RPM_BUILD_ROOT}%{_sbindir}/dpm
 chmod 755 ${RPM_BUILD_ROOT}%{_sbindir}/dpm
-sed -e 's/\(\.TH [^ ]* \)1/\18/' \
-    -e 's/dpm-shutdown(1)/dpm-shutdown(8)/g' \
-    ${RPM_BUILD_ROOT}%{_mandir}/man1/dpm.1 | gzip -9 -n -c > \
-    ${RPM_BUILD_ROOT}%{_libdir}/dpm-mysql/dpm.8.gz
-rm ${RPM_BUILD_ROOT}%{_mandir}/man1/dpm.1
 touch ${RPM_BUILD_ROOT}%{_mandir}/man8/dpm.8
-
-mv ${RPM_BUILD_ROOT}%{_sysconfdir}/DPMCONFIG.templ \
-   ${RPM_BUILD_ROOT}%{_datadir}/dpm-mysql/DPMCONFIG.templ
-touch ${RPM_BUILD_ROOT}%{_datadir}/dpm/DPMCONFIG.templ
-
-# dpm-shutdown binary and man page
-mv ${RPM_BUILD_ROOT}%{_bindir}/dpm-shutdown \
-   ${RPM_BUILD_ROOT}%{_libdir}/dpm-mysql/dpm-shutdown
+touch ${RPM_BUILD_ROOT}%{_datadir}/lcgdm/DPMCONFIG.templ
 touch ${RPM_BUILD_ROOT}%{_sbindir}/dpm-shutdown
 chmod 755 ${RPM_BUILD_ROOT}%{_sbindir}/dpm-shutdown
-sed -e 's/\(\.TH [^ ]* \)1/\18/' \
-    ${RPM_BUILD_ROOT}%{_mandir}/man1/dpm-shutdown.1 | gzip -9 -n -c > \
-    ${RPM_BUILD_ROOT}%{_libdir}/dpm-mysql/dpm-shutdown.8.gz
-rm ${RPM_BUILD_ROOT}%{_mandir}/man1/dpm-shutdown.1
 touch ${RPM_BUILD_ROOT}%{_mandir}/man8/dpm-shutdown.8
-
-# dpm-buildfsv binary and man page
-mv ${RPM_BUILD_ROOT}%{_bindir}/dpm-buildfsv \
-   ${RPM_BUILD_ROOT}%{_libdir}/dpm-mysql/dpm-buildfsv
 touch ${RPM_BUILD_ROOT}%{_sbindir}/dpm-buildfsv
 chmod 755 ${RPM_BUILD_ROOT}%{_sbindir}/dpm-buildfsv
-sed -e 's/\(\.TH [^ ]* \)1/\18/' \
-    ${RPM_BUILD_ROOT}%{_mandir}/man1/dpm-buildfsv.1 | gzip -9 -n -c > \
-    ${RPM_BUILD_ROOT}%{_libdir}/dpm-mysql/dpm-buildfsv.8.gz
-rm ${RPM_BUILD_ROOT}%{_mandir}/man1/dpm-buildfsv.1
 touch ${RPM_BUILD_ROOT}%{_mandir}/man8/dpm-buildfsv.8
 
 # dpnsdaemon unit file / startup script
 %if %systemd
-rm ${RPM_BUILD_ROOT}%{_datadir}/dpm/rc.dpnsdaemon
-rm ${RPM_BUILD_ROOT}%{_sysconfdir}/dpnsdaemon.conf.templ
 install -m 644 -p ../../lcgdm-unitfiles/mysql/dpnsdaemon.service \
     ${RPM_BUILD_ROOT}%{_datadir}/dpm-mysql
 touch ${RPM_BUILD_ROOT}%{_unitdir}/dpnsdaemon.service
 %else
-sed -e 's/LD_LIBRARY_PATH=$LD_LIBRARY_PATH //' \
-    -e '/LD_LIBRARY_PATH/d' \
-    -e 's!\$PREFIX/bin!\$PREFIX/sbin!' \
-    -e 's!\$PREFIX/etc!/etc!' \
-    -e 's!/etc/NSCONFIG!/etc/DPNSCONFIG!g' \
-    ${RPM_BUILD_ROOT}%{_datadir}/dpm/rc.dpnsdaemon > \
-    ${RPM_BUILD_ROOT}%{_sysconfdir}/dpm-mysql/dpnsdaemon.init
-chmod 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/dpm-mysql/dpnsdaemon.init
-rm ${RPM_BUILD_ROOT}%{_datadir}/dpm/rc.dpnsdaemon
 touch ${RPM_BUILD_ROOT}%{_initrddir}/dpnsdaemon
 chmod 755 ${RPM_BUILD_ROOT}%{_initrddir}/dpnsdaemon
-sed -e 's!/etc/NSCONFIG!/etc/DPNSCONFIG!g' \
-    -e 's!/opt/lcg!!' -e 's!export SEMSGCONFIGFILE!#&!' \
-    ${RPM_BUILD_ROOT}%{_sysconfdir}/dpnsdaemon.conf.templ > \
-    ${RPM_BUILD_ROOT}%{_sysconfdir}/dpm-mysql/dpnsdaemon.conf
-rm ${RPM_BUILD_ROOT}%{_sysconfdir}/dpnsdaemon.conf.templ
 touch ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/dpnsdaemon
 %endif
-
-# dpnsdaemon log directory and log rotation configuration
-mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/dpns
-install -m 644 -p ns/dpnsdaemon.logrotate \
-    ${RPM_BUILD_ROOT}%{_sysconfdir}/dpm-mysql/dpnsdaemon.logrotate
 touch ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/dpnsdaemon
-
-# dpnsdaemon binary and man page
-mv ${RPM_BUILD_ROOT}%{_bindir}/dpnsdaemon \
-   ${RPM_BUILD_ROOT}%{_libdir}/dpm-mysql/dpnsdaemon
 touch ${RPM_BUILD_ROOT}%{_sbindir}/dpnsdaemon
 chmod 755 ${RPM_BUILD_ROOT}%{_sbindir}/dpnsdaemon
-sed -e 's/\(\.TH [^ ]* \)1/\18/' \
-    -e 's!/opt/lcg!!g' \
-    -e 's!/etc/NSCONFIG!/etc/DPNSCONFIG!g' \
-    -e 's/dpns-shutdown(1)/dpns-shutdown(8)/g' \
-    ${RPM_BUILD_ROOT}%{_mandir}/man1/dpnsdaemon.1 | gzip -9 -n -c > \
-    ${RPM_BUILD_ROOT}%{_libdir}/dpm-mysql/dpnsdaemon.8.gz
-rm ${RPM_BUILD_ROOT}%{_mandir}/man1/dpnsdaemon.1
 touch ${RPM_BUILD_ROOT}%{_mandir}/man8/dpnsdaemon.8
-
-mv ${RPM_BUILD_ROOT}%{_sysconfdir}/NSCONFIG.templ \
-   ${RPM_BUILD_ROOT}%{_datadir}/dpm-mysql/DPNSCONFIG.templ
-touch ${RPM_BUILD_ROOT}%{_datadir}/dpm/DPNSCONFIG.templ
-
-# dpns-shutdown binary and man page
-mv ${RPM_BUILD_ROOT}%{_bindir}/dpns-shutdown \
-   ${RPM_BUILD_ROOT}%{_libdir}/dpm-mysql/dpns-shutdown
+touch ${RPM_BUILD_ROOT}%{_datadir}/lcgdm/NSCONFIG.templ
 touch ${RPM_BUILD_ROOT}%{_sbindir}/dpns-shutdown
 chmod 755 ${RPM_BUILD_ROOT}%{_sbindir}/dpns-shutdown
-sed -e 's/\(\.TH [^ ]* \)1/\18/' \
-    ${RPM_BUILD_ROOT}%{_mandir}/man1/dpns-shutdown.1 | gzip -9 -n -c > \
-    ${RPM_BUILD_ROOT}%{_libdir}/dpm-mysql/dpns-shutdown.8.gz
-rm ${RPM_BUILD_ROOT}%{_mandir}/man1/dpns-shutdown.1
 touch ${RPM_BUILD_ROOT}%{_mandir}/man8/dpns-shutdown.8
 
 # dpmcopyd unit file / startup script
 %if %systemd
-rm ${RPM_BUILD_ROOT}%{_datadir}/dpm/rc.dpmcopyd
-rm ${RPM_BUILD_ROOT}%{_sysconfdir}/dpmcopyd.conf.templ
 install -m 644 -p ../../lcgdm-unitfiles/mysql/dpmcopyd.service \
     ${RPM_BUILD_ROOT}%{_datadir}/dpm-mysql
 touch ${RPM_BUILD_ROOT}%{_unitdir}/dpmcopyd.service
 %else
-sed -e 's/LD_LIBRARY_PATH=$LD_LIBRARY_PATH //' \
-    -e '/LD_LIBRARY_PATH/d' \
-    -e 's!\$PREFIX/bin!\$PREFIX/sbin!' \
-    -e 's!\$PREFIX/etc!/etc!' \
-    ${RPM_BUILD_ROOT}%{_datadir}/dpm/rc.dpmcopyd > \
-    ${RPM_BUILD_ROOT}%{_sysconfdir}/dpm-mysql/dpmcopyd.init
-chmod 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/dpm-mysql/dpmcopyd.init
-rm ${RPM_BUILD_ROOT}%{_datadir}/dpm/rc.dpmcopyd
 touch ${RPM_BUILD_ROOT}%{_initrddir}/dpmcopyd
 chmod 755 ${RPM_BUILD_ROOT}%{_initrddir}/dpmcopyd
-sed -e 's/\(^DPNS_HOST=\).*/\1`hostname -f`/' \
-    -e 's/\(^DPM_HOST=\).*/\1`hostname -f`/' \
-    ${RPM_BUILD_ROOT}%{_sysconfdir}/dpmcopyd.conf.templ > \
-    ${RPM_BUILD_ROOT}%{_sysconfdir}/dpm-mysql/dpmcopyd.conf
-rm ${RPM_BUILD_ROOT}%{_sysconfdir}/dpmcopyd.conf.templ
 touch ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/dpmcopyd
 %endif
 
-# dpmcopyd log directory and log rotation configuration
-mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/dpmcopy
-install -m 644 -p dpmcopy/dpmcopyd.logrotate \
-    ${RPM_BUILD_ROOT}%{_sysconfdir}/dpm-mysql/dpmcopyd.logrotate
 touch ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/dpmcopyd
-
-# dpmcopyd binary and log file
-mv ${RPM_BUILD_ROOT}%{_bindir}/dpmcopyd \
-   ${RPM_BUILD_ROOT}%{_libdir}/dpm-mysql/dpmcopyd
 touch ${RPM_BUILD_ROOT}%{_sbindir}/dpmcopyd
 chmod 755 ${RPM_BUILD_ROOT}%{_sbindir}/dpmcopyd
-sed -e 's/\(\.TH [^ ]*\) 1/\1 8/' \
-    ${RPM_BUILD_ROOT}%{_mandir}/man1/dpmcopyd.1 | gzip -9 -n -c > \
-    ${RPM_BUILD_ROOT}%{_libdir}/dpm-mysql/dpmcopyd.8.gz
-rm ${RPM_BUILD_ROOT}%{_mandir}/man1/dpmcopyd.1
 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}%{_datadir}/dpm/rc.${svc}
-    rm ${RPM_BUILD_ROOT}%{_sysconfdir}/${svc}.conf.templ
-    install -m 644 -p ../../lcgdm-unitfiles/mysql/dpm-${svc}.service \
+    install -m 644 -p ../../lcgdm-unitfiles/mysql/${svc}.service \
 	${RPM_BUILD_ROOT}%{_datadir}/dpm-mysql
-    touch ${RPM_BUILD_ROOT}%{_unitdir}/dpm-${svc}.service
+    touch ${RPM_BUILD_ROOT}%{_unitdir}/${svc}.service
 %else
-    sed -e 's/LD_LIBRARY_PATH=$LD_LIBRARY_PATH //' \
-	-e '/LD_LIBRARY_PATH/d' \
-	-e 's!\$PREFIX/bin!\$PREFIX/sbin!' \
-	-e 's!\$PREFIX/etc!/etc!' \
-	-e "s/${svc}/dpm-${svc}/g" \
-	${RPM_BUILD_ROOT}%{_datadir}/dpm/rc.${svc} > \
-	${RPM_BUILD_ROOT}%{_sysconfdir}/dpm-mysql/dpm-${svc}.init
-    chmod 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/dpm-mysql/dpm-${svc}.init
-    rm ${RPM_BUILD_ROOT}%{_datadir}/dpm/rc.${svc}
-    touch ${RPM_BUILD_ROOT}%{_initrddir}/dpm-${svc}
-    chmod 755 ${RPM_BUILD_ROOT}%{_initrddir}/dpm-${svc}
-    sed -e "s/${svc}/dpm-${svc}/g" \
-	-e 's/\(^DPNS_HOST=\).*/\1`hostname -f`/' \
-	-e 's/\(^DPM_HOST=\).*/\1`hostname -f`/' \
-	-e 's/\(^RUN_SRMV2DAEMON=\).*/\1"yes"/' \
-	${RPM_BUILD_ROOT}%{_sysconfdir}/${svc}.conf.templ > \
-	${RPM_BUILD_ROOT}%{_sysconfdir}/dpm-mysql/dpm-${svc}.conf
-    rm ${RPM_BUILD_ROOT}%{_sysconfdir}/${svc}.conf.templ
-    touch ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/dpm-${svc}
-%endif
-
-    # log directory and log rotation configuration
-    mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/dpm-${svc}
-    sed -e "s/${svc}/dpm-${svc}/g" ${svc}/${svc}.logrotate > \
-	${RPM_BUILD_ROOT}%{_sysconfdir}/dpm-mysql/dpm-${svc}.logrotate
-    touch ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/dpm-${svc}
-
-    # binary and man page
-    mv ${RPM_BUILD_ROOT}%{_bindir}/${svc} \
-       ${RPM_BUILD_ROOT}%{_libdir}/dpm-mysql/dpm-${svc}
-    touch ${RPM_BUILD_ROOT}%{_sbindir}/dpm-${svc}
-    chmod 755 ${RPM_BUILD_ROOT}%{_sbindir}/dpm-${svc}
-    sed -e 's/\.TH \([^ ]*\) 1/.TH DPM-\1 8/' \
-	-e "s/${svc}/dpm-${svc}/g" \
-	-e 's/dpm(1)/dpm(8)/g' \
-	${RPM_BUILD_ROOT}%{_mandir}/man1/${svc}.1 | gzip -9 -n -c > \
-	${RPM_BUILD_ROOT}%{_libdir}/dpm-mysql/dpm-${svc}.8.gz
-    rm ${RPM_BUILD_ROOT}%{_mandir}/man1/${svc}.1
-    touch ${RPM_BUILD_ROOT}%{_mandir}/man8/dpm-${svc}.8
+  touch ${RPM_BUILD_ROOT}%{_initrddir}/${svc}
+  chmod 755 ${RPM_BUILD_ROOT}%{_initrddir}/${svc}
+  touch ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/${svc}
+%endif
+
+touch ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/${svc}
+touch ${RPM_BUILD_ROOT}%{_sbindir}/${svc}
+chmod 755 ${RPM_BUILD_ROOT}%{_sbindir}/${svc}
+touch ${RPM_BUILD_ROOT}%{_mandir}/man8/${svc}.8
 done
 
 # dpm-rfiod unit file / startup script
 %if %systemd
-rm ${RPM_BUILD_ROOT}%{_datadir}/dpm/rc.rfiod
-rm ${RPM_BUILD_ROOT}%{_sysconfdir}/rfiod.conf.templ
-install -m 644 -p ../../lcgdm-unitfiles/dpm-rfiod.service \
+install -m 644 -p ../../lcgdm-unitfiles/rfiod.service \
     ${RPM_BUILD_ROOT}%{_unitdir}
-%else
-sed -e 's/LD_LIBRARY_PATH=$LD_LIBRARY_PATH //' \
-    -e '/LD_LIBRARY_PATH/d' \
-    -e 's!\$PREFIX/bin!\$PREFIX/sbin!' \
-    -e 's!\$PREFIX/etc!/etc!' \
-    -e 's/rfiod/dpm-rfiod/g' \
-    -e 's!/var/log/rfio!/var/log/dpm-rfio!g' \
-    ${RPM_BUILD_ROOT}%{_datadir}/dpm/rc.rfiod > \
-    ${RPM_BUILD_ROOT}%{_initrddir}/dpm-rfiod
-chmod 755 ${RPM_BUILD_ROOT}%{_initrddir}/dpm-rfiod
-rm ${RPM_BUILD_ROOT}%{_datadir}/dpm/rc.rfiod
-sed -e 's/rfiod/dpm-rfiod/g' \
-    -e 's!/var/log/rfio!/var/log/dpm-rfio!g' \
-    -e 's/\(^DPNS_HOST=\).*/\1`hostname -f`/' \
-    -e 's/\(^DPM_HOST=\).*/\1`hostname -f`/' \
-    ${RPM_BUILD_ROOT}%{_sysconfdir}/rfiod.conf.templ > \
-    ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/dpm-rfiod
-rm ${RPM_BUILD_ROOT}%{_sysconfdir}/rfiod.conf.templ
-%endif
-
-# dpm-rfiod log directory and log rotation configuration
-mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/dpm-rfio
-sed -e 's!/var/log/rfio!/var/log/dpm-rfio!g' rfio/rfiod.logrotate > \
-    ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/dpm-rfiod
-
-# dpm-rfiod binary and man page
-mv ${RPM_BUILD_ROOT}%{_bindir}/rfiod \
-   ${RPM_BUILD_ROOT}%{_sbindir}/dpm-rfiod
-sed -e 's/\.TH \([^ ]* \)1/.TH DPM-\18/' \
-    -e 's/rfiod/dpm-rfiod/g' \
-    -e 's!/usr/local/bin!/usr/sbin!g' \
-    ${RPM_BUILD_ROOT}%{_mandir}/man1/rfiod.1 > \
-    ${RPM_BUILD_ROOT}%{_mandir}/man8/dpm-rfiod.8
-rm ${RPM_BUILD_ROOT}%{_mandir}/man1/rfiod.1
-
-# Create dpm user home and certificate directories
-mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/lib/dpm
-mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/grid-security/dpmmgr
-
-# Remove static library
-rm ${RPM_BUILD_ROOT}%{_libdir}/libdpm.a
-
-%if %systemd == 0
-# Turn off services by default
-sed -e 's/\(chkconfig: \)\w*/\1-/' \
-    -e '/Default-Start/d' \
-    -e 's/\(Default-Stop: *\).*/\10 1 2 3 4 5 6/' \
-    -i ${RPM_BUILD_ROOT}%{_sysconfdir}/dpm-mysql/*.init \
-       ${RPM_BUILD_ROOT}%{_initrddir}/dpm-rfiod
 %endif
 
-popd
-
-pushd dpm-postgres/%{name}-%{version}
-
-make SOAPFLG="`pkg-config --cflags gsoap`" \
-     SYSCONFDIR=${RPM_BUILD_ROOT}%{_sysconfdir} \
-     LDFLAGS="%{?__global_ldflags}" \
-     prefix=${RPM_BUILD_ROOT}%{_prefix} install install.man
+# remove static library
+rm ${RPM_BUILD_ROOT}%{_libdir}/libdpm.a
+rm ${RPM_BUILD_ROOT}%{_libdir}/liblcgdm.a
 
-mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/dpm
-mv ${RPM_BUILD_ROOT}%{_datadir}/DPM/* ${RPM_BUILD_ROOT}%{_datadir}/dpm
-rmdir ${RPM_BUILD_ROOT}%{_datadir}/DPM
+popd
 
-mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/dpm-postgres
-mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/dpm-postgres
-mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/dpm-postgres
+# remove the log man page (already exists in the system and not needed anyway)
+rm ${RPM_BUILD_ROOT}%{_mandir}/man3/log.3*
 
-# dpm unit file / startup script
-%if %systemd
-rm ${RPM_BUILD_ROOT}%{_datadir}/dpm/rc.dpm
-rm ${RPM_BUILD_ROOT}%{_sysconfdir}/dpm.conf.templ
-install -m 644 -p ../../lcgdm-unitfiles/postgres/dpm.service \
-    ${RPM_BUILD_ROOT}%{_datadir}/dpm-postgres
-touch ${RPM_BUILD_ROOT}%{_unitdir}/dpm.service
-%else
-sed -e 's/LD_LIBRARY_PATH=$LD_LIBRARY_PATH //' \
-    -e '/LD_LIBRARY_PATH/d' \
-    -e 's!\$PREFIX/bin!\$PREFIX/sbin!' \
-    -e 's!\$PREFIX/etc!/etc!' \
-    ${RPM_BUILD_ROOT}%{_datadir}/dpm/rc.dpm > \
-    ${RPM_BUILD_ROOT}%{_sysconfdir}/dpm-postgres/dpm.init
-chmod 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/dpm-postgres/dpm.init
-rm ${RPM_BUILD_ROOT}%{_datadir}/dpm/rc.dpm
-touch ${RPM_BUILD_ROOT}%{_initrddir}/dpm
-chmod 755 ${RPM_BUILD_ROOT}%{_initrddir}/dpm
-sed -e 's/\(^DPNS_HOST=\).*/\1`hostname -f`/' \
-    ${RPM_BUILD_ROOT}%{_sysconfdir}/dpm.conf.templ > \
-    ${RPM_BUILD_ROOT}%{_sysconfdir}/dpm-postgres/dpm.conf
-rm ${RPM_BUILD_ROOT}%{_sysconfdir}/dpm.conf.templ
-touch ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/dpm
+%if %{?altpython:1}%{!?altpython:0}
+mkdir -p ${RPM_BUILD_ROOT}%{altpython_sitearch}
+install -m 644 lfc-mysql/%{name}-%{version}/ns/*.py \
+	       dpm-mysql/%{name}-%{version}/dpm/*.py \
+	       ${RPM_BUILD_ROOT}%{altpython_sitearch}
+install %{altpython}/*.so ${RPM_BUILD_ROOT}%{altpython_sitearch}
 %endif
 
-# dpm log directory and log rotation configuration
-mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/dpm
-install -m 644 -p dpm/dpm.logrotate \
-    ${RPM_BUILD_ROOT}%{_sysconfdir}/dpm-postgres/dpm.logrotate
-touch ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/dpm
+%if %{?fedora}%{!?fedora:0} < 5 && %{?rhel}%{!?rhel:0} < 6
+%{__python}    -c 'import compileall; compileall.compile_dir("'"$RPM_BUILD_ROOT"'", 10, "%{python_sitearch}", 1)' > /dev/null
+%{__python} -O -c 'import compileall; compileall.compile_dir("'"$RPM_BUILD_ROOT"'", 10, "%{python_sitearch}", 1)' > /dev/null
+%if %{?altpython:1}%{!?altpython:0}
+%{__altpython}	  -c 'import compileall; compileall.compile_dir("'"$RPM_BUILD_ROOT%{altpython_sitearch}"'", 10, "%{altpython_sitearch}", 1)' > /dev/null
+%{__altpython} -O -c 'import compileall; compileall.compile_dir("'"$RPM_BUILD_ROOT%{altpython_sitearch}"'", 10, "%{altpython_sitearch}", 1)' > /dev/null
+%endif
+%endif
 
-# dpm binary and man page
-mv ${RPM_BUILD_ROOT}%{_bindir}/dpm \
-   ${RPM_BUILD_ROOT}%{_libdir}/dpm-postgres/dpm
-touch ${RPM_BUILD_ROOT}%{_sbindir}/dpm
-chmod 755 ${RPM_BUILD_ROOT}%{_sbindir}/dpm
-sed -e 's/\(\.TH [^ ]* \)1/\18/' \
-    -e 's/dpm-shutdown(1)/dpm-shutdown(8)/g' \
-    ${RPM_BUILD_ROOT}%{_mandir}/man1/dpm.1 | gzip -9 -n -c > \
-    ${RPM_BUILD_ROOT}%{_libdir}/dpm-postgres/dpm.8.gz
-rm ${RPM_BUILD_ROOT}%{_mandir}/man1/dpm.1
-touch ${RPM_BUILD_ROOT}%{_mandir}/man8/dpm.8
+# Add the LFC info provider script
+mkdir ${RPM_BUILD_ROOT}%{_libexecdir}
+install -m 755 lfc-mysql/%{name}-%{version}/scripts/lcg-info-provider-lfc ${RPM_BUILD_ROOT}%{_libexecdir}
 
-mv ${RPM_BUILD_ROOT}%{_sysconfdir}/DPMCONFIG.templ \
-   ${RPM_BUILD_ROOT}%{_datadir}/dpm-postgres/DPMCONFIG.templ
-touch ${RPM_BUILD_ROOT}%{_datadir}/dpm/DPMCONFIG.templ
+%clean
+rm -rf ${RPM_BUILD_ROOT}
 
-# dpm-shutdown binary and man page
-mv ${RPM_BUILD_ROOT}%{_bindir}/dpm-shutdown \
-   ${RPM_BUILD_ROOT}%{_libdir}/dpm-postgres/dpm-shutdown
-touch ${RPM_BUILD_ROOT}%{_sbindir}/dpm-shutdown
-chmod 755 ${RPM_BUILD_ROOT}%{_sbindir}/dpm-shutdown
-sed -e 's/\(\.TH [^ ]* \)1/\18/' \
-    ${RPM_BUILD_ROOT}%{_mandir}/man1/dpm-shutdown.1 | gzip -9 -n -c > \
-    ${RPM_BUILD_ROOT}%{_libdir}/dpm-postgres/dpm-shutdown.8.gz
-rm ${RPM_BUILD_ROOT}%{_mandir}/man1/dpm-shutdown.1
-touch ${RPM_BUILD_ROOT}%{_mandir}/man8/dpm-shutdown.8
+%post libs -p /sbin/ldconfig
 
-# dpm-buildfsv binary and man page
-mv ${RPM_BUILD_ROOT}%{_bindir}/dpm-buildfsv \
-   ${RPM_BUILD_ROOT}%{_libdir}/dpm-postgres/dpm-buildfsv
-touch ${RPM_BUILD_ROOT}%{_sbindir}/dpm-buildfsv
-chmod 755 ${RPM_BUILD_ROOT}%{_sbindir}/dpm-buildfsv
-sed -e 's/\(\.TH [^ ]* \)1/\18/' \
-    ${RPM_BUILD_ROOT}%{_mandir}/man1/dpm-buildfsv.1 | gzip -9 -n -c > \
-    ${RPM_BUILD_ROOT}%{_libdir}/dpm-postgres/dpm-buildfsv.8.gz
-rm ${RPM_BUILD_ROOT}%{_mandir}/man1/dpm-buildfsv.1
-touch ${RPM_BUILD_ROOT}%{_mandir}/man8/dpm-buildfsv.8
+%postun libs -p /sbin/ldconfig
 
-# dpnsdaemon unit file / startup script
-%if %systemd
-rm ${RPM_BUILD_ROOT}%{_datadir}/dpm/rc.dpnsdaemon
-rm ${RPM_BUILD_ROOT}%{_sysconfdir}/dpnsdaemon.conf.templ
-install -m 644 -p ../../lcgdm-unitfiles/postgres/dpnsdaemon.service \
-    ${RPM_BUILD_ROOT}%{_datadir}/dpm-postgres
-touch ${RPM_BUILD_ROOT}%{_unitdir}/dpnsdaemon.service
-%else
-sed -e 's/LD_LIBRARY_PATH=$LD_LIBRARY_PATH //' \
-    -e '/LD_LIBRARY_PATH/d' \
-    -e 's!\$PREFIX/bin!\$PREFIX/sbin!' \
-    -e 's!\$PREFIX/etc!/etc!' \
-    -e 's!/etc/NSCONFIG!/etc/DPNSCONFIG!g' \
-    ${RPM_BUILD_ROOT}%{_datadir}/dpm/rc.dpnsdaemon > \
-    ${RPM_BUILD_ROOT}%{_sysconfdir}/dpm-postgres/dpnsdaemon.init
-chmod 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/dpm-postgres/dpnsdaemon.init
-rm ${RPM_BUILD_ROOT}%{_datadir}/dpm/rc.dpnsdaemon
-touch ${RPM_BUILD_ROOT}%{_initrddir}/dpnsdaemon
-chmod 755 ${RPM_BUILD_ROOT}%{_initrddir}/dpnsdaemon
-sed -e 's!/etc/NSCONFIG!/etc/DPNSCONFIG!g' \
-    -e 's!/opt/lcg!!' -e 's!export SEMSGCONFIGFILE!#&!' \
-    ${RPM_BUILD_ROOT}%{_sysconfdir}/dpnsdaemon.conf.templ > \
-    ${RPM_BUILD_ROOT}%{_sysconfdir}/dpm-postgres/dpnsdaemon.conf
-rm ${RPM_BUILD_ROOT}%{_sysconfdir}/dpnsdaemon.conf.templ
-touch ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/dpnsdaemon
-%endif
+%post -n lfc-libs -p /sbin/ldconfig
 
-# dpnsdaemon log directory and log rotation configuration
-mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/dpns
-install -m 644 -p ns/dpnsdaemon.logrotate \
-    ${RPM_BUILD_ROOT}%{_sysconfdir}/dpm-postgres/dpnsdaemon.logrotate
-touch ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/dpnsdaemon
+%postun -n lfc-libs -p /sbin/ldconfig
 
-# dpnsdaemon binary and man page
-mv ${RPM_BUILD_ROOT}%{_bindir}/dpnsdaemon \
-   ${RPM_BUILD_ROOT}%{_libdir}/dpm-postgres/dpnsdaemon
-touch ${RPM_BUILD_ROOT}%{_sbindir}/dpnsdaemon
-chmod 755 ${RPM_BUILD_ROOT}%{_sbindir}/dpnsdaemon
-sed -e 's/\(\.TH [^ ]* \)1/\18/' \
-    -e 's!/opt/lcg!!g' \
-    -e 's!/etc/NSCONFIG!/etc/DPNSCONFIG!g' \
-    -e 's/dpns-shutdown(1)/dpns-shutdown(8)/g' \
-    ${RPM_BUILD_ROOT}%{_mandir}/man1/dpnsdaemon.1 | gzip -9 -n -c > \
-    ${RPM_BUILD_ROOT}%{_libdir}/dpm-postgres/dpnsdaemon.8.gz
-rm ${RPM_BUILD_ROOT}%{_mandir}/man1/dpnsdaemon.1
-touch ${RPM_BUILD_ROOT}%{_mandir}/man8/dpnsdaemon.8
+%post -n dpm-libs -p /sbin/ldconfig
 
-mv ${RPM_BUILD_ROOT}%{_sysconfdir}/NSCONFIG.templ \
-   ${RPM_BUILD_ROOT}%{_datadir}/dpm-postgres/DPNSCONFIG.templ
-touch ${RPM_BUILD_ROOT}%{_datadir}/dpm/DPNSCONFIG.templ
-
-# dpns-shutdown binary and man page
-mv ${RPM_BUILD_ROOT}%{_bindir}/dpns-shutdown \
-   ${RPM_BUILD_ROOT}%{_libdir}/dpm-postgres/dpns-shutdown
-touch ${RPM_BUILD_ROOT}%{_sbindir}/dpns-shutdown
-chmod 755 ${RPM_BUILD_ROOT}%{_sbindir}/dpns-shutdown
-sed -e 's/\(\.TH [^ ]* \)1/\18/' \
-    ${RPM_BUILD_ROOT}%{_mandir}/man1/dpns-shutdown.1 | gzip -9 -n -c > \
-    ${RPM_BUILD_ROOT}%{_libdir}/dpm-postgres/dpns-shutdown.8.gz
-rm ${RPM_BUILD_ROOT}%{_mandir}/man1/dpns-shutdown.1
-touch ${RPM_BUILD_ROOT}%{_mandir}/man8/dpns-shutdown.8
-
-# dpmcopyd unit file / startup script
-%if %systemd
-rm ${RPM_BUILD_ROOT}%{_datadir}/dpm/rc.dpmcopyd
-rm ${RPM_BUILD_ROOT}%{_sysconfdir}/dpmcopyd.conf.templ
-install -m 644 -p ../../lcgdm-unitfiles/postgres/dpmcopyd.service \
-    ${RPM_BUILD_ROOT}%{_datadir}/dpm-postgres
-touch ${RPM_BUILD_ROOT}%{_unitdir}/dpmcopyd.service
-%else
-sed -e 's/LD_LIBRARY_PATH=$LD_LIBRARY_PATH //' \
-    -e '/LD_LIBRARY_PATH/d' \
-    -e 's!\$PREFIX/bin!\$PREFIX/sbin!' \
-    -e 's!\$PREFIX/etc!/etc!' \
-    ${RPM_BUILD_ROOT}%{_datadir}/dpm/rc.dpmcopyd > \
-    ${RPM_BUILD_ROOT}%{_sysconfdir}/dpm-postgres/dpmcopyd.init
-chmod 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/dpm-postgres/dpmcopyd.init
-rm ${RPM_BUILD_ROOT}%{_datadir}/dpm/rc.dpmcopyd
-touch ${RPM_BUILD_ROOT}%{_initrddir}/dpmcopyd
-chmod 755 ${RPM_BUILD_ROOT}%{_initrddir}/dpmcopyd
-sed -e 's/\(^DPNS_HOST=\).*/\1`hostname -f`/' \
-    -e 's/\(^DPM_HOST=\).*/\1`hostname -f`/' \
-    ${RPM_BUILD_ROOT}%{_sysconfdir}/dpmcopyd.conf.templ > \
-    ${RPM_BUILD_ROOT}%{_sysconfdir}/dpm-postgres/dpmcopyd.conf
-rm ${RPM_BUILD_ROOT}%{_sysconfdir}/dpmcopyd.conf.templ
-touch ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/dpmcopyd
-%endif
-
-# dpmcopyd log directory and log rotation configuration
-mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/dpmcopy
-install -m 644 -p dpmcopy/dpmcopyd.logrotate \
-    ${RPM_BUILD_ROOT}%{_sysconfdir}/dpm-postgres/dpmcopyd.logrotate
-touch ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/dpmcopyd
-
-# dpmcopyd binary and log file
-mv ${RPM_BUILD_ROOT}%{_bindir}/dpmcopyd \
-   ${RPM_BUILD_ROOT}%{_libdir}/dpm-postgres/dpmcopyd
-touch ${RPM_BUILD_ROOT}%{_sbindir}/dpmcopyd
-chmod 755 ${RPM_BUILD_ROOT}%{_sbindir}/dpmcopyd
-sed -e 's/\(\.TH [^ ]*\) 1/\1 8/' \
-    ${RPM_BUILD_ROOT}%{_mandir}/man1/dpmcopyd.1 | gzip -9 -n -c > \
-    ${RPM_BUILD_ROOT}%{_libdir}/dpm-postgres/dpmcopyd.8.gz
-rm ${RPM_BUILD_ROOT}%{_mandir}/man1/dpmcopyd.1
-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}%{_datadir}/dpm/rc.${svc}
-    rm ${RPM_BUILD_ROOT}%{_sysconfdir}/${svc}.conf.templ
-    install -m 644 -p ../../lcgdm-unitfiles/postgres/dpm-${svc}.service \
-	${RPM_BUILD_ROOT}%{_datadir}/dpm-postgres
-    touch ${RPM_BUILD_ROOT}%{_unitdir}/dpm-${svc}.service
-%else
-    sed -e 's/LD_LIBRARY_PATH=$LD_LIBRARY_PATH //' \
-	-e '/LD_LIBRARY_PATH/d' \
-	-e 's!\$PREFIX/bin!\$PREFIX/sbin!' \
-	-e 's!\$PREFIX/etc!/etc!' \
-	-e "s/${svc}/dpm-${svc}/g" \
-	${RPM_BUILD_ROOT}%{_datadir}/dpm/rc.${svc} > \
-	${RPM_BUILD_ROOT}%{_sysconfdir}/dpm-postgres/dpm-${svc}.init
-    chmod 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/dpm-postgres/dpm-${svc}.init
-    rm ${RPM_BUILD_ROOT}%{_datadir}/dpm/rc.${svc}
-    touch ${RPM_BUILD_ROOT}%{_initrddir}/dpm-${svc}
-    chmod 755 ${RPM_BUILD_ROOT}%{_initrddir}/dpm-${svc}
-    sed -e "s/${svc}/dpm-${svc}/g" \
-	-e 's/\(^DPNS_HOST=\).*/\1`hostname -f`/' \
-	-e 's/\(^DPM_HOST=\).*/\1`hostname -f`/' \
-	-e 's/\(^RUN_SRMV2DAEMON=\).*/\1"yes"/' \
-	${RPM_BUILD_ROOT}%{_sysconfdir}/${svc}.conf.templ > \
-	${RPM_BUILD_ROOT}%{_sysconfdir}/dpm-postgres/dpm-${svc}.conf
-    rm ${RPM_BUILD_ROOT}%{_sysconfdir}/${svc}.conf.templ
-    touch ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/dpm-${svc}
-%endif
-
-    # log directory and log rotation configuration
-    mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/dpm-${svc}
-    sed -e "s/${svc}/dpm-${svc}/g" ${svc}/${svc}.logrotate > \
-	${RPM_BUILD_ROOT}%{_sysconfdir}/dpm-postgres/dpm-${svc}.logrotate
-    touch ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/dpm-${svc}
-
-    # binary and man page
-    mv ${RPM_BUILD_ROOT}%{_bindir}/${svc} \
-       ${RPM_BUILD_ROOT}%{_libdir}/dpm-postgres/dpm-${svc}
-    touch ${RPM_BUILD_ROOT}%{_sbindir}/dpm-${svc}
-    chmod 755 ${RPM_BUILD_ROOT}%{_sbindir}/dpm-${svc}
-    sed -e 's/\.TH \([^ ]*\) 1/.TH DPM-\1 8/' \
-	-e "s/${svc}/dpm-${svc}/g" \
-	-e 's/dpm(1)/dpm(8)/g' \
-	${RPM_BUILD_ROOT}%{_mandir}/man1/${svc}.1 | gzip -9 -n -c > \
-	${RPM_BUILD_ROOT}%{_libdir}/dpm-postgres/dpm-${svc}.8.gz
-    rm ${RPM_BUILD_ROOT}%{_mandir}/man1/${svc}.1
-    touch ${RPM_BUILD_ROOT}%{_mandir}/man8/dpm-${svc}.8
-done
-
-# Create dpm user home and certificate directories
-mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/lib/dpm
-mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/grid-security/dpmmgr
-
-# This doesn't quite work...
-sed '/CREATE DATABASE/d' -i \
-    ${RPM_BUILD_ROOT}%{_datadir}/dpm/create_dpm_tables_postgres.sql \
-    ${RPM_BUILD_ROOT}%{_datadir}/dpm/create_dpns_tables_postgres.sql
-
-%if %systemd == 0
-# Turn off services by default
-sed -e 's/\(chkconfig: \)\w*/\1-/' \
-    -e '/Default-Start/d' \
-    -e 's/\(Default-Stop: *\).*/\10 1 2 3 4 5 6/' \
-    -i ${RPM_BUILD_ROOT}%{_sysconfdir}/dpm-postgres/*.init
-%endif
-
-popd
-
-%if %{?altpython:1}%{!?altpython:0}
-mkdir -p ${RPM_BUILD_ROOT}%{altpython_sitearch}
-install -m 644 lfc-mysql/%{name}-%{version}/ns/*.py \
-	       dpm-mysql/%{name}-%{version}/dpm/*.py \
-	       ${RPM_BUILD_ROOT}%{altpython_sitearch}
-install %{altpython}/*.so ${RPM_BUILD_ROOT}%{altpython_sitearch}
-%endif
-
-%if %{?fedora}%{!?fedora:0} < 5 && %{?rhel}%{!?rhel:0} < 6
-%{__python}    -c 'import compileall; compileall.compile_dir("'"$RPM_BUILD_ROOT"'", 10, "%{python_sitearch}", 1)' > /dev/null
-%{__python} -O -c 'import compileall; compileall.compile_dir("'"$RPM_BUILD_ROOT"'", 10, "%{python_sitearch}", 1)' > /dev/null
-%if %{?altpython:1}%{!?altpython:0}
-%{__altpython}	  -c 'import compileall; compileall.compile_dir("'"$RPM_BUILD_ROOT%{altpython_sitearch}"'", 10, "%{altpython_sitearch}", 1)' > /dev/null
-%{__altpython} -O -c 'import compileall; compileall.compile_dir("'"$RPM_BUILD_ROOT%{altpython_sitearch}"'", 10, "%{altpython_sitearch}", 1)' > /dev/null
-%endif
-%endif
-
-%clean
-rm -rf ${RPM_BUILD_ROOT}
-
-%post libs -p /sbin/ldconfig
-
-%postun libs -p /sbin/ldconfig
-
-%post -n lfc-libs -p /sbin/ldconfig
-
-%postun -n lfc-libs -p /sbin/ldconfig
-
-%post -n dpm-libs -p /sbin/ldconfig
-
-%postun -n dpm-libs -p /sbin/ldconfig
+%postun -n dpm-libs -p /sbin/ldconfig
 
 %pre -n lfc-server-mysql
 getent group lfcmgr > /dev/null || groupadd -r lfcmgr
@@ -1651,73 +757,16 @@ getent passwd lfcmgr > /dev/null || useradd -r -g lfcmgr \
     -d %{_localstatedir}/lib/lfc -s /bin/bash -c "LFC Manager" lfcmgr
 exit 0
 
-%pre -n lfc-server-postgres
-getent group lfcmgr > /dev/null || groupadd -r lfcmgr
-getent passwd lfcmgr > /dev/null || useradd -r -g lfcmgr \
-    -d %{_localstatedir}/lib/lfc -s /bin/bash -c "LFC Manager" lfcmgr
-exit 0
-
 %post -n lfc-server-mysql
-updatelfc () {
-    [ -r /etc/sysconfig/lfcdaemon ] && . /etc/sysconfig/lfcdaemon
-    [ -z "$NSCONFIGFILE" ] && NSCONFIGFILE=/etc/NSCONFIG
-    [ -r $NSCONFIGFILE ] || return 0
-
-    nscfg=$(cat $NSCONFIGFILE)
-
-    cfg1=$(echo $nscfg | cut -f1 -d@)
-    cfg2=$(echo $nscfg | cut -f2 -d@ -s)
-
-    user=$(echo $cfg1 | cut -f1 -d/)
-    passwd=$(echo $cfg1 | cut -f2 -d/ -s)
-    host=$(echo $cfg2 | cut -f1 -d/)
-    db=$(echo $cfg2 | cut -f2 -d/ -s)
-
-    [ -z "$user" ] && return 0
-    [ -z "$passwd" ] && return 0
-    [ -z "$host" ] && return 0
-    [ -z "$db" ] && db=cns_db
-
-    mycfg=$(mktemp)
-    cat > $mycfg <<-EOF
-	[client]
-	user=$user
-	password=$passwd
-	EOF
-
-    mysql="mysql --defaults-file=$mycfg --skip-column-names $db"
-
-    vmajor=$($mysql -e "select major from schema_version" 2>/dev/null)
-    vminor=$($mysql -e "select minor from schema_version" 2>/dev/null)
-    vpatch=$($mysql -e "select patch from schema_version" 2>/dev/null)
-
-    if [ -z "$vmajor" -o -z "$vminor" -o -z "$vpatch" ] ; then
-	rm $mycfg
-	return 0
-    fi
-
-    if [ $vmajor -eq 3 -a $vminor -eq 0 -a $vpatch -eq 0 ] ; then
-	$mysql <<-EOF
-	ALTER TABLE Cns_groupinfo ADD banned INTEGER;
-	ALTER TABLE Cns_userinfo ADD user_ca VARCHAR(255) BINARY;
-	ALTER TABLE Cns_userinfo ADD banned INTEGER;
-	CREATE INDEX linkname_idx ON Cns_symlinks(linkname(255));
-	UPDATE schema_version SET major = 3, minor = 1, patch = 0;
-	EOF
-    fi
-
-    rm $mycfg
-    return 0
-}
-
-updatelfc
-
+if [ -e /etc/init.d/lfcdaemon -a ! -h /etc/init.d/lfcdaemon ]; then
+	rm /etc/init.d/lfcdaemon
+fi
 %{_sbindir}/update-alternatives --install %{_sbindir}/lfcdaemon lfcdaemon \
 	  %{_libdir}/lfc-mysql/lfcdaemon 20 \
   --slave %{_mandir}/man8/lfcdaemon.8.gz lfcdaemon.8.gz \
 	  %{_libdir}/lfc-mysql/lfcdaemon.8.gz \
-  --slave %{_datadir}/lfc/NSCONFIG.templ NSCONFIG.templ \
-	  %{_datadir}/lfc-mysql/NSCONFIG.templ \
+  --slave %{_datadir}/lcgdm/NSCONFIG.templ NSCONFIG.templ \
+	  %{_libdir}/lfc-mysql/NSCONFIG.templ \
 %if %systemd
   --slave %{_unitdir}/lfcdaemon.service lfcdaemon.service \
 	  %{_datadir}/lfc-mysql/lfcdaemon.service \
@@ -1742,91 +791,6 @@ if [ $1 -eq 1 ]; then
 %endif
 fi
 
-%post -n lfc-server-postgres
-updatelfc () {
-    [ -r /etc/sysconfig/lfcdaemon ] && . /etc/sysconfig/lfcdaemon
-    [ -z "$NSCONFIGFILE" ] && NSCONFIGFILE=/etc/NSCONFIG
-    [ -r $NSCONFIGFILE ] || return 0
-
-    nscfg=$(cat $NSCONFIGFILE)
-
-    cfg1=$(echo $nscfg | cut -f1 -d@)
-    cfg2=$(echo $nscfg | cut -f2 -d@ -s)
-
-    user=$(echo $cfg1 | cut -f1 -d/)
-    passwd=$(echo $cfg1 | cut -f2 -d/ -s)
-    host=$(echo $cfg2 | cut -f1 -d/)
-    db=$(echo $cfg2 | cut -f2 -d/ -s)
-
-    [ -z "$user" ] && return 0
-    [ -z "$passwd" ] && return 0
-    [ -z "$host" ] && return 0
-    [ -z "$db" ] && db=cns_db
-
-    export PGPASSWORD=$passwd
-    psql="psql -t -q -U $user $db"
-
-    vmajor=$($psql -c "select major from schema_version" 2>/dev/null)
-    vminor=$($psql -c "select minor from schema_version" 2>/dev/null)
-    vpatch=$($psql -c "select patch from schema_version" 2>/dev/null)
-
-    if [ -z "$vmajor" -o -z "$vminor" -o -z "$vpatch" ] ; then
-	return 0
-    fi
-
-    if [ $vmajor -eq 3 -a $vminor -eq 0 -a $vpatch -eq 0 ] ; then
-	$psql <<-EOF
-	ALTER TABLE Cns_groupinfo ADD banned INTEGER;
-	ALTER TABLE Cns_userinfo ADD user_ca VARCHAR(255);
-	ALTER TABLE Cns_userinfo ADD banned INTEGER;
-	CREATE INDEX linkname_idx ON Cns_symlinks(linkname);
-	UPDATE schema_version SET major = 3, minor = 1, patch = 0;
-	EOF
-    fi
-
-    return 0
-}
-
-updatelfc
-
-%if %systemd
-# Clean up pre-systemd config
-if [ -r %{_initrddir}/lfcdaemon ] ; then
-    /sbin/service lfcdaemon stop > /dev/null 2>&1 || :
-    /sbin/chkconfig --del lfcdaemon > /dev/null 2>&1 || :
-fi
-%endif
-
-%{_sbindir}/update-alternatives --install %{_sbindir}/lfcdaemon lfcdaemon \
-	  %{_libdir}/lfc-postgres/lfcdaemon 10 \
-  --slave %{_mandir}/man8/lfcdaemon.8.gz lfcdaemon.8.gz \
-	  %{_libdir}/lfc-postgres/lfcdaemon.8.gz \
-  --slave %{_datadir}/lfc/NSCONFIG.templ NSCONFIG.templ \
-	  %{_datadir}/lfc-postgres/NSCONFIG.templ \
-%if %systemd
-  --slave %{_unitdir}/lfcdaemon.service lfcdaemon.service \
-	  %{_datadir}/lfc-postgres/lfcdaemon.service \
-%else
-  --slave %{_initrddir}/lfcdaemon lfcdaemon.init \
-	  %{_sysconfdir}/lfc-postgres/lfcdaemon.init \
-  --slave %{_sysconfdir}/sysconfig/lfcdaemon lfcdaemon.conf \
-	  %{_sysconfdir}/lfc-postgres/lfcdaemon.conf \
-%endif
-  --slave %{_sysconfdir}/logrotate.d/lfcdaemon lfcdaemon.logrotate \
-	  %{_sysconfdir}/lfc-postgres/lfcdaemon.logrotate \
-  --slave %{_sbindir}/lfc-shutdown lfc-shutdown \
-	  %{_libdir}/lfc-postgres/lfc-shutdown \
-  --slave %{_mandir}/man8/lfc-shutdown.8.gz lfc-shutdown.8.gz \
-	  %{_libdir}/lfc-postgres/lfc-shutdown.8.gz
-
-if [ $1 -eq 1 ]; then
-%if %systemd
-    /bin/systemctl daemon-reload > /dev/null 2>&1 || :
-%else
-    /sbin/chkconfig --add lfcdaemon
-%endif
-fi
-
 %preun -n lfc-server-mysql
 export LANG=C
 
@@ -1849,28 +813,6 @@ if [ $1 -eq 0 ]; then
 %endif
 fi
 
-%preun -n lfc-server-postgres
-export LANG=C
-
-if [ $1 -eq 0 ]; then
-    if ( %{_sbindir}/update-alternatives --display lfcdaemon | \
-	grep currently | grep -q lfc-postgres ) ; then
-%if %systemd
-	/bin/systemctl --no-reload disable lfcdaemon.service \
-	    > /dev/null 2>&1 || :
-	/bin/systemctl stop lfcdaemon.service > /dev/null 2>&1 || :
-%else
-	/sbin/service lfcdaemon stop > /dev/null 2>&1 || :
-%endif
-    fi
-    %{_sbindir}/update-alternatives --remove lfcdaemon \
-	%{_libdir}/lfc-postgres/lfcdaemon
-%if %systemd == 0
-    %{_sbindir}/update-alternatives --display lfcdaemon > /dev/null || \
-	/sbin/chkconfig --del lfcdaemon > /dev/null 2>&1 || :
-%endif
-fi
-
 %postun -n lfc-server-mysql
 export LANG=C
 
@@ -1885,74 +827,6 @@ if [ $1 -ge 1 ]; then
     fi
 fi
 
-%postun -n lfc-server-postgres
-export LANG=C
-
-if [ $1 -ge 1 ]; then
-    if ( %{_sbindir}/update-alternatives --display lfcdaemon | \
-	grep currently | grep -q lfc-postgres ) ; then
-%if %systemd
-	/bin/systemctl try-restart lfcdaemon.service > /dev/null 2>&1 || :
-%else
-	/sbin/service lfcdaemon condrestart > /dev/null 2>&1 || :
-%endif
-    fi
-fi
-
-%triggerpostun -n lfc-server-mysql -- lfc-mysql < 1.8.1.2-2
-# Restore alternatives removed by lfc-mysql preun
-%{_sbindir}/update-alternatives --install %{_sbindir}/lfcdaemon lfcdaemon \
-	  %{_libdir}/lfc-mysql/lfcdaemon 20 \
-  --slave %{_mandir}/man8/lfcdaemon.8.gz lfcdaemon.8.gz \
-	  %{_libdir}/lfc-mysql/lfcdaemon.8.gz \
-  --slave %{_datadir}/lfc/NSCONFIG.templ NSCONFIG.templ \
-	  %{_datadir}/lfc-mysql/NSCONFIG.templ \
-%if %systemd
-  --slave %{_unitdir}/lfcdaemon.service lfcdaemon.service \
-	  %{_datadir}/lfc-mysql/lfcdaemon.service \
-%else
-  --slave %{_initrddir}/lfcdaemon lfcdaemon.init \
-	  %{_sysconfdir}/lfc-mysql/lfcdaemon.init \
-  --slave %{_sysconfdir}/sysconfig/lfcdaemon lfcdaemon.conf \
-	  %{_sysconfdir}/lfc-mysql/lfcdaemon.conf \
-%endif
-  --slave %{_sysconfdir}/logrotate.d/lfcdaemon lfcdaemon.logrotate \
-	  %{_sysconfdir}/lfc-mysql/lfcdaemon.logrotate \
-  --slave %{_sbindir}/lfc-shutdown lfc-shutdown \
-	  %{_libdir}/lfc-mysql/lfc-shutdown \
-  --slave %{_mandir}/man8/lfc-shutdown.8.gz lfc-shutdown.8.gz \
-	  %{_libdir}/lfc-mysql/lfc-shutdown.8.gz
-
-%triggerpostun -n lfc-server-postgres -- lfc-postgres < 1.8.1.2-2
-# Restore alternatives removed by lfc-postgres preun
-%{_sbindir}/update-alternatives --install %{_sbindir}/lfcdaemon lfcdaemon \
-	  %{_libdir}/lfc-postgres/lfcdaemon 10 \
-  --slave %{_mandir}/man8/lfcdaemon.8.gz lfcdaemon.8.gz \
-	  %{_libdir}/lfc-postgres/lfcdaemon.8.gz \
-  --slave %{_datadir}/lfc/NSCONFIG.templ NSCONFIG.templ \
-	  %{_datadir}/lfc-postgres/NSCONFIG.templ \
-%if %systemd
-  --slave %{_unitdir}/lfcdaemon.service lfcdaemon.service \
-	  %{_datadir}/lfc-postgres/lfcdaemon.service \
-%else
-  --slave %{_initrddir}/lfcdaemon lfcdaemon.init \
-	  %{_sysconfdir}/lfc-postgres/lfcdaemon.init \
-  --slave %{_sysconfdir}/sysconfig/lfcdaemon lfcdaemon.conf \
-	  %{_sysconfdir}/lfc-postgres/lfcdaemon.conf \
-%endif
-  --slave %{_sysconfdir}/logrotate.d/lfcdaemon lfcdaemon.logrotate \
-	  %{_sysconfdir}/lfc-postgres/lfcdaemon.logrotate \
-  --slave %{_sbindir}/lfc-shutdown lfc-shutdown \
-	  %{_libdir}/lfc-postgres/lfc-shutdown \
-  --slave %{_mandir}/man8/lfc-shutdown.8.gz lfc-shutdown.8.gz \
-	  %{_libdir}/lfc-postgres/lfc-shutdown.8.gz
-
-%pre -n lfc-dli
-getent group lfcmgr > /dev/null || groupadd -r lfcmgr
-getent passwd lfcmgr > /dev/null || useradd -r -g lfcmgr \
-    -d %{_localstatedir}/lib/lfc -s /bin/bash -c "LFC Manager" lfcmgr
-exit 0
-
 %post -n lfc-dli
 %if %systemd
 # Clean up pre-systemd config
@@ -1990,71 +864,7 @@ if [ $1 -ge 1 ]; then
 %endif
 fi
 
-%pre -n dpm-server-mysql
-getent group dpmmgr > /dev/null || groupadd -r dpmmgr
-getent passwd dpmmgr > /dev/null || useradd -r -g dpmmgr \
-    -d %{_localstatedir}/lib/dpm -s /bin/bash -c "DPM Manager" dpmmgr
-exit 0
-
-%pre -n dpm-server-postgres
-getent group dpmmgr > /dev/null || groupadd -r dpmmgr
-getent passwd dpmmgr > /dev/null || useradd -r -g dpmmgr \
-    -d %{_localstatedir}/lib/dpm -s /bin/bash -c "DPM Manager" dpmmgr
-exit 0
-
 %post -n dpm-server-mysql
-updatedpm () {
-    [ -r /etc/sysconfig/dpm ] && . /etc/sysconfig/dpm
-    [ -z "$DPMCONFIGFILE" ] && DPMCONFIGFILE=/etc/DPMCONFIG
-    [ -r $DPMCONFIGFILE ] || return 0
-
-    dpmcfg=$(cat $DPMCONFIGFILE)
-
-    cfg1=$(echo $dpmcfg | cut -f1 -d@)
-    cfg2=$(echo $dpmcfg | cut -f2 -d@ -s)
-
-    user=$(echo $cfg1 | cut -f1 -d/)
-    passwd=$(echo $cfg1 | cut -f2 -d/ -s)
-    host=$(echo $cfg2 | cut -f1 -d/)
-    db=$(echo $cfg2 | cut -f2 -d/ -s)
-
-    [ -z "$user" ] && return 0
-    [ -z "$passwd" ] && return 0
-    [ -z "$host" ] && return 0
-    [ -z "$db" ] && db=dpm_db
-
-    mycfg=$(mktemp)
-    cat > $mycfg <<-EOF
-	[client]
-	user=$user
-	password=$passwd
-	EOF
-
-    mysql="mysql --defaults-file=$mycfg --skip-column-names $db"
-
-    vmajor=$($mysql -e "select major from schema_version_dpm" 2>/dev/null)
-    vminor=$($mysql -e "select minor from schema_version_dpm" 2>/dev/null)
-    vpatch=$($mysql -e "select patch from schema_version_dpm" 2>/dev/null)
-
-    if [ -z "$vmajor" -o -z "$vminor" -o -z "$vpatch" ] ; then
-	rm $mycfg
-	return 0
-    fi
-
-    if [ $vmajor -eq 3 -a $vminor -eq 2 -a $vpatch -eq 0 ] ; then
-	$mysql <<-EOF
-	ALTER TABLE dpm_fs ADD weight INTEGER;
-	UPDATE dpm_fs SET weight = 1;
-	UPDATE schema_version_dpm SET major = 3, minor = 3, patch = 0;
-	EOF
-    fi
-
-    rm $mycfg
-    return 0
-}
-
-updatedpm
-
 %if %systemd
 # Clean up pre-systemd config
 if [ -r %{_initrddir}/dpm ] ; then
@@ -2067,8 +877,8 @@ fi
 	  %{_libdir}/dpm-mysql/dpm 20 \
   --slave %{_mandir}/man8/dpm.8.gz dpm.8.gz \
 	  %{_libdir}/dpm-mysql/dpm.8.gz \
-  --slave %{_datadir}/dpm/DPMCONFIG.templ DPMCONFIG.templ \
-	  %{_datadir}/dpm-mysql/DPMCONFIG.templ \
+  --slave %{_datadir}/lcgdm/DPMCONFIG.templ DPMCONFIG.templ \
+	  %{_libdir}/dpm-mysql/DPMCONFIG.templ \
 %if %systemd
   --slave %{_unitdir}/dpm.service dpm.service \
 	  %{_datadir}/dpm-mysql/dpm.service \
@@ -2097,149 +907,6 @@ if [ $1 -eq 1 ]; then
 %endif
 fi
 
-%post -n dpm-server-postgres
-updatedpm () {
-    [ -r /etc/sysconfig/dpm ] && . /etc/sysconfig/dpm
-    [ -z "$DPMCONFIGFILE" ] && DPMCONFIGFILE=/etc/DPMCONFIG
-    [ -r $DPMCONFIGFILE ] || return 0
-
-    dpmcfg=$(cat $DPMCONFIGFILE)
-
-    cfg1=$(echo $dpmcfg | cut -f1 -d@)
-    cfg2=$(echo $dpmcfg | cut -f2 -d@ -s)
-
-    user=$(echo $cfg1 | cut -f1 -d/)
-    passwd=$(echo $cfg1 | cut -f2 -d/ -s)
-    host=$(echo $cfg2 | cut -f1 -d/)
-    db=$(echo $cfg2 | cut -f2 -d/ -s)
-
-    [ -z "$user" ] && return 0
-    [ -z "$passwd" ] && return 0
-    [ -z "$host" ] && return 0
-    [ -z "$db" ] && db=dpm_db
-
-    export PGPASSWORD=$passwd
-    psql="psql -t -q -U $user $db"
-
-    vmajor=$($psql -c "select major from schema_version_dpm" 2>/dev/null)
-    vminor=$($psql -c "select minor from schema_version_dpm" 2>/dev/null)
-    vpatch=$($psql -c "select patch from schema_version_dpm" 2>/dev/null)
-
-    if [ -z "$vmajor" -o -z "$vminor" -o -z "$vpatch" ] ; then
-	return 0
-    fi
-
-    if [ $vmajor -eq 3 -a $vminor -eq 2 -a $vpatch -eq 0 ] ; then
-	$psql <<-EOF
-	ALTER TABLE dpm_fs ADD weight INTEGER;
-	UPDATE dpm_fs SET weight = 1;
-	UPDATE schema_version_dpm SET major = 3, minor = 3, patch = 0;
-	EOF
-    fi
-
-    return 0
-}
-
-updatedpm
-
-%if %systemd
-# Clean up pre-systemd config
-if [ -r %{_initrddir}/dpm ] ; then
-    /sbin/service dpm stop > /dev/null 2>&1 || :
-    /sbin/chkconfig --del dpm > /dev/null 2>&1 || :
-fi
-%endif
-
-%{_sbindir}/update-alternatives --install %{_sbindir}/dpm dpm \
-	  %{_libdir}/dpm-postgres/dpm 10 \
-  --slave %{_mandir}/man8/dpm.8.gz dpm.8.gz \
-	  %{_libdir}/dpm-postgres/dpm.8.gz \
-  --slave %{_datadir}/dpm/DPMCONFIG.templ DPMCONFIG.templ \
-	  %{_datadir}/dpm-postgres/DPMCONFIG.templ \
-%if %systemd
-  --slave %{_unitdir}/dpm.service dpm.service \
-	  %{_datadir}/dpm-postgres/dpm.service \
-%else
-  --slave %{_initrddir}/dpm dpm.init \
-	  %{_sysconfdir}/dpm-postgres/dpm.init \
-  --slave %{_sysconfdir}/sysconfig/dpm dpm.conf \
-	  %{_sysconfdir}/dpm-postgres/dpm.conf \
-%endif
-  --slave %{_sysconfdir}/logrotate.d/dpm dpm.logrotate \
-	  %{_sysconfdir}/dpm-postgres/dpm.logrotate \
-  --slave %{_sbindir}/dpm-shutdown dpm-shutdown \
-	  %{_libdir}/dpm-postgres/dpm-shutdown \
-  --slave %{_mandir}/man8/dpm-shutdown.8.gz dpm-shutdown.8.gz \
-	  %{_libdir}/dpm-postgres/dpm-shutdown.8.gz \
-  --slave %{_sbindir}/dpm-buildfsv dpm-buildfsv \
-	  %{_libdir}/dpm-postgres/dpm-buildfsv \
-  --slave %{_mandir}/man8/dpm-buildfsv.8.gz dpm-buildfsv.8.gz \
-	  %{_libdir}/dpm-postgres/dpm-buildfsv.8.gz
-
-if [ $1 -eq 1 ]; then
-%if %systemd
-    /bin/systemctl daemon-reload > /dev/null 2>&1 || :
-%else
-    /sbin/chkconfig --add dpm
-%endif
-fi
-
-%triggerpostun -n dpm-server-mysql -- dpm-mysql < 1.8.1.2-2
-# Restore alternatives removed by dpm-mysql preun
-%{_sbindir}/update-alternatives --install %{_sbindir}/dpm dpm \
-	  %{_libdir}/dpm-mysql/dpm 20 \
-  --slave %{_mandir}/man8/dpm.8.gz dpm.8.gz \
-	  %{_libdir}/dpm-mysql/dpm.8.gz \
-  --slave %{_datadir}/dpm/DPMCONFIG.templ DPMCONFIG.templ \
-	  %{_datadir}/dpm-mysql/DPMCONFIG.templ \
-%if %systemd
-  --slave %{_unitdir}/dpm.service dpm.service \
-	  %{_datadir}/dpm-mysql/dpm.service \
-%else
-  --slave %{_initrddir}/dpm dpm.init \
-	  %{_sysconfdir}/dpm-mysql/dpm.init \
-  --slave %{_sysconfdir}/sysconfig/dpm dpm.conf \
-	  %{_sysconfdir}/dpm-mysql/dpm.conf \
-%endif
-  --slave %{_sysconfdir}/logrotate.d/dpm dpm.logrotate \
-	  %{_sysconfdir}/dpm-mysql/dpm.logrotate \
-  --slave %{_sbindir}/dpm-shutdown dpm-shutdown \
-	  %{_libdir}/dpm-mysql/dpm-shutdown \
-  --slave %{_mandir}/man8/dpm-shutdown.8.gz dpm-shutdown.8.gz \
-	  %{_libdir}/dpm-mysql/dpm-shutdown.8.gz \
-  --slave %{_sbindir}/dpm-buildfsv dpm-buildfsv \
-	  %{_libdir}/dpm-mysql/dpm-buildfsv \
-  --slave %{_mandir}/man8/dpm-buildfsv.8.gz dpm-buildfsv.8.gz \
-	  %{_libdir}/dpm-mysql/dpm-buildfsv.8.gz
-
-%triggerpostun -n dpm-server-postgres -- dpm-postgres < 1.8.1.2-2
-# Restore alternatives removed by dpm-postgres preun
-%{_sbindir}/update-alternatives --install %{_sbindir}/dpm dpm \
-	  %{_libdir}/dpm-postgres/dpm 10 \
-  --slave %{_mandir}/man8/dpm.8.gz dpm.8.gz \
-	  %{_libdir}/dpm-postgres/dpm.8.gz \
-  --slave %{_datadir}/dpm/DPMCONFIG.templ DPMCONFIG.templ \
-	  %{_datadir}/dpm-postgres/DPMCONFIG.templ \
-%if %systemd
-  --slave %{_unitdir}/dpm.service dpm.service \
-	  %{_datadir}/dpm-postgres/dpm.service \
-%else
-  --slave %{_initrddir}/dpm dpm.init \
-	  %{_sysconfdir}/dpm-postgres/dpm.init \
-  --slave %{_sysconfdir}/sysconfig/dpm dpm.conf \
-	  %{_sysconfdir}/dpm-postgres/dpm.conf \
-%endif
-  --slave %{_sysconfdir}/logrotate.d/dpm dpm.logrotate \
-	  %{_sysconfdir}/dpm-postgres/dpm.logrotate \
-  --slave %{_sbindir}/dpm-shutdown dpm-shutdown \
-	  %{_libdir}/dpm-postgres/dpm-shutdown \
-  --slave %{_mandir}/man8/dpm-shutdown.8.gz dpm-shutdown.8.gz \
-	  %{_libdir}/dpm-postgres/dpm-shutdown.8.gz \
-  --slave %{_sbindir}/dpm-buildfsv dpm-buildfsv \
-	  %{_libdir}/dpm-postgres/dpm-buildfsv \
-  --slave %{_mandir}/man8/dpm-buildfsv.8.gz dpm-buildfsv.8.gz \
-	  %{_libdir}/dpm-postgres/dpm-buildfsv.8.gz
-
 %preun -n dpm-server-mysql
 export LANG=C
 
@@ -2262,28 +929,6 @@ if [ $1 -eq 0 ]; then
 %endif
 fi
 
-%preun -n dpm-server-postgres
-export LANG=C
-
-if [ $1 -eq 0 ]; then
-    if ( %{_sbindir}/update-alternatives --display dpm | \
-	grep currently | grep -q dpm-postgres ) ; then
-%if %systemd
-	/bin/systemctl --no-reload disable dpm.service \
-	    > /dev/null 2>&1 || :
-	/bin/systemctl stop dpm.service > /dev/null 2>&1 || :
-%else
-	/sbin/service dpm stop > /dev/null 2>&1 || :
-%endif
-    fi
-    %{_sbindir}/update-alternatives --remove dpm \
-	%{_libdir}/dpm-postgres/dpm
-%if %systemd == 0
-    %{_sbindir}/update-alternatives --display dpm > /dev/null || \
-	/sbin/chkconfig --del dpm > /dev/null 2>&1 || :
-%endif
-fi
-
 %postun -n dpm-server-mysql
 export LANG=C
 
@@ -2298,87 +943,7 @@ if [ $1 -ge 1 ]; then
     fi
 fi
 
-%postun -n dpm-server-postgres
-export LANG=C
-
-if [ $1 -ge 1 ]; then
-    if ( %{_sbindir}/update-alternatives --display dpm | \
-	grep currently | grep -q dpm-postgres ) ; then
-%if %systemd
-	/bin/systemctl try-restart dpm.service > /dev/null 2>&1 || :
-%else
-	/sbin/service dpm condrestart > /dev/null 2>&1 || :
-%endif
-    fi
-fi
-
-%pre -n dpm-name-server-mysql
-getent group dpmmgr > /dev/null || groupadd -r dpmmgr
-getent passwd dpmmgr > /dev/null || useradd -r -g dpmmgr \
-    -d %{_localstatedir}/lib/dpm -s /bin/bash -c "DPM Manager" dpmmgr
-exit 0
-
-%pre -n dpm-name-server-postgres
-getent group dpmmgr > /dev/null || groupadd -r dpmmgr
-getent passwd dpmmgr > /dev/null || useradd -r -g dpmmgr \
-    -d %{_localstatedir}/lib/dpm -s /bin/bash -c "DPM Manager" dpmmgr
-exit 0
-
 %post -n dpm-name-server-mysql
-updatedpns () {
-    [ -r /etc/sysconfig/dpnsdaemon ] && . /etc/sysconfig/dpnsdaemon
-    [ -z "$NSCONFIGFILE" ] && NSCONFIGFILE=/etc/DPNSCONFIG
-    [ -r $NSCONFIGFILE ] || return 0
-
-    nscfg=$(cat $NSCONFIGFILE)
-
-    cfg1=$(echo $nscfg | cut -f1 -d@)
-    cfg2=$(echo $nscfg | cut -f2 -d@ -s)
-
-    user=$(echo $cfg1 | cut -f1 -d/)
-    passwd=$(echo $cfg1 | cut -f2 -d/ -s)
-    host=$(echo $cfg2 | cut -f1 -d/)
-    db=$(echo $cfg2 | cut -f2 -d/ -s)
-
-    [ -z "$user" ] && return 0
-    [ -z "$passwd" ] && return 0
-    [ -z "$host" ] && return 0
-    [ -z "$db" ] && db=cns_db
-
-    mycfg=$(mktemp)
-    cat > $mycfg <<-EOF
-	[client]
-	user=$user
-	password=$passwd
-	EOF
-
-    mysql="mysql --defaults-file=$mycfg --skip-column-names $db"
-
-    vmajor=$($mysql -e "select major from schema_version" 2>/dev/null)
-    vminor=$($mysql -e "select minor from schema_version" 2>/dev/null)
-    vpatch=$($mysql -e "select patch from schema_version" 2>/dev/null)
-
-    if [ -z "$vmajor" -o -z "$vminor" -o -z "$vpatch" ] ; then
-	rm $mycfg
-	return 0
-    fi
-
-    if [ $vmajor -eq 3 -a $vminor -eq 0 -a $vpatch -eq 0 ] ; then
-	$mysql <<-EOF
-	ALTER TABLE Cns_groupinfo ADD banned INTEGER;
-	ALTER TABLE Cns_userinfo ADD user_ca VARCHAR(255) BINARY;
-	ALTER TABLE Cns_userinfo ADD banned INTEGER;
-	CREATE INDEX linkname_idx ON Cns_symlinks(linkname(255));
-	UPDATE schema_version SET major = 3, minor = 1, patch = 0;
-	EOF
-    fi
-
-    rm $mycfg
-    return 0
-}
-
-updatedpns
-
 %if %systemd
 # Clean up pre-systemd config
 if [ -r %{_initrddir}/dpnsdaemon ] ; then
@@ -2391,8 +956,8 @@ fi
 	  %{_libdir}/dpm-mysql/dpnsdaemon 20 \
   --slave %{_mandir}/man8/dpnsdaemon.8.gz dpnsdaemon.8.gz \
 	  %{_libdir}/dpm-mysql/dpnsdaemon.8.gz \
-  --slave %{_datadir}/dpm/DPNSCONFIG.templ DPNSCONFIG.templ \
-	  %{_datadir}/dpm-mysql/DPNSCONFIG.templ \
+  --slave %{_datadir}/lcgdm/NSCONFIG.templ NSCONFIG.templ \
+	  %{_libdir}/dpm-mysql/NSCONFIG.templ \
 %if %systemd
   --slave %{_unitdir}/dpnsdaemon.service dpnsdaemon.service \
 	  %{_datadir}/dpm-mysql/dpnsdaemon.service \
@@ -2417,139 +982,6 @@ if [ $1 -eq 1 ]; then
 %endif
 fi
 
-%post -n dpm-name-server-postgres
-updatedpns () {
-    [ -r /etc/sysconfig/dpnsdaemon ] && . /etc/sysconfig/dpnsdaemon
-    [ -z "$NSCONFIGFILE" ] && NSCONFIGFILE=/etc/DPNSCONFIG
-    [ -r $NSCONFIGFILE ] || return 0
-
-    nscfg=$(cat $NSCONFIGFILE)
-
-    cfg1=$(echo $nscfg | cut -f1 -d@)
-    cfg2=$(echo $nscfg | cut -f2 -d@ -s)
-
-    user=$(echo $cfg1 | cut -f1 -d/)
-    passwd=$(echo $cfg1 | cut -f2 -d/ -s)
-    host=$(echo $cfg2 | cut -f1 -d/)
-    db=$(echo $cfg2 | cut -f2 -d/ -s)
-
-    [ -z "$user" ] && return 0
-    [ -z "$passwd" ] && return 0
-    [ -z "$host" ] && return 0
-    [ -z "$db" ] && db=cns_db
-
-    export PGPASSWORD=$passwd
-    psql="psql -t -q -U $user $db"
-
-    vmajor=$($psql -c "select major from schema_version" 2>/dev/null)
-    vminor=$($psql -c "select minor from schema_version" 2>/dev/null)
-    vpatch=$($psql -c "select patch from schema_version" 2>/dev/null)
-
-    if [ -z "$vmajor" -o -z "$vminor" -o -z "$vpatch" ] ; then
-	return 0
-    fi
-
-    if [ $vmajor -eq 3 -a $vminor -eq 0 -a $vpatch -eq 0 ] ; then
-	$psql <<-EOF
-	ALTER TABLE Cns_groupinfo ADD banned INTEGER;
-	ALTER TABLE Cns_userinfo ADD user_ca VARCHAR(255);
-	ALTER TABLE Cns_userinfo ADD banned INTEGER;
-	CREATE INDEX linkname_idx ON Cns_symlinks(linkname);
-	UPDATE schema_version SET major = 3, minor = 1, patch = 0;
-	EOF
-    fi
-
-    return 0
-}
-
-updatedpns
-
-%if %systemd
-# Clean up pre-systemd config
-if [ -r %{_initrddir}/dpnsdaemon ] ; then
-    /sbin/service dpnsdaemon stop > /dev/null 2>&1 || :
-    /sbin/chkconfig --del dpnsdaemon > /dev/null 2>&1 || :
-fi
-%endif
-
-%{_sbindir}/update-alternatives --install %{_sbindir}/dpnsdaemon dpnsdaemon \
-	  %{_libdir}/dpm-postgres/dpnsdaemon 10 \
-  --slave %{_mandir}/man8/dpnsdaemon.8.gz dpnsdaemon.8.gz \
-	  %{_libdir}/dpm-postgres/dpnsdaemon.8.gz \
-  --slave %{_datadir}/dpm/DPNSCONFIG.templ DPNSCONFIG.templ \
-	  %{_datadir}/dpm-postgres/DPNSCONFIG.templ \
-%if %systemd
-  --slave %{_unitdir}/dpnsdaemon.service dpnsdaemon.service \
-	  %{_datadir}/dpm-postgres/dpnsdaemon.service \
-%else
-  --slave %{_initrddir}/dpnsdaemon dpnsdaemon.init \
-	  %{_sysconfdir}/dpm-postgres/dpnsdaemon.init \
-  --slave %{_sysconfdir}/sysconfig/dpnsdaemon dpnsdaemon.conf \
-	  %{_sysconfdir}/dpm-postgres/dpnsdaemon.conf \
-%endif
-  --slave %{_sysconfdir}/logrotate.d/dpnsdaemon dpnsdaemon.logrotate \
-	  %{_sysconfdir}/dpm-postgres/dpnsdaemon.logrotate \
-  --slave %{_sbindir}/dpns-shutdown dpns-shutdown \
-	  %{_libdir}/dpm-postgres/dpns-shutdown \
-  --slave %{_mandir}/man8/dpns-shutdown.8.gz dpns-shutdown.8.gz \
-	  %{_libdir}/dpm-postgres/dpns-shutdown.8.gz
-
-if [ $1 -eq 1 ]; then
-%if %systemd
-    /bin/systemctl daemon-reload > /dev/null 2>&1 || :
-%else
-    /sbin/chkconfig --add dpnsdaemon
-%endif
-fi
-
-%triggerpostun -n dpm-name-server-mysql -- dpm-mysql-nameserver < 1.8.1.2-2
-# Restore alternatives removed by dpm-mysql-nameserver preun
-%{_sbindir}/update-alternatives --install %{_sbindir}/dpnsdaemon dpnsdaemon \
-	  %{_libdir}/dpm-mysql/dpnsdaemon 20 \
-  --slave %{_mandir}/man8/dpnsdaemon.8.gz dpnsdaemon.8.gz \
-	  %{_libdir}/dpm-mysql/dpnsdaemon.8.gz \
-  --slave %{_datadir}/dpm/DPNSCONFIG.templ DPNSCONFIG.templ \
-	  %{_datadir}/dpm-mysql/DPNSCONFIG.templ \
-%if %systemd
-  --slave %{_unitdir}/dpnsdaemon.service dpnsdaemon.service \
-	  %{_datadir}/dpm-mysql/dpnsdaemon.service \
-%else
-  --slave %{_initrddir}/dpnsdaemon dpnsdaemon.init \
-	  %{_sysconfdir}/dpm-mysql/dpnsdaemon.init \
-  --slave %{_sysconfdir}/sysconfig/dpnsdaemon dpnsdaemon.conf \
-	  %{_sysconfdir}/dpm-mysql/dpnsdaemon.conf \
-%endif
-  --slave %{_sysconfdir}/logrotate.d/dpnsdaemon dpnsdaemon.logrotate \
-	  %{_sysconfdir}/dpm-mysql/dpnsdaemon.logrotate \
-  --slave %{_sbindir}/dpns-shutdown dpns-shutdown \
-	  %{_libdir}/dpm-mysql/dpns-shutdown \
-  --slave %{_mandir}/man8/dpns-shutdown.8.gz dpns-shutdown.8.gz \
-	  %{_libdir}/dpm-mysql/dpns-shutdown.8.gz
-
-%triggerpostun -n dpm-name-server-postgres -- dpm-postgres-nameserver < 1.8.1.2-2
-# Restore alternatives removed by dpm-postgres-nameserver preun
-%{_sbindir}/update-alternatives --install %{_sbindir}/dpnsdaemon dpnsdaemon \
-	  %{_libdir}/dpm-postgres/dpnsdaemon 10 \
-  --slave %{_mandir}/man8/dpnsdaemon.8.gz dpnsdaemon.8.gz \
-	  %{_libdir}/dpm-postgres/dpnsdaemon.8.gz \
-  --slave %{_datadir}/dpm/DPNSCONFIG.templ DPNSCONFIG.templ \
-	  %{_datadir}/dpm-postgres/DPNSCONFIG.templ \
-%if %systemd
-  --slave %{_unitdir}/dpnsdaemon.service dpnsdaemon.service \
-	  %{_datadir}/dpm-postgres/dpnsdaemon.service \
-%else
-  --slave %{_initrddir}/dpnsdaemon dpnsdaemon.init \
-	  %{_sysconfdir}/dpm-postgres/dpnsdaemon.init \
-  --slave %{_sysconfdir}/sysconfig/dpnsdaemon dpnsdaemon.conf \
-	  %{_sysconfdir}/dpm-postgres/dpnsdaemon.conf \
-%endif
-  --slave %{_sysconfdir}/logrotate.d/dpnsdaemon dpnsdaemon.logrotate \
-	  %{_sysconfdir}/dpm-postgres/dpnsdaemon.logrotate \
-  --slave %{_sbindir}/dpns-shutdown dpns-shutdown \
-	  %{_libdir}/dpm-postgres/dpns-shutdown \
-  --slave %{_mandir}/man8/dpns-shutdown.8.gz dpns-shutdown.8.gz \
-	  %{_libdir}/dpm-postgres/dpns-shutdown.8.gz
-
 %preun -n dpm-name-server-mysql
 export LANG=C
 
@@ -2561,59 +993,23 @@ if [ $1 -eq 0 ]; then
 	    > /dev/null 2>&1 || :
 	/bin/systemctl stop dpnsdaemon.service > /dev/null 2>&1 || :
 %else
-	/sbin/service dpnsdaemon stop > /dev/null 2>&1 || :
-%endif
-    fi
-    %{_sbindir}/update-alternatives --remove dpnsdaemon \
-	%{_libdir}/dpm-mysql/dpnsdaemon
-%if %systemd == 0
-    %{_sbindir}/update-alternatives --display dpnsdaemon > /dev/null || \
-	/sbin/chkconfig --del dpnsdaemon > /dev/null 2>&1 || :
-%endif
-fi
-
-%preun -n dpm-name-server-postgres
-export LANG=C
-
-if [ $1 -eq 0 ]; then
-    if ( %{_sbindir}/update-alternatives --display dpnsdaemon | \
-	grep currently | grep -q dpm-postgres ) ; then
-%if %systemd
-	/bin/systemctl --no-reload disable dpnsdaemon.service \
-	    > /dev/null 2>&1 || :
-	/bin/systemctl stop dpnsdaemon.service > /dev/null 2>&1 || :
-%else
-	/sbin/service dpnsdaemon stop > /dev/null 2>&1 || :
-%endif
-    fi
-    %{_sbindir}/update-alternatives --remove dpnsdaemon \
-	%{_libdir}/dpm-postgres/dpnsdaemon
-%if %systemd == 0
-    %{_sbindir}/update-alternatives --display dpnsdaemon > /dev/null || \
-	/sbin/chkconfig --del dpnsdaemon > /dev/null 2>&1 || :
-%endif
-fi
-
-%postun -n dpm-name-server-mysql
-export LANG=C
-
-if [ $1 -ge 1 ]; then
-    if ( %{_sbindir}/update-alternatives --display dpnsdaemon | \
-	grep currently | grep -q dpm-mysql ) ; then
-%if %systemd
-	/bin/systemctl try-restart dpnsdaemon.service > /dev/null 2>&1 || :
-%else
-	/sbin/service dpnsdaemon condrestart > /dev/null 2>&1 || :
+	/sbin/service dpnsdaemon stop > /dev/null 2>&1 || :
 %endif
     fi
+    %{_sbindir}/update-alternatives --remove dpnsdaemon \
+	%{_libdir}/dpm-mysql/dpnsdaemon
+%if %systemd == 0
+    %{_sbindir}/update-alternatives --display dpnsdaemon > /dev/null || \
+	/sbin/chkconfig --del dpnsdaemon > /dev/null 2>&1 || :
+%endif
 fi
 
-%postun -n dpm-name-server-postgres
+%postun -n dpm-name-server-mysql
 export LANG=C
 
 if [ $1 -ge 1 ]; then
     if ( %{_sbindir}/update-alternatives --display dpnsdaemon | \
-	grep currently | grep -q dpm-postgres ) ; then
+	grep currently | grep -q dpm-mysql ) ; then
 %if %systemd
 	/bin/systemctl try-restart dpnsdaemon.service > /dev/null 2>&1 || :
 %else
@@ -2622,18 +1018,6 @@ if [ $1 -ge 1 ]; then
     fi
 fi
 
-%pre -n dpm-copy-server-mysql
-getent group dpmmgr > /dev/null || groupadd -r dpmmgr
-getent passwd dpmmgr > /dev/null || useradd -r -g dpmmgr \
-    -d %{_localstatedir}/lib/dpm -s /bin/bash -c "DPM Manager" dpmmgr
-exit 0
-
-%pre -n dpm-copy-server-postgres
-getent group dpmmgr > /dev/null || groupadd -r dpmmgr
-getent passwd dpmmgr > /dev/null || useradd -r -g dpmmgr \
-    -d %{_localstatedir}/lib/dpm -s /bin/bash -c "DPM Manager" dpmmgr
-exit 0
-
 %post -n dpm-copy-server-mysql
 %if %systemd
 # Clean up pre-systemd config
@@ -2667,83 +1051,6 @@ if [ $1 -eq 1 ]; then
 %endif
 fi
 
-%post -n dpm-copy-server-postgres
-%if %systemd
-# Clean up pre-systemd config
-if [ -r %{_initrddir}/dpmcopyd ] ; then
-    /sbin/service dpmcopyd stop > /dev/null 2>&1 || :
-    /sbin/chkconfig --del dpmcopyd > /dev/null 2>&1 || :
-fi
-%endif
-
-%{_sbindir}/update-alternatives --install %{_sbindir}/dpmcopyd dpmcopyd \
-	  %{_libdir}/dpm-postgres/dpmcopyd 10 \
-  --slave %{_mandir}/man8/dpmcopyd.8.gz dpmcopyd.8.gz \
-	  %{_libdir}/dpm-postgres/dpmcopyd.8.gz \
-%if %systemd
-  --slave %{_unitdir}/dpmcopyd.service dpmcopyd.service \
-	  %{_datadir}/dpm-postgres/dpmcopyd.service \
-%else
-  --slave %{_initrddir}/dpmcopyd dpmcopyd.init \
-	  %{_sysconfdir}/dpm-postgres/dpmcopyd.init \
-  --slave %{_sysconfdir}/sysconfig/dpmcopyd dpmcopyd.conf \
-	  %{_sysconfdir}/dpm-postgres/dpmcopyd.conf \
-%endif
-  --slave %{_sysconfdir}/logrotate.d/dpmcopyd dpmcopyd.logrotate \
-	  %{_sysconfdir}/dpm-postgres/dpmcopyd.logrotate
-
-if [ $1 -eq 1 ]; then
-%if %systemd
-    /bin/systemctl daemon-reload > /dev/null 2>&1 || :
-%else
-    /sbin/chkconfig --add dpmcopyd
-%endif
-fi
-
-%triggerpostun -n dpm-copy-server-mysql -- dpm-mysql-copyd < 1.8.1.2-2
-# Restore alternatives removed by dpm-mysql-copyd preun
-%{_sbindir}/update-alternatives --install %{_sbindir}/dpmcopyd dpmcopyd \
-	  %{_libdir}/dpm-mysql/dpmcopyd 20 \
-  --slave %{_mandir}/man8/dpmcopyd.8.gz dpmcopyd.8.gz \
-	  %{_libdir}/dpm-mysql/dpmcopyd.8.gz \
-%if %systemd
-  --slave %{_unitdir}/dpmcopyd.service dpmcopyd.service \
-	  %{_datadir}/dpm-mysql/dpmcopyd.service \
-%else
-  --slave %{_initrddir}/dpmcopyd dpmcopyd.init \
-	  %{_sysconfdir}/dpm-mysql/dpmcopyd.init \
-  --slave %{_sysconfdir}/sysconfig/dpmcopyd dpmcopyd.conf \
-	  %{_sysconfdir}/dpm-mysql/dpmcopyd.conf \
-%endif
-  --slave %{_sysconfdir}/logrotate.d/dpmcopyd dpmcopyd.logrotate \
-	  %{_sysconfdir}/dpm-mysql/dpmcopyd.logrotate
-
-%triggerpostun -n dpm-copy-server-postgres -- dpm-postgres-copyd < 1.8.1.2-2
-# Restore alternatives removed by dpm-postgres-copyd preun
-%{_sbindir}/update-alternatives --install %{_sbindir}/dpmcopyd dpmcopyd \
-	  %{_libdir}/dpm-postgres/dpmcopyd 10 \
-  --slave %{_mandir}/man8/dpmcopyd.8.gz dpmcopyd.8.gz \
-	  %{_libdir}/dpm-postgres/dpmcopyd.8.gz \
-%if %systemd
-  --slave %{_unitdir}/dpmcopyd.service dpmcopyd.service \
-	  %{_datadir}/dpm-postgres/dpmcopyd.service \
-%else
-  --slave %{_initrddir}/dpmcopyd dpmcopyd.init \
-	  %{_sysconfdir}/dpm-postgres/dpmcopyd.init \
-  --slave %{_sysconfdir}/sysconfig/dpmcopyd dpmcopyd.conf \
-	  %{_sysconfdir}/dpm-postgres/dpmcopyd.conf \
-%endif
-  --slave %{_sysconfdir}/logrotate.d/dpmcopyd dpmcopyd.logrotate \
-	  %{_sysconfdir}/dpm-postgres/dpmcopyd.logrotate
-
-if [ $1 -eq 1 ]; then
-%if %systemd
-    /bin/systemctl daemon-reload > /dev/null 2>&1 || :
-%else
-    /sbin/chkconfig --add dpmcopyd
-%endif
-fi
-
 %preun -n dpm-copy-server-mysql
 export LANG=C
 
@@ -2766,28 +1073,6 @@ if [ $1 -eq 0 ]; then
 %endif
 fi
 
-%preun -n dpm-copy-server-postgres
-export LANG=C
-
-if [ $1 -eq 0 ]; then
-    if ( %{_sbindir}/update-alternatives --display dpmcopyd | \
-	grep currently | grep -q dpm-postgres ) ; then
-%if %systemd
-	/bin/systemctl --no-reload disable dpmcopyd.service \
-	    > /dev/null 2>&1 || :
-	/bin/systemctl stop dpmcopyd.service > /dev/null 2>&1 || :
-%else
-	/sbin/service dpmcopyd stop > /dev/null 2>&1 || :
-%endif
-    fi
-    %{_sbindir}/update-alternatives --remove dpmcopyd \
-	%{_libdir}/dpm-postgres/dpmcopyd
-%if %systemd == 0
-    %{_sbindir}/update-alternatives --display dpmcopyd > /dev/null || \
-	/sbin/chkconfig --del dpmcopyd > /dev/null 2>&1 || :
-%endif
-fi
-
 %postun -n dpm-copy-server-mysql
 export LANG=C
 
@@ -2802,399 +1087,134 @@ if [ $1 -ge 1 ]; then
     fi
 fi
 
-%postun -n dpm-copy-server-postgres
-export LANG=C
-
-if [ $1 -ge 1 ]; then
-    if ( %{_sbindir}/update-alternatives --display dpmcopyd | \
-	grep currently | grep -q dpm-postgres ) ; then
-%if %systemd
-	/bin/systemctl try-restart dpmcopyd.service > /dev/null 2>&1 || :
-%else
-	/sbin/service dpmcopyd condrestart > /dev/null 2>&1 || :
-%endif
-    fi
-fi
-
-%pre -n dpm-srm-server-mysql
-getent group dpmmgr > /dev/null || groupadd -r dpmmgr
-getent passwd dpmmgr > /dev/null || useradd -r -g dpmmgr \
-    -d %{_localstatedir}/lib/dpm -s /bin/bash -c "DPM Manager" dpmmgr
-exit 0
-
-%pre -n dpm-srm-server-postgres
-getent group dpmmgr > /dev/null || groupadd -r dpmmgr
-getent passwd dpmmgr > /dev/null || useradd -r -g dpmmgr \
-    -d %{_localstatedir}/lib/dpm -s /bin/bash -c "DPM Manager" dpmmgr
-exit 0
-
 %post -n dpm-srm-server-mysql
 %if %systemd
 # Clean up pre-systemd config
-if [ -r %{_initrddir}/dpm-srmv1 ] ; then
-    /sbin/service dpm-srmv1 stop > /dev/null 2>&1 || :
-    /sbin/chkconfig --del dpm-srmv1 > /dev/null 2>&1 || :
+if [ -r %{_initrddir}/srmv1 ] ; then
+    /sbin/service srmv1 stop > /dev/null 2>&1 || :
+    /sbin/chkconfig --del srmv1 > /dev/null 2>&1 || :
 fi
-if [ -r %{_initrddir}/dpm-srmv2 ] ; then
-    /sbin/service dpm-srmv2 stop > /dev/null 2>&1 || :
-    /sbin/chkconfig --del dpm-srmv2 > /dev/null 2>&1 || :
+if [ -r %{_initrddir}/srmv2 ] ; then
+    /sbin/service srmv2 stop > /dev/null 2>&1 || :
+    /sbin/chkconfig --del srmv2 > /dev/null 2>&1 || :
 fi
-if [ -r %{_initrddir}/dpm-srmv2.2 ] ; then
-    /sbin/service dpm-srmv2.2 stop > /dev/null 2>&1 || :
-    /sbin/chkconfig --del dpm-srmv2.2 > /dev/null 2>&1 || :
+if [ -r %{_initrddir}/srmv2.2 ] ; then
+    /sbin/service srmv2.2 stop > /dev/null 2>&1 || :
+    /sbin/chkconfig --del srmv2.2 > /dev/null 2>&1 || :
 fi
 %endif
 
-%{_sbindir}/update-alternatives --install %{_sbindir}/dpm-srmv1 dpm-srmv1 \
-	  %{_libdir}/dpm-mysql/dpm-srmv1 20 \
-  --slave %{_mandir}/man8/dpm-srmv1.8.gz dpm-srmv1.8.gz \
-	  %{_libdir}/dpm-mysql/dpm-srmv1.8.gz \
-%if %systemd
-  --slave %{_unitdir}/dpm-srmv1.service dpm-srmv1.service \
-	  %{_datadir}/dpm-mysql/dpm-srmv1.service \
-%else
-  --slave %{_initrddir}/dpm-srmv1 dpm-srmv1.init \
-	  %{_sysconfdir}/dpm-mysql/dpm-srmv1.init \
-  --slave %{_sysconfdir}/sysconfig/dpm-srmv1 dpm-srmv1.conf \
-	  %{_sysconfdir}/dpm-mysql/dpm-srmv1.conf \
-%endif
-  --slave %{_sysconfdir}/logrotate.d/dpm-srmv1 dpm-srmv1.logrotate \
-	  %{_sysconfdir}/dpm-mysql/dpm-srmv1.logrotate
-
-%{_sbindir}/update-alternatives --install %{_sbindir}/dpm-srmv2 dpm-srmv2 \
-	  %{_libdir}/dpm-mysql/dpm-srmv2 20 \
-  --slave %{_mandir}/man8/dpm-srmv2.8.gz dpm-srmv2.8.gz \
-	  %{_libdir}/dpm-mysql/dpm-srmv2.8.gz \
-%if %systemd
-  --slave %{_unitdir}/dpm-srmv2.service dpm-srmv2.service \
-	  %{_datadir}/dpm-mysql/dpm-srmv2.service \
-%else
-  --slave %{_initrddir}/dpm-srmv2 dpm-srmv2.init \
-	  %{_sysconfdir}/dpm-mysql/dpm-srmv2.init \
-  --slave %{_sysconfdir}/sysconfig/dpm-srmv2 dpm-srmv2.conf \
-	  %{_sysconfdir}/dpm-mysql/dpm-srmv2.conf \
-%endif
-  --slave %{_sysconfdir}/logrotate.d/dpm-srmv2 dpm-srmv2.logrotate \
-	  %{_sysconfdir}/dpm-mysql/dpm-srmv2.logrotate
-
-%{_sbindir}/update-alternatives --install %{_sbindir}/dpm-srmv2.2 dpm-srmv2.2 \
-	  %{_libdir}/dpm-mysql/dpm-srmv2.2 20 \
-  --slave %{_mandir}/man8/dpm-srmv2.2.8.gz dpm-srmv2.2.8.gz \
-	  %{_libdir}/dpm-mysql/dpm-srmv2.2.8.gz \
+%{_sbindir}/update-alternatives --install %{_sbindir}/srmv1 srmv1 \
+	  %{_libdir}/dpm-mysql/srmv1 20 \
+  --slave %{_mandir}/man8/srmv1.8.gz srmv1.8.gz \
+	  %{_libdir}/dpm-mysql/srmv1.8.gz \
 %if %systemd
-  --slave %{_unitdir}/dpm-srmv2.2.service dpm-srmv2.2.service \
-	  %{_datadir}/dpm-mysql/dpm-srmv2.2.service \
+  --slave %{_unitdir}/srmv1.service srmv1.service \
+	  %{_libdir}/dpm-mysql/srmv1.service \
 %else
-  --slave %{_initrddir}/dpm-srmv2.2 dpm-srmv2.2.init \
-	  %{_sysconfdir}/dpm-mysql/dpm-srmv2.2.init \
-  --slave %{_sysconfdir}/sysconfig/dpm-srmv2.2 dpm-srmv2.2.conf \
-	  %{_sysconfdir}/dpm-mysql/dpm-srmv2.2.conf \
+  --slave %{_initrddir}/srmv1 srmv1.init \
+	  %{_sysconfdir}/dpm-mysql/srmv1.init \
+  --slave %{_sysconfdir}/sysconfig/srmv1 srmv1.conf \
+	  %{_sysconfdir}/dpm-mysql/srmv1.conf \
 %endif
-  --slave %{_sysconfdir}/logrotate.d/dpm-srmv2.2 dpm-srmv2.2.logrotate \
-	  %{_sysconfdir}/dpm-mysql/dpm-srmv2.2.logrotate
+  --slave %{_sysconfdir}/logrotate.d/srmv1 srmv1.logrotate \
+	  %{_sysconfdir}/dpm-mysql/srmv1.logrotate
 
-if [ $1 -eq 1 ]; then
+%{_sbindir}/update-alternatives --install %{_sbindir}/srmv2 srmv2 \
+	  %{_libdir}/dpm-mysql/srmv2 20 \
+  --slave %{_mandir}/man8/srmv2.8.gz srmv2.8.gz \
+	  %{_libdir}/dpm-mysql/srmv2.8.gz \
 %if %systemd
-    /bin/systemctl daemon-reload > /dev/null 2>&1 || :
+  --slave %{_unitdir}/srmv2.service srmv2.service \
+	  %{_datadir}/dpm-mysql/dpm-srmv2.service \
 %else
-    /sbin/chkconfig --add dpm-srmv1
-    /sbin/chkconfig --add dpm-srmv2
-    /sbin/chkconfig --add dpm-srmv2.2
-%endif
-fi
-
-%post -n dpm-srm-server-postgres
-%if %systemd
-# Clean up pre-systemd config
-if [ -r %{_initrddir}/dpm-srmv1 ] ; then
-    /sbin/service dpm-srmv1 stop > /dev/null 2>&1 || :
-    /sbin/chkconfig --del dpm-srmv1 > /dev/null 2>&1 || :
-fi
-if [ -r %{_initrddir}/dpm-srmv2 ] ; then
-    /sbin/service dpm-srmv2 stop > /dev/null 2>&1 || :
-    /sbin/chkconfig --del dpm-srmv2 > /dev/null 2>&1 || :
-fi
-if [ -r %{_initrddir}/dpm-srmv2.2 ] ; then
-    /sbin/service dpm-srmv2.2 stop > /dev/null 2>&1 || :
-    /sbin/chkconfig --del dpm-srmv2.2 > /dev/null 2>&1 || :
-fi
+  --slave %{_initrddir}/srmv2 srmv2.init \
+	  %{_sysconfdir}/dpm-mysql/srmv2.init \
+  --slave %{_sysconfdir}/sysconfig/srmv2 srmv2.conf \
+	  %{_sysconfdir}/dpm-mysql/srmv2.conf \
 %endif
+  --slave %{_sysconfdir}/logrotate.d/srmv2 srmv2.logrotate \
+	  %{_sysconfdir}/dpm-mysql/srmv2.logrotate
 
-%{_sbindir}/update-alternatives --install %{_sbindir}/dpm-srmv1 dpm-srmv1 \
-	  %{_libdir}/dpm-postgres/dpm-srmv1 10 \
-  --slave %{_mandir}/man8/dpm-srmv1.8.gz dpm-srmv1.8.gz \
-	  %{_libdir}/dpm-postgres/dpm-srmv1.8.gz \
-%if %systemd
-  --slave %{_unitdir}/dpm-srmv1.service dpm-srmv1.service \
-	  %{_datadir}/dpm-postgres/dpm-srmv1.service \
-%else
-  --slave %{_initrddir}/dpm-srmv1 dpm-srmv1.init \
-	  %{_sysconfdir}/dpm-postgres/dpm-srmv1.init \
-  --slave %{_sysconfdir}/sysconfig/dpm-srmv1 dpm-srmv1.conf \
-	  %{_sysconfdir}/dpm-postgres/dpm-srmv1.conf \
-%endif
-  --slave %{_sysconfdir}/logrotate.d/dpm-srmv1 dpm-srmv1.logrotate \
-	  %{_sysconfdir}/dpm-postgres/dpm-srmv1.logrotate
-
-%{_sbindir}/update-alternatives --install %{_sbindir}/dpm-srmv2 dpm-srmv2 \
-	  %{_libdir}/dpm-postgres/dpm-srmv2 10 \
-  --slave %{_mandir}/man8/dpm-srmv2.8.gz dpm-srmv2.8.gz \
-	  %{_libdir}/dpm-postgres/dpm-srmv2.8.gz \
-%if %systemd
-  --slave %{_unitdir}/dpm-srmv2.service dpm-srmv2.service \
-	  %{_datadir}/dpm-postgres/dpm-srmv2.service \
-%else
-  --slave %{_initrddir}/dpm-srmv2 dpm-srmv2.init \
-	  %{_sysconfdir}/dpm-postgres/dpm-srmv2.init \
-  --slave %{_sysconfdir}/sysconfig/dpm-srmv2 dpm-srmv2.conf \
-	  %{_sysconfdir}/dpm-postgres/dpm-srmv2.conf \
-%endif
-  --slave %{_sysconfdir}/logrotate.d/dpm-srmv2 dpm-srmv2.logrotate \
-	  %{_sysconfdir}/dpm-postgres/dpm-srmv2.logrotate
-
-%{_sbindir}/update-alternatives --install %{_sbindir}/dpm-srmv2.2 dpm-srmv2.2 \
-	  %{_libdir}/dpm-postgres/dpm-srmv2.2 10 \
-  --slave %{_mandir}/man8/dpm-srmv2.2.8.gz dpm-srmv2.2.8.gz \
-	  %{_libdir}/dpm-postgres/dpm-srmv2.2.8.gz \
+%{_sbindir}/update-alternatives --install %{_sbindir}/srmv2.2 srmv2.2 \
+	  %{_libdir}/dpm-mysql/srmv2.2 20 \
+  --slave %{_mandir}/man8/srmv2.2.8.gz srmv2.2.8.gz \
+	  %{_libdir}/dpm-mysql/srmv2.2.8.gz \
 %if %systemd
-  --slave %{_unitdir}/dpm-srmv2.2.service dpm-srmv2.2.service \
-	  %{_datadir}/dpm-postgres/dpm-srmv2.2.service \
+  --slave %{_unitdir}/srmv2.2.service srmv2.2.service \
+	  %{_datadir}/dpm-mysql/srmv2.2.service \
 %else
-  --slave %{_initrddir}/dpm-srmv2.2 dpm-srmv2.2.init \
-	  %{_sysconfdir}/dpm-postgres/dpm-srmv2.2.init \
-  --slave %{_sysconfdir}/sysconfig/dpm-srmv2.2 dpm-srmv2.2.conf \
-	  %{_sysconfdir}/dpm-postgres/dpm-srmv2.2.conf \
+  --slave %{_initrddir}/srmv2.2 srmv2.2.init \
+	  %{_sysconfdir}/dpm-mysql/srmv2.2.init \
+  --slave %{_sysconfdir}/sysconfig/srmv2.2 srmv2.2.conf \
+	  %{_sysconfdir}/dpm-mysql/srmv2.2.conf \
 %endif
-  --slave %{_sysconfdir}/logrotate.d/dpm-srmv2.2 dpm-srmv2.2.logrotate \
-	  %{_sysconfdir}/dpm-postgres/dpm-srmv2.2.logrotate
+  --slave %{_sysconfdir}/logrotate.d/srmv2.2 srmv2.2.logrotate \
+	  %{_sysconfdir}/dpm-mysql/srmv2.2.logrotate
 
 if [ $1 -eq 1 ]; then
 %if %systemd
     /bin/systemctl daemon-reload > /dev/null 2>&1 || :
 %else
-    /sbin/chkconfig --add dpm-srmv1
-    /sbin/chkconfig --add dpm-srmv2
-    /sbin/chkconfig --add dpm-srmv2.2
+    /sbin/chkconfig --add srmv1
+    /sbin/chkconfig --add srmv2
+    /sbin/chkconfig --add srmv2.2
 %endif
 fi
 
-%triggerpostun -n dpm-srm-server-mysql -- dpm-mysql-srmv1 < 1.8.1.2-2
-# Restore alternatives removed by dpm-mysql-srmv1 preun
-%{_sbindir}/update-alternatives --install %{_sbindir}/dpm-srmv1 dpm-srmv1 \
-	  %{_libdir}/dpm-mysql/dpm-srmv1 20 \
-  --slave %{_mandir}/man8/dpm-srmv1.8.gz dpm-srmv1.8.gz \
-	  %{_libdir}/dpm-mysql/dpm-srmv1.8.gz \
-%if %systemd
-  --slave %{_unitdir}/dpm-srmv1.service dpm-srmv1.service \
-	  %{_datadir}/dpm-mysql/dpm-srmv1.service \
-%else
-  --slave %{_initrddir}/dpm-srmv1 dpm-srmv1.init \
-	  %{_sysconfdir}/dpm-mysql/dpm-srmv1.init \
-  --slave %{_sysconfdir}/sysconfig/dpm-srmv1 dpm-srmv1.conf \
-	  %{_sysconfdir}/dpm-mysql/dpm-srmv1.conf \
-%endif
-  --slave %{_sysconfdir}/logrotate.d/dpm-srmv1 dpm-srmv1.logrotate \
-	  %{_sysconfdir}/dpm-mysql/dpm-srmv1.logrotate
-
-%triggerpostun -n dpm-srm-server-mysql -- dpm-mysql-srmv2 < 1.8.1.2-2
-# Restore alternatives removed by dpm-mysql-srmv2 preun
-%{_sbindir}/update-alternatives --install %{_sbindir}/dpm-srmv2 dpm-srmv2 \
-	  %{_libdir}/dpm-mysql/dpm-srmv2 20 \
-  --slave %{_mandir}/man8/dpm-srmv2.8.gz dpm-srmv2.8.gz \
-	  %{_libdir}/dpm-mysql/dpm-srmv2.8.gz \
-%if %systemd
-  --slave %{_unitdir}/dpm-srmv2.service dpm-srmv2.service \
-	  %{_datadir}/dpm-mysql/dpm-srmv2.service \
-%else
-  --slave %{_initrddir}/dpm-srmv2 dpm-srmv2.init \
-	  %{_sysconfdir}/dpm-mysql/dpm-srmv2.init \
-  --slave %{_sysconfdir}/sysconfig/dpm-srmv2 dpm-srmv2.conf \
-	  %{_sysconfdir}/dpm-mysql/dpm-srmv2.conf \
-%endif
-  --slave %{_sysconfdir}/logrotate.d/dpm-srmv2 dpm-srmv2.logrotate \
-	  %{_sysconfdir}/dpm-mysql/dpm-srmv2.logrotate
-
-%triggerpostun -n dpm-srm-server-mysql -- dpm-mysql-srmv2.2 < 1.8.1.2-2
-# Restore alternatives removed by dpm-mysql-srmv22 preun
-%{_sbindir}/update-alternatives --install %{_sbindir}/dpm-srmv2.2 dpm-srmv2.2 \
-	  %{_libdir}/dpm-mysql/dpm-srmv2.2 20 \
-  --slave %{_mandir}/man8/dpm-srmv2.2.8.gz dpm-srmv2.2.8.gz \
-	  %{_libdir}/dpm-mysql/dpm-srmv2.2.8.gz \
-%if %systemd
-  --slave %{_unitdir}/dpm-srmv2.2.service dpm-srmv2.2.service \
-	  %{_datadir}/dpm-mysql/dpm-srmv2.2.service \
-%else
-  --slave %{_initrddir}/dpm-srmv2.2 dpm-srmv2.2.init \
-	  %{_sysconfdir}/dpm-mysql/dpm-srmv2.2.init \
-  --slave %{_sysconfdir}/sysconfig/dpm-srmv2.2 dpm-srmv2.2.conf \
-	  %{_sysconfdir}/dpm-mysql/dpm-srmv2.2.conf \
-%endif
-  --slave %{_sysconfdir}/logrotate.d/dpm-srmv2.2 dpm-srmv2.2.logrotate \
-	  %{_sysconfdir}/dpm-mysql/dpm-srmv2.2.logrotate
-
-%triggerpostun -n dpm-srm-server-postgres -- dpm-postgres-srmv1 < 1.8.1.2-2
-# Restore alternatives removed by dpm-postgres-srmv1 preun
-%{_sbindir}/update-alternatives --install %{_sbindir}/dpm-srmv1 dpm-srmv1 \
-	  %{_libdir}/dpm-postgres/dpm-srmv1 10 \
-  --slave %{_mandir}/man8/dpm-srmv1.8.gz dpm-srmv1.8.gz \
-	  %{_libdir}/dpm-postgres/dpm-srmv1.8.gz \
-%if %systemd
-  --slave %{_unitdir}/dpm-srmv1.service dpm-srmv1.service \
-	  %{_datadir}/dpm-postgres/dpm-srmv1.service \
-%else
-  --slave %{_initrddir}/dpm-srmv1 dpm-srmv1.init \
-	  %{_sysconfdir}/dpm-postgres/dpm-srmv1.init \
-  --slave %{_sysconfdir}/sysconfig/dpm-srmv1 dpm-srmv1.conf \
-	  %{_sysconfdir}/dpm-postgres/dpm-srmv1.conf \
-%endif
-  --slave %{_sysconfdir}/logrotate.d/dpm-srmv1 dpm-srmv1.logrotate \
-	  %{_sysconfdir}/dpm-postgres/dpm-srmv1.logrotate
-
-%triggerpostun -n dpm-srm-server-postgres -- dpm-postgres-srmv2 < 1.8.1.2-2
-# Restore alternatives removed by dpm-postgres-srmv2 preun
-%{_sbindir}/update-alternatives --install %{_sbindir}/dpm-srmv2 dpm-srmv2 \
-	  %{_libdir}/dpm-postgres/dpm-srmv2 10 \
-  --slave %{_mandir}/man8/dpm-srmv2.8.gz dpm-srmv2.8.gz \
-	  %{_libdir}/dpm-postgres/dpm-srmv2.8.gz \
-%if %systemd
-  --slave %{_unitdir}/dpm-srmv2.service dpm-srmv2.service \
-	  %{_datadir}/dpm-postgres/dpm-srmv2.service \
-%else
-  --slave %{_initrddir}/dpm-srmv2 dpm-srmv2.init \
-	  %{_sysconfdir}/dpm-postgres/dpm-srmv2.init \
-  --slave %{_sysconfdir}/sysconfig/dpm-srmv2 dpm-srmv2.conf \
-	  %{_sysconfdir}/dpm-postgres/dpm-srmv2.conf \
-%endif
-  --slave %{_sysconfdir}/logrotate.d/dpm-srmv2 dpm-srmv2.logrotate \
-	  %{_sysconfdir}/dpm-postgres/dpm-srmv2.logrotate
-
-%triggerpostun -n dpm-srm-server-postgres -- dpm-postgres-srmv2.2 < 1.8.1.2-2
-# Restore alternatives removed by dpm-postgres-srmv22 preun
-%{_sbindir}/update-alternatives --install %{_sbindir}/dpm-srmv2.2 dpm-srmv2.2 \
-	  %{_libdir}/dpm-postgres/dpm-srmv2.2 10 \
-  --slave %{_mandir}/man8/dpm-srmv2.2.8.gz dpm-srmv2.2.8.gz \
-	  %{_libdir}/dpm-postgres/dpm-srmv2.2.8.gz \
-%if %systemd
-  --slave %{_unitdir}/dpm-srmv2.2.service dpm-srmv2.2.service \
-	  %{_datadir}/dpm-postgres/dpm-srmv2.2.service \
-%else
-  --slave %{_initrddir}/dpm-srmv2.2 dpm-srmv2.2.init \
-	  %{_sysconfdir}/dpm-postgres/dpm-srmv2.2.init \
-  --slave %{_sysconfdir}/sysconfig/dpm-srmv2.2 dpm-srmv2.2.conf \
-	  %{_sysconfdir}/dpm-postgres/dpm-srmv2.2.conf \
-%endif
-  --slave %{_sysconfdir}/logrotate.d/dpm-srmv2.2 dpm-srmv2.2.logrotate \
-	  %{_sysconfdir}/dpm-postgres/dpm-srmv2.2.logrotate
-
 %preun -n dpm-srm-server-mysql
 export LANG=C
 
 if [ $1 -eq 0 ]; then
-    if ( %{_sbindir}/update-alternatives --display dpm-srmv1 | \
+    if ( %{_sbindir}/update-alternatives --display srmv1 | \
 	grep currently | grep -q dpm-mysql ) ; then
 %if %systemd
-	/bin/systemctl --no-reload disable dpm-srmv1.service \
+	/bin/systemctl --no-reload disable srmv1.service \
 	    > /dev/null 2>&1 || :
-	/bin/systemctl stop dpm-srmv1.service > /dev/null 2>&1 || :
+	/bin/systemctl stop srmv1.service > /dev/null 2>&1 || :
 %else
-	/sbin/service dpm-srmv1 stop > /dev/null 2>&1 || :
+	/sbin/service srmv1 stop > /dev/null 2>&1 || :
 %endif
     fi
-    %{_sbindir}/update-alternatives --remove dpm-srmv1 \
-	%{_libdir}/dpm-mysql/dpm-srmv1
+    %{_sbindir}/update-alternatives --remove srmv1 \
+	%{_libdir}/dpm-mysql/srmv1
 %if %systemd == 0
-    %{_sbindir}/update-alternatives --display dpm-srmv1 > /dev/null || \
-	/sbin/chkconfig --del dpm-srmv1 > /dev/null 2>&1 || :
+    %{_sbindir}/update-alternatives --display srmv1 > /dev/null || \
+	/sbin/chkconfig --del srmv1 > /dev/null 2>&1 || :
 %endif
 
-    if ( %{_sbindir}/update-alternatives --display dpm-srmv2 | \
+    if ( %{_sbindir}/update-alternatives --display srmv2 | \
 	grep currently | grep -q dpm-mysql ) ; then
 %if %systemd
-	/bin/systemctl --no-reload disable dpm-srmv2.service \
+	/bin/systemctl --no-reload disable srmv2.service \
 	    > /dev/null 2>&1 || :
-	/bin/systemctl stop dpm-srmv2.service > /dev/null 2>&1 || :
+	/bin/systemctl stop srmv2.service > /dev/null 2>&1 || :
 %else
-	/sbin/service dpm-srmv2 stop > /dev/null 2>&1 || :
+	/sbin/service srmv2 stop > /dev/null 2>&1 || :
 %endif
     fi
-    %{_sbindir}/update-alternatives --remove dpm-srmv2 \
-	%{_libdir}/dpm-mysql/dpm-srmv2
+    %{_sbindir}/update-alternatives --remove srmv2 \
+	%{_libdir}/dpm-mysql/srmv2
 %if %systemd == 0
-    %{_sbindir}/update-alternatives --display dpm-srmv2 > /dev/null || \
-	/sbin/chkconfig --del dpm-srmv2 > /dev/null 2>&1 || :
+    %{_sbindir}/update-alternatives --display srmv2 > /dev/null || \
+	/sbin/chkconfig --del srmv2 > /dev/null 2>&1 || :
 %endif
 
-    if ( %{_sbindir}/update-alternatives --display dpm-srmv2.2 | \
+    if ( %{_sbindir}/update-alternatives --display srmv2.2 | \
 	grep currently | grep -q dpm-mysql ) ; then
 %if %systemd
-	/bin/systemctl --no-reload disable dpm-srmv2.2.service \
-	    > /dev/null 2>&1 || :
-	/bin/systemctl stop dpm-srmv2.2.service > /dev/null 2>&1 || :
-%else
-	/sbin/service dpm-srmv2.2 stop > /dev/null 2>&1 || :
-%endif
-    fi
-    %{_sbindir}/update-alternatives --remove dpm-srmv2.2 \
-	%{_libdir}/dpm-mysql/dpm-srmv2.2
-%if %systemd == 0
-    %{_sbindir}/update-alternatives --display dpm-srmv2.2 > /dev/null || \
-	/sbin/chkconfig --del dpm-srmv2.2 > /dev/null 2>&1 || :
-%endif
-fi
-
-%preun -n dpm-srm-server-postgres
-export LANG=C
-
-if [ $1 -eq 0 ]; then
-    if ( %{_sbindir}/update-alternatives --display dpm-srmv1 | \
-	grep currently | grep -q dpm-postgres ) ; then
-%if %systemd
-	/bin/systemctl --no-reload disable dpm-srmv1.service \
-	    > /dev/null 2>&1 || :
-	/bin/systemctl stop dpm-srmv1.service > /dev/null 2>&1 || :
-%else
-	/sbin/service dpm-srmv1 stop > /dev/null 2>&1 || :
-%endif
-    fi
-    %{_sbindir}/update-alternatives --remove dpm-srmv1 \
-	%{_libdir}/dpm-postgres/dpm-srmv1
-%if %systemd == 0
-    %{_sbindir}/update-alternatives --display dpm-srmv1 > /dev/null || \
-	/sbin/chkconfig --del dpm-srmv1 > /dev/null 2>&1 || :
-%endif
-
-    if ( %{_sbindir}/update-alternatives --display dpm-srmv2 | \
-	grep currently | grep -q dpm-postgres ) ; then
-%if %systemd
-	/bin/systemctl --no-reload disable dpm-srmv2.service \
-	    > /dev/null 2>&1 || :
-	/bin/systemctl stop dpm-srmv2.service > /dev/null 2>&1 || :
-%else
-	/sbin/service dpm-srmv2 stop > /dev/null 2>&1 || :
-%endif
-    fi
-    %{_sbindir}/update-alternatives --remove dpm-srmv2 \
-	%{_libdir}/dpm-postgres/dpm-srmv2
-%if %systemd == 0
-    %{_sbindir}/update-alternatives --display dpm-srmv2 > /dev/null || \
-	/sbin/chkconfig --del dpm-srmv2 > /dev/null 2>&1 || :
-%endif
-
-    if ( %{_sbindir}/update-alternatives --display dpm-srmv2.2 | \
-	grep currently | grep -q dpm-postgres ) ; then
-%if %systemd
-	/bin/systemctl --no-reload disable dpm-srmv2.2.service \
+	/bin/systemctl --no-reload disable srmv2.2.service \
 	    > /dev/null 2>&1 || :
-	/bin/systemctl stop dpm-srmv2.2.service > /dev/null 2>&1 || :
+	/bin/systemctl stop srmv2.2.service > /dev/null 2>&1 || :
 %else
-	/sbin/service dpm-srmv2.2 stop > /dev/null 2>&1 || :
+	/sbin/service srmv2.2 stop > /dev/null 2>&1 || :
 %endif
     fi
-    %{_sbindir}/update-alternatives --remove dpm-srmv2.2 \
-	%{_libdir}/dpm-postgres/dpm-srmv2.2
+    %{_sbindir}/update-alternatives --remove srmv2.2 \
+	%{_libdir}/dpm-mysql/srmv2.2
 %if %systemd == 0
-    %{_sbindir}/update-alternatives --display dpm-srmv2.2 > /dev/null || \
-	/sbin/chkconfig --del dpm-srmv2.2 > /dev/null 2>&1 || :
+    %{_sbindir}/update-alternatives --display srmv2.2 > /dev/null || \
+	/sbin/chkconfig --del srmv2.2 > /dev/null 2>&1 || :
 %endif
 fi
 
@@ -3202,62 +1222,30 @@ fi
 export LANG=C
 
 if [ $1 -ge 1 ]; then
-    if ( %{_sbindir}/update-alternatives --display dpm-srmv1 | \
+    if ( %{_sbindir}/update-alternatives --display srmv1 | \
 	grep currently | grep -q dpm-mysql ) ; then
 %if %systemd
-	/bin/systemctl try-restart dpm-srmv1.service > /dev/null 2>&1 || :
+	/bin/systemctl try-restart srmv1.service > /dev/null 2>&1 || :
 %else
-	/sbin/service dpm-srmv1 condrestart > /dev/null 2>&1 || :
+	/sbin/service srmv1 condrestart > /dev/null 2>&1 || :
 %endif
     fi
 
-    if ( %{_sbindir}/update-alternatives --display dpm-srmv2 | \
+    if ( %{_sbindir}/update-alternatives --display srmv2 | \
 	grep currently | grep -q dpm-mysql ) ; then
 %if %systemd
-	/bin/systemctl try-restart dpm-srmv2.service > /dev/null 2>&1 || :
+	/bin/systemctl try-restart srmv2.service > /dev/null 2>&1 || :
 %else
-	/sbin/service dpm-srmv2 condrestart > /dev/null 2>&1 || :
+	/sbin/service srmv2 condrestart > /dev/null 2>&1 || :
 %endif
     fi
 
-    if ( %{_sbindir}/update-alternatives --display dpm-srmv2.2 | \
+    if ( %{_sbindir}/update-alternatives --display srmv2.2 | \
 	grep currently | grep -q dpm-mysql ) ; then
 %if %systemd
-	/bin/systemctl try-restart dpm-srmv2.2.service > /dev/null 2>&1 || :
-%else
-	/sbin/service dpm-srmv2.2 condrestart > /dev/null 2>&1 || :
-%endif
-    fi
-fi
-
-%postun -n dpm-srm-server-postgres
-export LANG=C
-
-if [ $1 -ge 1 ]; then
-    if ( %{_sbindir}/update-alternatives --display dpm-srmv1 | \
-	grep currently | grep -q dpm-postgres ) ; then
-%if %systemd
-	/bin/systemctl try-restart dpm-srmv1.service > /dev/null 2>&1 || :
-%else
-	/sbin/service dpm-srmv1 condrestart > /dev/null 2>&1 || :
-%endif
-    fi
-
-    if ( %{_sbindir}/update-alternatives --display dpm-srmv2 | \
-	grep currently | grep -q dpm-postgres ) ; then
-%if %systemd
-	/bin/systemctl try-restart dpm-srmv2.service > /dev/null 2>&1 || :
-%else
-	/sbin/service dpm-srmv2 condrestart > /dev/null 2>&1 || :
-%endif
-    fi
-
-    if ( %{_sbindir}/update-alternatives --display dpm-srmv2.2 | \
-	grep currently | grep -q dpm-postgres ) ; then
-%if %systemd
-	/bin/systemctl try-restart dpm-srmv2.2.service > /dev/null 2>&1 || :
+	/bin/systemctl try-restart srmv2.2.service > /dev/null 2>&1 || :
 %else
-	/sbin/service dpm-srmv2.2 condrestart > /dev/null 2>&1 || :
+	/sbin/service srmv2.2 condrestart > /dev/null 2>&1 || :
 %endif
     fi
 fi
@@ -3265,9 +1253,9 @@ fi
 %post -n dpm-rfio-server
 %if %systemd
 # Clean up pre-systemd config
-if [ -r %{_initrddir}/dpm-rfiod ] ; then
-    /sbin/service dpm-rfiod stop > /dev/null 2>&1 || :
-    /sbin/chkconfig --del dpm-rfiod > /dev/null 2>&1 || :
+if [ -r %{_initrddir}/rfiod ] ; then
+    /sbin/service rfiod stop > /dev/null 2>&1 || :
+    /sbin/chkconfig --del rfiod > /dev/null 2>&1 || :
 fi
 %endif
 
@@ -3275,37 +1263,36 @@ if [ $1 -eq 1 ]; then
 %if %systemd
     /bin/systemctl daemon-reload > /dev/null 2>&1 || :
 %else
-    /sbin/chkconfig --add dpm-rfiod
+    /sbin/chkconfig --add rfiod
 %endif
 fi
 
 %preun -n dpm-rfio-server
 if [ $1 -eq 0 ]; then
 %if %systemd
-    /bin/systemctl --no-reload disable dpm-rfiod.service > /dev/null 2>&1 || :
-    /bin/systemctl stop dpm-rfiod.service > /dev/null 2>&1 || :
+    /bin/systemctl --no-reload disable rfiod.service > /dev/null 2>&1 || :
+    /bin/systemctl stop rfiod.service > /dev/null 2>&1 || :
 %else
-    /sbin/service dpm-rfiod stop > /dev/null 2>&1 || :
-    /sbin/chkconfig --del dpm-rfiod
+    /sbin/service rfiod stop > /dev/null 2>&1 || :
+    /sbin/chkconfig --del rfiod
 %endif
 fi
 
 %postun -n dpm-rfio-server
 if [ $1 -ge 1 ]; then
 %if %systemd
-    /bin/systemctl try-restart dpm-rfiod.service > /dev/null 2>&1 || :
+    /bin/systemctl try-restart rfiod.service > /dev/null 2>&1 || :
 %else
-    /sbin/service dpm-rfiod condrestart > /dev/null 2>&1 || :
+    /sbin/service rfiod condrestart > /dev/null 2>&1 || :
 %endif
 fi
 
 %files libs
 %defattr(-,root,root,-)
 %{_libdir}/liblcgdm.so.*
-%dir %{_libdir}/%{name}
-%{_libdir}/%{name}/libCsec_plugin_GSI.so
-%{_libdir}/%{name}/libCsec_plugin_ID.so
-%doc lfc-mysql/%{name}-%{version}/LICENSE
+%{_libdir}/libCsec_plugin_GSI.so
+%{_libdir}/libCsec_plugin_ID.so
+%doc lfc-mysql/%{name}-%{version}/README lfc-mysql/%{name}-%{version}/LICENSE
 
 %files devel
 %defattr(-,root,root,-)
@@ -3321,7 +1308,6 @@ fi
 %files -n lfc-libs
 %defattr(-,root,root,-)
 %{_libdir}/liblfc.so.*
-%doc lfc-mysql/%{name}-%{version}/doc/lfc/README
 
 %files -n lfc-devel
 %defattr(-,root,root,-)
@@ -3378,15 +1364,15 @@ fi
 %ghost %{_sbindir}/lfcdaemon
 %{_libdir}/lfc-mysql/lfc-shutdown
 %ghost %{_sbindir}/lfc-shutdown
-%dir %{_datadir}/lfc-mysql
-%{_datadir}/lfc-mysql/NSCONFIG.templ
-%ghost %{_datadir}/lfc/NSCONFIG.templ
+%{_libdir}/lfc-mysql/NSCONFIG.templ
+%ghost %{_datadir}/lcgdm/NSCONFIG.templ
 %doc %{_libdir}/lfc-mysql/lfcdaemon.8*
 %ghost %{_mandir}/man8/lfcdaemon.8*
 %doc %{_libdir}/lfc-mysql/lfc-shutdown.8*
 %ghost %{_mandir}/man8/lfc-shutdown.8*
 %dir %{_sysconfdir}/lfc-mysql
 %if %systemd
+%dir %{_datadir}/lfc-mysql
 %{_datadir}/lfc-mysql/lfcdaemon.service
 %ghost %{_unitdir}/lfcdaemon.service
 %else
@@ -3397,47 +1383,7 @@ fi
 %endif
 %config(noreplace) %{_sysconfdir}/lfc-mysql/lfcdaemon.logrotate
 %ghost %{_sysconfdir}/logrotate.d/lfcdaemon
-%dir %{_datadir}/lfc
-%{_datadir}/lfc/create_lfc_tables_mysql.sql
-%attr(-,lfcmgr,lfcmgr) %{_localstatedir}/log/lfc
-%attr(-,lfcmgr,lfcmgr) %{_localstatedir}/lib/lfc
-%dir %{_sysconfdir}/grid-security
-%dir %{_sysconfdir}/grid-security/lfcmgr
-%doc lfc-mysql/%{name}-%{version}/ns/README.Fedora
-
-%files -n lfc-server-postgres
-%defattr(-,root,root,-)
-%dir %{_libdir}/lfc-postgres
-%{_libdir}/lfc-postgres/lfcdaemon
-%ghost %{_sbindir}/lfcdaemon
-%{_libdir}/lfc-postgres/lfc-shutdown
-%ghost %{_sbindir}/lfc-shutdown
-%dir %{_datadir}/lfc-postgres
-%{_datadir}/lfc-postgres/NSCONFIG.templ
-%ghost %{_datadir}/lfc/NSCONFIG.templ
-%doc %{_libdir}/lfc-postgres/lfcdaemon.8*
-%ghost %{_mandir}/man8/lfcdaemon.8*
-%doc %{_libdir}/lfc-postgres/lfc-shutdown.8*
-%ghost %{_mandir}/man8/lfc-shutdown.8*
-%dir %{_sysconfdir}/lfc-postgres
-%if %systemd
-%{_datadir}/lfc-postgres/lfcdaemon.service
-%ghost %{_unitdir}/lfcdaemon.service
-%else
-%{_sysconfdir}/lfc-postgres/lfcdaemon.init
-%ghost %{_initrddir}/lfcdaemon
-%config(noreplace) %{_sysconfdir}/lfc-postgres/lfcdaemon.conf
-%ghost %{_sysconfdir}/sysconfig/lfcdaemon
-%endif
-%config(noreplace) %{_sysconfdir}/lfc-postgres/lfcdaemon.logrotate
-%ghost %{_sysconfdir}/logrotate.d/lfcdaemon
-%dir %{_datadir}/lfc
-%{_datadir}/lfc/create_lfc_tables_postgres.sql
-%attr(-,lfcmgr,lfcmgr) %{_localstatedir}/log/lfc
-%attr(-,lfcmgr,lfcmgr) %{_localstatedir}/lib/lfc
-%dir %{_sysconfdir}/grid-security
-%dir %{_sysconfdir}/grid-security/lfcmgr
-%doc lfc-postgres/%{name}-%{version}/ns/README.Fedora
+%doc %{_datadir}/lcgdm/create_lfc_tables_mysql.sql
 
 %files -n lfc-dli
 %defattr(-,root,root,-)
@@ -3450,15 +1396,11 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/lfc-dli
 %endif
 %config(noreplace) %{_sysconfdir}/logrotate.d/lfc-dli
-%dir %{_datadir}/lfc
-%{_datadir}/lfc/lcg-info-provider-lfc
-%attr(-,lfcmgr,lfcmgr) %{_localstatedir}/log/lfc-dli
-%attr(-,lfcmgr,lfcmgr) %{_localstatedir}/lib/lfc
+%{_libexecdir}/lcg-info-provider-lfc
 
 %files -n dpm-libs
 %defattr(-,root,root,-)
 %{_libdir}/libdpm.so.*
-%doc dpm-mysql/%{name}-%{version}/dpm/README
 
 %files -n dpm-devel
 %defattr(-,root,root,-)
@@ -3526,11 +1468,11 @@ fi
 %ghost %{_mandir}/man8/dpm-shutdown.8*
 %doc %{_libdir}/dpm-mysql/dpm-buildfsv.8*
 %ghost %{_mandir}/man8/dpm-buildfsv.8*
-%dir %{_datadir}/dpm-mysql
-%{_datadir}/dpm-mysql/DPMCONFIG.templ
-%ghost %{_datadir}/dpm/DPMCONFIG.templ
+%{_libdir}/dpm-mysql/DPMCONFIG.templ
+%ghost %{_datadir}/lcgdm/DPMCONFIG.templ
 %dir %{_sysconfdir}/dpm-mysql
 %if %systemd
+%dir %{_datadir}/dpm-mysql
 %{_datadir}/dpm-mysql/dpm.service
 %ghost %{_unitdir}/dpm.service
 %else
@@ -3541,55 +1483,10 @@ fi
 %endif
 %config(noreplace) %{_sysconfdir}/dpm-mysql/dpm.logrotate
 %ghost %{_sysconfdir}/logrotate.d/dpm
-%dir %{_datadir}/dpm
-%{_datadir}/dpm/create_dpm_tables_mysql.sql
-%attr(-,dpmmgr,dpmmgr) %{_localstatedir}/log/dpm
-%attr(-,dpmmgr,dpmmgr) %{_localstatedir}/lib/dpm
-%dir %{_sysconfdir}/grid-security
-%dir %{_sysconfdir}/grid-security/dpmmgr
-%doc dpm-mysql/%{name}-%{version}/dpm/README.Fedora
-
-%files -n dpm-server-postgres
-%defattr(-,root,root,-)
-%dir %{_libdir}/dpm-postgres
-%{_libdir}/dpm-postgres/dpm
-%ghost %{_sbindir}/dpm
-%{_libdir}/dpm-postgres/dpm-shutdown
-%ghost %{_sbindir}/dpm-shutdown
-%{_libdir}/dpm-postgres/dpm-buildfsv
-%ghost %{_sbindir}/dpm-buildfsv
-%doc %{_libdir}/dpm-postgres/dpm.8*
-%ghost %{_mandir}/man8/dpm.8*
-%doc %{_libdir}/dpm-postgres/dpm-shutdown.8*
-%ghost %{_mandir}/man8/dpm-shutdown.8*
-%doc %{_libdir}/dpm-postgres/dpm-buildfsv.8*
-%ghost %{_mandir}/man8/dpm-buildfsv.8*
-%dir %{_datadir}/dpm-postgres
-%{_datadir}/dpm-postgres/DPMCONFIG.templ
-%ghost %{_datadir}/dpm/DPMCONFIG.templ
-%dir %{_sysconfdir}/dpm-postgres
-%if %systemd
-%{_datadir}/dpm-postgres/dpm.service
-%ghost %{_unitdir}/dpm.service
-%else
-%{_sysconfdir}/dpm-postgres/dpm.init
-%ghost %{_initrddir}/dpm
-%config(noreplace) %{_sysconfdir}/dpm-postgres/dpm.conf
-%ghost %{_sysconfdir}/sysconfig/dpm
-%endif
-%config(noreplace) %{_sysconfdir}/dpm-postgres/dpm.logrotate
-%ghost %{_sysconfdir}/logrotate.d/dpm
-%dir %{_datadir}/dpm
-%{_datadir}/dpm/create_dpm_tables_postgres.sql
-%attr(-,dpmmgr,dpmmgr) %{_localstatedir}/log/dpm
-%attr(-,dpmmgr,dpmmgr) %{_localstatedir}/lib/dpm
-%dir %{_sysconfdir}/grid-security
-%dir %{_sysconfdir}/grid-security/dpmmgr
-%doc dpm-postgres/%{name}-%{version}/dpm/README.Fedora
+%{_datadir}/lcgdm/create_dpm_tables_mysql.sql
 
 %files -n dpm-name-server-mysql
 %defattr(-,root,root,-)
-%dir %{_libdir}/dpm-mysql
 %{_libdir}/dpm-mysql/dpnsdaemon
 %ghost %{_sbindir}/dpnsdaemon
 %{_libdir}/dpm-mysql/dpns-shutdown
@@ -3598,11 +1495,10 @@ fi
 %ghost %{_mandir}/man8/dpnsdaemon.8*
 %doc %{_libdir}/dpm-mysql/dpns-shutdown.8*
 %ghost %{_mandir}/man8/dpns-shutdown.8*
-%dir %{_datadir}/dpm-mysql
-%{_datadir}/dpm-mysql/DPNSCONFIG.templ
-%ghost %{_datadir}/dpm/DPNSCONFIG.templ
-%dir %{_sysconfdir}/dpm-mysql
+%{_libdir}/dpm-mysql/NSCONFIG.templ
+%ghost %{_datadir}/lcgdm/NSCONFIG.templ
 %if %systemd
+%dir %{_datadir}/dpm-mysql
 %{_datadir}/dpm-mysql/dpnsdaemon.service
 %ghost %{_unitdir}/dpnsdaemon.service
 %else
@@ -3613,56 +1509,14 @@ fi
 %endif
 %config(noreplace) %{_sysconfdir}/dpm-mysql/dpnsdaemon.logrotate
 %ghost %{_sysconfdir}/logrotate.d/dpnsdaemon
-%dir %{_datadir}/dpm
-%{_datadir}/dpm/create_dpns_tables_mysql.sql
-%attr(-,dpmmgr,dpmmgr) %{_localstatedir}/log/dpns
-%attr(-,dpmmgr,dpmmgr) %{_localstatedir}/lib/dpm
-%dir %{_sysconfdir}/grid-security
-%dir %{_sysconfdir}/grid-security/dpmmgr
-%doc dpm-mysql/%{name}-%{version}/ns/README.Fedora
-
-%files -n dpm-name-server-postgres
-%defattr(-,root,root,-)
-%dir %{_libdir}/dpm-postgres
-%{_libdir}/dpm-postgres/dpnsdaemon
-%ghost %{_sbindir}/dpnsdaemon
-%{_libdir}/dpm-postgres/dpns-shutdown
-%ghost %{_sbindir}/dpns-shutdown
-%doc %{_libdir}/dpm-postgres/dpnsdaemon.8*
-%ghost %{_mandir}/man8/dpnsdaemon.8*
-%doc %{_libdir}/dpm-postgres/dpns-shutdown.8*
-%ghost %{_mandir}/man8/dpns-shutdown.8*
-%dir %{_datadir}/dpm-postgres
-%{_datadir}/dpm-postgres/DPNSCONFIG.templ
-%ghost %{_datadir}/dpm/DPNSCONFIG.templ
-%dir %{_sysconfdir}/dpm-postgres
-%if %systemd
-%{_datadir}/dpm-postgres/dpnsdaemon.service
-%ghost %{_unitdir}/dpnsdaemon.service
-%else
-%{_sysconfdir}/dpm-postgres/dpnsdaemon.init
-%ghost %{_initrddir}/dpnsdaemon
-%config(noreplace) %{_sysconfdir}/dpm-postgres/dpnsdaemon.conf
-%ghost %{_sysconfdir}/sysconfig/dpnsdaemon
-%endif
-%config(noreplace) %{_sysconfdir}/dpm-postgres/dpnsdaemon.logrotate
-%ghost %{_sysconfdir}/logrotate.d/dpnsdaemon
-%dir %{_datadir}/dpm
-%{_datadir}/dpm/create_dpns_tables_postgres.sql
-%attr(-,dpmmgr,dpmmgr) %{_localstatedir}/log/dpns
-%attr(-,dpmmgr,dpmmgr) %{_localstatedir}/lib/dpm
-%dir %{_sysconfdir}/grid-security
-%dir %{_sysconfdir}/grid-security/dpmmgr
-%doc dpm-postgres/%{name}-%{version}/ns/README.Fedora
+%{_datadir}/lcgdm/create_dpns_tables_mysql.sql
 
 %files -n dpm-copy-server-mysql
 %defattr(-,root,root,-)
-%dir %{_libdir}/dpm-mysql
 %{_libdir}/dpm-mysql/dpmcopyd
 %ghost %{_sbindir}/dpmcopyd
 %doc %{_libdir}/dpm-mysql/dpmcopyd.8*
 %ghost %{_mandir}/man8/dpmcopyd.8*
-%dir %{_sysconfdir}/dpm-mysql
 %if %systemd
 %dir %{_datadir}/dpm-mysql
 %{_datadir}/dpm-mysql/dpmcopyd.service
@@ -3675,152 +1529,69 @@ fi
 %endif
 %config(noreplace) %{_sysconfdir}/dpm-mysql/dpmcopyd.logrotate
 %ghost %{_sysconfdir}/logrotate.d/dpmcopyd
-%attr(-,dpmmgr,dpmmgr) %{_localstatedir}/log/dpmcopy
-%attr(-,dpmmgr,dpmmgr) %{_localstatedir}/lib/dpm
-%dir %{_sysconfdir}/grid-security
-%dir %{_sysconfdir}/grid-security/dpmmgr
-
-%files -n dpm-copy-server-postgres
-%defattr(-,root,root,-)
-%dir %{_libdir}/dpm-postgres
-%{_libdir}/dpm-postgres/dpmcopyd
-%ghost %{_sbindir}/dpmcopyd
-%doc %{_libdir}/dpm-postgres/dpmcopyd.8*
-%ghost %{_mandir}/man8/dpmcopyd.8*
-%dir %{_sysconfdir}/dpm-postgres
-%if %systemd
-%dir %{_datadir}/dpm-postgres
-%{_datadir}/dpm-postgres/dpmcopyd.service
-%ghost %{_unitdir}/dpmcopyd.service
-%else
-%{_sysconfdir}/dpm-postgres/dpmcopyd.init
-%ghost %{_initrddir}/dpmcopyd
-%config(noreplace) %{_sysconfdir}/dpm-postgres/dpmcopyd.conf
-%ghost %{_sysconfdir}/sysconfig/dpmcopyd
-%endif
-%config(noreplace) %{_sysconfdir}/dpm-postgres/dpmcopyd.logrotate
-%ghost %{_sysconfdir}/logrotate.d/dpmcopyd
-%attr(-,dpmmgr,dpmmgr) %{_localstatedir}/log/dpmcopy
-%attr(-,dpmmgr,dpmmgr) %{_localstatedir}/lib/dpm
-%dir %{_sysconfdir}/grid-security
-%dir %{_sysconfdir}/grid-security/dpmmgr
 
 %files -n dpm-srm-server-mysql
 %defattr(-,root,root,-)
-%dir %{_libdir}/dpm-mysql
-%{_libdir}/dpm-mysql/dpm-srmv1
-%{_libdir}/dpm-mysql/dpm-srmv2
-%{_libdir}/dpm-mysql/dpm-srmv2.2
-%ghost %{_sbindir}/dpm-srmv1
-%ghost %{_sbindir}/dpm-srmv2
-%ghost %{_sbindir}/dpm-srmv2.2
-%doc %{_libdir}/dpm-mysql/dpm-srmv1.8*
-%doc %{_libdir}/dpm-mysql/dpm-srmv2.8*
-%doc %{_libdir}/dpm-mysql/dpm-srmv2.2.8*
-%ghost %{_mandir}/man8/dpm-srmv1.8*
-%ghost %{_mandir}/man8/dpm-srmv2.8*
-%ghost %{_mandir}/man8/dpm-srmv2.2.8*
-%dir %{_sysconfdir}/dpm-mysql
+%{_libdir}/dpm-mysql/srmv1
+%{_libdir}/dpm-mysql/srmv2
+%{_libdir}/dpm-mysql/srmv2.2
+%ghost %{_sbindir}/srmv1
+%ghost %{_sbindir}/srmv2
+%ghost %{_sbindir}/srmv2.2
+%doc %{_libdir}/dpm-mysql/srmv1.8*
+%doc %{_libdir}/dpm-mysql/srmv2.8*
+%doc %{_libdir}/dpm-mysql/srmv2.2.8*
+%ghost %{_mandir}/man8/srmv1.8*
+%ghost %{_mandir}/man8/srmv2.8*
+%ghost %{_mandir}/man8/srmv2.2.8*
 %if %systemd
 %dir %{_datadir}/dpm-mysql
-%{_datadir}/dpm-mysql/dpm-srmv1.service
-%{_datadir}/dpm-mysql/dpm-srmv2.service
-%{_datadir}/dpm-mysql/dpm-srmv2.2.service
-%ghost %{_unitdir}/dpm-srmv1.service
-%ghost %{_unitdir}/dpm-srmv2.service
-%ghost %{_unitdir}/dpm-srmv2.2.service
-%else
-%{_sysconfdir}/dpm-mysql/dpm-srmv1.init
-%{_sysconfdir}/dpm-mysql/dpm-srmv2.init
-%{_sysconfdir}/dpm-mysql/dpm-srmv2.2.init
-%ghost %{_initrddir}/dpm-srmv1
-%ghost %{_initrddir}/dpm-srmv2
-%ghost %{_initrddir}/dpm-srmv2.2
-%config(noreplace) %{_sysconfdir}/dpm-mysql/dpm-srmv1.conf
-%config(noreplace) %{_sysconfdir}/dpm-mysql/dpm-srmv2.conf
-%config(noreplace) %{_sysconfdir}/dpm-mysql/dpm-srmv2.2.conf
-%ghost %{_sysconfdir}/sysconfig/dpm-srmv1
-%ghost %{_sysconfdir}/sysconfig/dpm-srmv2
-%ghost %{_sysconfdir}/sysconfig/dpm-srmv2.2
-%endif
-%config(noreplace) %{_sysconfdir}/dpm-mysql/dpm-srmv1.logrotate
-%config(noreplace) %{_sysconfdir}/dpm-mysql/dpm-srmv2.logrotate
-%config(noreplace) %{_sysconfdir}/dpm-mysql/dpm-srmv2.2.logrotate
-%ghost %{_sysconfdir}/logrotate.d/dpm-srmv1
-%ghost %{_sysconfdir}/logrotate.d/dpm-srmv2
-%ghost %{_sysconfdir}/logrotate.d/dpm-srmv2.2
-%attr(-,dpmmgr,dpmmgr) %{_localstatedir}/log/dpm-srmv1
-%attr(-,dpmmgr,dpmmgr) %{_localstatedir}/log/dpm-srmv2
-%attr(-,dpmmgr,dpmmgr) %{_localstatedir}/log/dpm-srmv2.2
-%attr(-,dpmmgr,dpmmgr) %{_localstatedir}/lib/dpm
-%dir %{_sysconfdir}/grid-security
-%dir %{_sysconfdir}/grid-security/dpmmgr
-
-%files -n dpm-srm-server-postgres
-%defattr(-,root,root,-)
-%dir %{_libdir}/dpm-postgres
-%{_libdir}/dpm-postgres/dpm-srmv1
-%{_libdir}/dpm-postgres/dpm-srmv2
-%{_libdir}/dpm-postgres/dpm-srmv2.2
-%ghost %{_sbindir}/dpm-srmv1
-%ghost %{_sbindir}/dpm-srmv2
-%ghost %{_sbindir}/dpm-srmv2.2
-%doc %{_libdir}/dpm-postgres/dpm-srmv1.8*
-%doc %{_libdir}/dpm-postgres/dpm-srmv2.8*
-%doc %{_libdir}/dpm-postgres/dpm-srmv2.2.8*
-%ghost %{_mandir}/man8/dpm-srmv1.8*
-%ghost %{_mandir}/man8/dpm-srmv2.8*
-%ghost %{_mandir}/man8/dpm-srmv2.2.8*
-%dir %{_sysconfdir}/dpm-postgres
-%if %systemd
-%dir %{_datadir}/dpm-postgres
-%{_datadir}/dpm-postgres/dpm-srmv1.service
-%{_datadir}/dpm-postgres/dpm-srmv2.service
-%{_datadir}/dpm-postgres/dpm-srmv2.2.service
-%ghost %{_unitdir}/dpm-srmv1.service
-%ghost %{_unitdir}/dpm-srmv2.service
-%ghost %{_unitdir}/dpm-srmv2.2.service
-%else
-%{_sysconfdir}/dpm-postgres/dpm-srmv1.init
-%{_sysconfdir}/dpm-postgres/dpm-srmv2.init
-%{_sysconfdir}/dpm-postgres/dpm-srmv2.2.init
-%ghost %{_initrddir}/dpm-srmv1
-%ghost %{_initrddir}/dpm-srmv2
-%ghost %{_initrddir}/dpm-srmv2.2
-%config(noreplace) %{_sysconfdir}/dpm-postgres/dpm-srmv1.conf
-%config(noreplace) %{_sysconfdir}/dpm-postgres/dpm-srmv2.conf
-%config(noreplace) %{_sysconfdir}/dpm-postgres/dpm-srmv2.2.conf
-%ghost %{_sysconfdir}/sysconfig/dpm-srmv1
-%ghost %{_sysconfdir}/sysconfig/dpm-srmv2
-%ghost %{_sysconfdir}/sysconfig/dpm-srmv2.2
-%endif
-%config(noreplace) %{_sysconfdir}/dpm-postgres/dpm-srmv1.logrotate
-%config(noreplace) %{_sysconfdir}/dpm-postgres/dpm-srmv2.logrotate
-%config(noreplace) %{_sysconfdir}/dpm-postgres/dpm-srmv2.2.logrotate
-%ghost %{_sysconfdir}/logrotate.d/dpm-srmv1
-%ghost %{_sysconfdir}/logrotate.d/dpm-srmv2
-%ghost %{_sysconfdir}/logrotate.d/dpm-srmv2.2
-%attr(-,dpmmgr,dpmmgr) %{_localstatedir}/log/dpm-srmv1
-%attr(-,dpmmgr,dpmmgr) %{_localstatedir}/log/dpm-srmv2
-%attr(-,dpmmgr,dpmmgr) %{_localstatedir}/log/dpm-srmv2.2
-%attr(-,dpmmgr,dpmmgr) %{_localstatedir}/lib/dpm
-%dir %{_sysconfdir}/grid-security
-%dir %{_sysconfdir}/grid-security/dpmmgr
+%{_datadir}/dpm-mysql/srmv1.service
+%{_datadir}/dpm-mysql/srmv2.service
+%{_datadir}/dpm-mysql/srmv2.2.service
+%ghost %{_unitdir}/srmv1.service
+%ghost %{_unitdir}/srmv2.service
+%ghost %{_unitdir}/srmv2.2.service
+%else
+%{_sysconfdir}/dpm-mysql/srmv1.init
+%{_sysconfdir}/dpm-mysql/srmv2.init
+%{_sysconfdir}/dpm-mysql/srmv2.2.init
+%ghost %{_initrddir}/srmv1
+%ghost %{_initrddir}/srmv2
+%ghost %{_initrddir}/srmv2.2
+%config(noreplace) %{_sysconfdir}/dpm-mysql/srmv1.conf
+%config(noreplace) %{_sysconfdir}/dpm-mysql/srmv2.conf
+%config(noreplace) %{_sysconfdir}/dpm-mysql/srmv2.2.conf
+%ghost %{_sysconfdir}/sysconfig/srmv1
+%ghost %{_sysconfdir}/sysconfig/srmv2
+%ghost %{_sysconfdir}/sysconfig/srmv2.2
+%endif
+%config(noreplace) %{_sysconfdir}/dpm-mysql/srmv1.logrotate
+%config(noreplace) %{_sysconfdir}/dpm-mysql/srmv2.logrotate
+%config(noreplace) %{_sysconfdir}/dpm-mysql/srmv2.2.logrotate
+%ghost %{_sysconfdir}/logrotate.d/srmv1
+%ghost %{_sysconfdir}/logrotate.d/srmv2
+%ghost %{_sysconfdir}/logrotate.d/srmv2.2
 
 %files -n dpm-rfio-server
 %defattr(-,root,root,-)
-%{_sbindir}/dpm-rfiod
+%{_sbindir}/rfiod
 %if %systemd
-%{_unitdir}/dpm-rfiod.service
+%{_unitdir}/rfiod.service
 %else
-%{_initrddir}/dpm-rfiod
-%config(noreplace) %{_sysconfdir}/sysconfig/dpm-rfiod
+%{_initrddir}/rfiod
+%config(noreplace) %{_sysconfdir}/sysconfig/rfiod
 %endif
-%config(noreplace) %{_sysconfdir}/logrotate.d/dpm-rfiod
-%{_localstatedir}/log/dpm-rfio
-%doc %{_mandir}/man8/dpm-rfiod.8*
+%config(noreplace) %{_sysconfdir}/logrotate.d/rfiod
+%doc %{_mandir}/man8/rfiod.8*
 
 %changelog
+* 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)
+- Removed configuration bits from the spec file (incomplete)
+- Renamed dpm-srm* to srm*, dpm-rfiod to rfiod (using alternatives)
+
 * Tue Feb 28 2012 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.8.2-3
 - Convert to systemd (Fedora 17+)
 - Rebuild for new gsoap (Fedora 17+)
diff --git a/sources b/sources
index 2b4828e..c57b638 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-f1125c6bc0edf6a6215a9f00172794eb  lcgdm-1.8.2.tar.gz
+6caf719559e5a708d45d934c668195c8  lcgdm-1.8.3.1.tar.gz
 2e8831fa908ac8a82ab47289628924d0  lcgdm-unitfiles.tar.gz


More information about the scm-commits mailing list