[lcgdm] Restore EPEL compatibility

Mattias Ellert ellert at fedoraproject.org
Mon Jun 20 12:45:30 UTC 2011


commit 323b063e82c485461175dffd6fd1ba417c0c781e
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Mon Jun 20 14:43:33 2011 +0200

    Restore EPEL compatibility

 lcgdm.spec |   37 ++++++++++++++++++++++++++++++++++++-
 1 files changed, 36 insertions(+), 1 deletions(-)
---
diff --git a/lcgdm.spec b/lcgdm.spec
index f609816..aaac189 100644
--- a/lcgdm.spec
+++ b/lcgdm.spec
@@ -74,6 +74,7 @@ Patch9:		%{name}-usr.patch
 Patch10:	%{name}-dlopen.patch
 #		Use Fedora's imake instead of bundled version
 Patch11:	%{name}-imake.patch
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if %{?fedora}%{!?fedora:0} >= 5 || %{?rhel}%{!?rhel:0} >= 5
 BuildRequires:	imake
@@ -760,6 +761,8 @@ popd
 %endif
 
 %install
+rm -rf ${RPM_BUILD_ROOT}
+
 pushd lfc-mysql/%{name}-%{version}
 
 make prefix=${RPM_BUILD_ROOT}%{_prefix} install
@@ -1466,6 +1469,9 @@ install %{altpython}/*.so ${RPM_BUILD_ROOT}%{altpython_sitearch}
 %endif
 %endif
 
+%clean
+rm -rf ${RPM_BUILD_ROOT}
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -2262,6 +2268,7 @@ if [ $1 -ge 1 ]; then
 fi
 
 %files
+%defattr(-,root,root,-)
 %{_libdir}/liblcgdm.so.*
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/libCsec_plugin_GSI.so
@@ -2270,6 +2277,7 @@ fi
 %doc lfc-mysql/%{name}-%{version}/LICENSE
 
 %files devel
+%defattr(-,root,root,-)
 %{_libdir}/liblcgdm.so
 %doc %{_mandir}/man3/C*.3*
 %doc %{_mandir}/man3/getconfent.3*
@@ -2280,10 +2288,12 @@ fi
 %doc %{_mandir}/man4/Castor_limits.4*
 
 %files -n lfc
+%defattr(-,root,root,-)
 %{_libdir}/liblfc.so.*
 %doc lfc-mysql/%{name}-%{version}/doc/lfc/README
 
 %files -n lfc-devel
+%defattr(-,root,root,-)
 %{_includedir}/lfc
 %{_libdir}/liblfc.so
 %doc %{_mandir}/man3/lfc_[a-o]*.3*
@@ -2291,15 +2301,18 @@ fi
 %doc %{_mandir}/man3/lfc_[q-z]*.3*
 
 %files -n lfc-client
+%defattr(-,root,root,-)
 %{_bindir}/lfc-*
 %doc %{_mandir}/man1/lfc-*
 
 %files -n lfc-perl
+%defattr(-,root,root,-)
 %{perl_vendorarch}/lfc.so
 %{perl_vendorarch}/lfc.pm
 %doc %{_mandir}/man3/lfc_perl.3*
 
 %files -n lfc-python
+%defattr(-,root,root,-)
 %{python_sitearch}/_lfc.so
 %{python_sitearch}/lfc.py*
 %{python_sitearch}/_lfcthr.so
@@ -2313,6 +2326,7 @@ fi
 
 %if %{?altpython:1}%{!?altpython:0}
 %files -n lfc-%{altpython}
+%defattr(-,root,root,-)
 %{altpython_sitearch}/_lfc.*so
 %{altpython_sitearch}/lfc.py*
 %{altpython_sitearch}/_lfcthr.*so
@@ -2327,6 +2341,7 @@ fi
 %endif
 
 %files -n lfc-mysql
+%defattr(-,root,root,-)
 %dir %{_libdir}/lfc-mysql
 %{_libdir}/lfc-mysql/lfcdaemon
 %ghost %{_sbindir}/lfcdaemon
@@ -2353,6 +2368,7 @@ fi
 %doc lfc-mysql/%{name}-%{version}/ns/README.Fedora
 
 %files -n lfc-dli
+%defattr(-,root,root,-)
 %{_sbindir}/lfc-dli
 %doc %{_mandir}/man8/lfc-dli.8*
 %{_initrddir}/lfc-dli
@@ -2362,6 +2378,7 @@ fi
 %attr(-,lfcmgr,lfcmgr) %{_localstatedir}/log/lfc-dli
 
 %files -n lfc-postgres
+%defattr(-,root,root,-)
 %dir %{_libdir}/lfc-postgres
 %{_libdir}/lfc-postgres/lfcdaemon
 %ghost %{_sbindir}/lfcdaemon
@@ -2388,10 +2405,12 @@ fi
 %doc lfc-postgres/%{name}-%{version}/ns/README.Fedora
 
 %files -n dpm
+%defattr(-,root,root,-)
 %{_libdir}/libdpm.so.*
 %doc dpm-mysql/%{name}-%{version}/dpm/README
 
 %files -n dpm-devel
+%defattr(-,root,root,-)
 %{_includedir}/dpm
 %{_libdir}/libdpm.so
 %doc %{_mandir}/man3/dpm_[a-o]*.3*
@@ -2403,6 +2422,7 @@ fi
 %doc %{_mandir}/man3/rfio*.3*
 
 %files -n dpm-client
+%defattr(-,root,root,-)
 %{_bindir}/dpm-[a-k]*
 %{_bindir}/dpm-[m-z]*
 %{_bindir}/dpns-*
@@ -2413,10 +2433,12 @@ fi
 %doc %{_mandir}/man1/rf*
 
 %files -n dpm-perl
+%defattr(-,root,root,-)
 %{perl_vendorarch}/dpm.so
 %{perl_vendorarch}/dpm.pm
 
 %files -n dpm-python
+%defattr(-,root,root,-)
 %{_bindir}/dpm-listspaces
 %{python_sitearch}/_dpm.so
 %{python_sitearch}/dpm.py*
@@ -2428,6 +2450,7 @@ fi
 
 %if %{?altpython:1}%{!?altpython:0}
 %files -n dpm-%{altpython}
+%defattr(-,root,root,-)
 %{altpython_sitearch}/_dpm.*so
 %{altpython_sitearch}/dpm.py*
 %{altpython_sitearch}/_dpm2.*so
@@ -2438,6 +2461,7 @@ fi
 %endif
 
 %files -n dpm-mysql
+%defattr(-,root,root,-)
 %dir %{_libdir}/dpm-mysql
 %{_libdir}/dpm-mysql/dpm
 %ghost %{_sbindir}/dpm
@@ -2464,6 +2488,7 @@ fi
 %doc dpm-mysql/%{name}-%{version}/dpm/README.Fedora
 
 %files -n dpm-mysql-nameserver
+%defattr(-,root,root,-)
 %{_libdir}/dpm-mysql/dpnsdaemon
 %ghost %{_sbindir}/dpnsdaemon
 %{_libdir}/dpm-mysql/dpns-shutdown
@@ -2484,6 +2509,7 @@ fi
 %doc dpm-mysql/%{name}-%{version}/ns/README.Fedora
 
 %files -n dpm-mysql-copyd
+%defattr(-,root,root,-)
 %{_libdir}/dpm-mysql/dpmcopyd
 %ghost %{_sbindir}/dpmcopyd
 %doc %{_libdir}/dpm-mysql/dpmcopyd.8*
@@ -2496,6 +2522,7 @@ fi
 %attr(-,dpmmgr,dpmmgr) %{_localstatedir}/log/dpmcopy
 
 %files -n dpm-mysql-srmv1
+%defattr(-,root,root,-)
 %{_libdir}/dpm-mysql/dpm-srmv1
 %ghost %{_sbindir}/dpm-srmv1
 %doc %{_libdir}/dpm-mysql/dpm-srmv1.8*
@@ -2508,6 +2535,7 @@ fi
 %attr(-,dpmmgr,dpmmgr) %{_localstatedir}/log/dpm-srmv1
 
 %files -n dpm-mysql-srmv2
+%defattr(-,root,root,-)
 %{_libdir}/dpm-mysql/dpm-srmv2
 %ghost %{_sbindir}/dpm-srmv2
 %doc %{_libdir}/dpm-mysql/dpm-srmv2.8*
@@ -2520,6 +2548,7 @@ fi
 %attr(-,dpmmgr,dpmmgr) %{_localstatedir}/log/dpm-srmv2
 
 %files -n dpm-mysql-srmv22
+%defattr(-,root,root,-)
 %{_libdir}/dpm-mysql/dpm-srmv2.2
 %ghost %{_sbindir}/dpm-srmv2.2
 %doc %{_libdir}/dpm-mysql/dpm-srmv2.2.8*
@@ -2532,6 +2561,7 @@ fi
 %attr(-,dpmmgr,dpmmgr) %{_localstatedir}/log/dpm-srmv2.2
 
 %files -n dpm-rfiod
+%defattr(-,root,root,-)
 %{_sbindir}/dpm-rfiod
 %{_initrddir}/dpm-rfiod
 %config(noreplace) %{_sysconfdir}/sysconfig/dpm-rfiod
@@ -2540,6 +2570,7 @@ fi
 %doc %{_mandir}/man8/dpm-rfiod.8*
 
 %files -n dpm-postgres
+%defattr(-,root,root,-)
 %dir %{_libdir}/dpm-postgres
 %{_libdir}/dpm-postgres/dpm
 %ghost %{_sbindir}/dpm
@@ -2566,6 +2597,7 @@ fi
 %doc dpm-postgres/%{name}-%{version}/dpm/README.Fedora
 
 %files -n dpm-postgres-nameserver
+%defattr(-,root,root,-)
 %{_libdir}/dpm-postgres/dpnsdaemon
 %ghost %{_sbindir}/dpnsdaemon
 %{_libdir}/dpm-postgres/dpns-shutdown
@@ -2586,6 +2618,7 @@ fi
 %doc dpm-postgres/%{name}-%{version}/ns/README.Fedora
 
 %files -n dpm-postgres-copyd
+%defattr(-,root,root,-)
 %{_libdir}/dpm-postgres/dpmcopyd
 %ghost %{_sbindir}/dpmcopyd
 %doc %{_libdir}/dpm-postgres/dpmcopyd.8*
@@ -2598,6 +2631,7 @@ fi
 %attr(-,dpmmgr,dpmmgr) %{_localstatedir}/log/dpmcopy
 
 %files -n dpm-postgres-srmv1
+%defattr(-,root,root,-)
 %{_libdir}/dpm-postgres/dpm-srmv1
 %ghost %{_sbindir}/dpm-srmv1
 %doc %{_libdir}/dpm-postgres/dpm-srmv1.8*
@@ -2610,6 +2644,7 @@ fi
 %attr(-,dpmmgr,dpmmgr) %{_localstatedir}/log/dpm-srmv1
 
 %files -n dpm-postgres-srmv2
+%defattr(-,root,root,-)
 %{_libdir}/dpm-postgres/dpm-srmv2
 %ghost %{_sbindir}/dpm-srmv2
 %doc %{_libdir}/dpm-postgres/dpm-srmv2.8*
@@ -2622,6 +2657,7 @@ fi
 %attr(-,dpmmgr,dpmmgr) %{_localstatedir}/log/dpm-srmv2
 
 %files -n dpm-postgres-srmv22
+%defattr(-,root,root,-)
 %{_libdir}/dpm-postgres/dpm-srmv2.2
 %ghost %{_sbindir}/dpm-srmv2.2
 %doc %{_libdir}/dpm-postgres/dpm-srmv2.2.8*
@@ -2636,7 +2672,6 @@ fi
 %changelog
 * Mon Jun 20 2011 Petr Sabata <contyk at redhat.com> - 1.8.0.1-8
 - Perl mass rebuild
-- Removing now obsolete Buildroot and defattr
 
 * Wed Mar 23 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.8.0.1-7
 - Rebuild for mysql 5.5.10


More information about the scm-commits mailing list