RPM packaging fixes: no packages renames as it would break upgrade, fix build of...

diff --git a/org.glite.jobid.api-c/project/glite-jobid-api-c.spec b/org.glite.jobid.api-c/project/glite-jobid-api-c.spec
index c35bf48..0fc2032 100644 (file)
--- a/org.glite.jobid.api-c/project/glite-jobid-api-c.spec
+++ b/org.glite.jobid.api-c/project/glite-jobid-api-c.spec
@@ -1,11 +1,11 @@
-Summary: Virtual package for development with gLite jobid C API
+Summary: @SUMMARY@
 Name: glite-jobid-api-c
 Version: @MAJOR@.@MINOR@.@REVISION@
 Release: @AGE@%{?dist}
 Url: @URL@
 License: Apache Software License
 Vendor: EMI
-Group: Development/Libraries
+Group: System Environment/Libraries
 BuildRequires: chrpath
 BuildRequires: libtool
 BuildRequires: cppunit-devel
@@ -16,29 +16,16 @@ Source: http://eticssoft.web.cern.ch/eticssoft/repository/emi/emi.jobid.api-c/%{
 
 
 %description
-This is a virtual package providing runtime and development files for gLite
-jobid C library.
-
-
-%package -n lib%{name}
-Summary: @SUMMARY@
-Group: System Environment/Libraries
-Obsoletes: glite-jobid-api-c%{?_isa} <= 2.1.0
-
-
-%description -n lib%{name}
 @DESCRIPTION@
 
 
-%package -n %{name}-devel
+%package devel
 Summary: Development files for gLite jobid C library
 Group: Development/Libraries
-Requires: lib%{name}%{?_isa} = %{version}-%{release}
-Provides: %{name}%{?_isa} = %{version}-%{release}
-Obsoletes: glite-jobid-api-c%{?_isa} <= 2.1.0
+Requires: %{name}%{?_isa} = %{version}-%{release}
 
 
-%description -n %{name}-devel
+%description devel
 This package contains development libraries and header files for gLite jobid
 C library.
 
@@ -69,19 +56,19 @@ find $RPM_BUILD_ROOT -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} >
 rm -rf $RPM_BUILD_ROOT
 
 
-%post -n lib%{name} -p /sbin/ldconfig
+%post -p /sbin/ldconfig
 
 
-%postun -n lib%{name} -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 
-%files -n lib%{name}
+%files
 %defattr(-,root,root)
 /usr/%{_lib}/libglite_jobid.so.@MAJOR@.@MINOR@.@REVISION@
 /usr/%{_lib}/libglite_jobid.so.@MAJOR@
 
 
-%files -n %{name}-devel
+%files devel
 %defattr(-,root,root)
 %dir /usr/include/glite
 %dir /usr/include/glite/jobid

diff --git a/org.glite.jobid.api-cpp/project/glite-jobid-api-cpp.spec b/org.glite.jobid.api-cpp/project/glite-jobid-api-cpp.spec
index cf424ad..5e29dcf 100644 (file)
--- a/org.glite.jobid.api-cpp/project/glite-jobid-api-cpp.spec
+++ b/org.glite.jobid.api-cpp/project/glite-jobid-api-cpp.spec
@@ -19,15 +19,14 @@ This is a virtual package providing runtime and development files for gLite
 jobid C++ API.
 
 
-%package -n %{name}-devel
+%package devel
 Summary: @SUMMARY@
 Group: Development/Libraries
-Requires: libglite-jobid-api-c%{?_isa}
+Requires: glite-jobid-api-c%{?_isa}
 Provides: %{name} = %{version}-%{release}
-Obsoletes: glite-jobid-api-cpp <= 1.2.0
 
 
-%description -n %{name}-devel
+%description devel
 @DESCRIPTION@
 
 
@@ -56,7 +55,7 @@ find $RPM_BUILD_ROOT -name '*.a' -exec rm -rf {} \;
 rm -rf $RPM_BUILD_ROOT
 
 
-%files -n %{name}-devel
+%files devel
 %defattr(-,root,root)
 %dir /usr/include/glite
 %dir /usr/include/glite/jobid

diff --git a/org.glite.lb.client/project/glite-lb-client.spec b/org.glite.lb.client/project/glite-lb-client.spec
index 7589d43..faf82b1 100644 (file)
--- a/org.glite.lb.client/project/glite-lb-client.spec
+++ b/org.glite.lb.client/project/glite-lb-client.spec
@@ -1,11 +1,11 @@
-Summary: Virtual package for development with gLite L&B client library
+Summary: @SUMMARY@
 Name: glite-lb-client
 Version: @MAJOR@.@MINOR@.@REVISION@
 Release: @AGE@%{?dist}
 Url: @URL@
 License: Apache Software License
 Vendor: EMI
-Group: Development/Libraries
+Group: System Environment/Libraries
 BuildRequires: classads
 BuildRequires: classads-devel
 BuildRequires: cppunit-devel
@@ -23,43 +23,29 @@ Source: http://eticssoft.web.cern.ch/eticssoft/repository/emi/emi.lb.client/%{ve
 
 
 %description
-This is a virtual package providing runtime and development files for gLite
-L&B client library.
-
-
-%package -n lib%{name}
-Summary: @SUMMARY@
-Group: System Environment/Libraries
-Obsoletes: glite-lb-client%{?_isa} <= 5.1.0
-
-
-%description -n lib%{name}
 @DESCRIPTION@
 
 
-%package -n %{name}-devel
+%package devel
 Summary: Development files for gLite L&B client library
 Group: Development/Libraries
-Requires: lib%{name}%{?_isa} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: glite-lb-common-devel
 Requires: glite-jobid-api-c-devel
 Requires: glite-jobid-api-cpp-devel
-Provides: %{name}%{?_isa} = %{version}-%{release}
-Obsoletes: glite-lb-client%{?_isa} <= 5.1.0
 
 
-%description -n %{name}-devel
+%description devel
 This package contains development libraries and header files for gLite L&B
 client library.
 
 
-%package -n %{name}-progs
+%package progs
 Summary: gLite L&B client programs and examples
-Group: Applications/Communications
-Obsoletes: glite-lb-client%{?_isa} <= 5.1.0
+Group: System Environment/Base
 
 
-%description -n %{name}-progs
+%description progs
 This package contains client programs and examples for gLite L&B.
 
 
@@ -89,13 +75,13 @@ find $RPM_BUILD_ROOT -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} >
 rm -rf $RPM_BUILD_ROOT
 
 
-%post -n lib%{name} -p /sbin/ldconfig
+%post -p /sbin/ldconfig
 
 
-%postun -n lib%{name} -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 
-%files -n lib%{name}
+%files
 %defattr(-,root,root)
 %dir /usr/share/doc/%{name}-%{version}/
 /usr/%{_lib}/libglite_lb_client.so.11.@MINOR@.@REVISION@
@@ -109,7 +95,7 @@ rm -rf $RPM_BUILD_ROOT
 /usr/share/doc/%{name}-%{version}/package.summary
 
 
-%files -n %{name}-devel
+%files devel
 %defattr(-,root,root)
 %dir /usr/share/emi/
 %dir /usr/share/emi/build/
@@ -128,7 +114,7 @@ rm -rf $RPM_BUILD_ROOT
 /usr/share/man/man8/glite-lb-load.8.gz
 
 
-%files -n %{name}-progs
+%files progs
 %defattr(-,root,root)
 %dir /usr/%{_lib}/glite-lb/
 %dir /usr/%{_lib}/glite-lb/examples/

diff --git a/org.glite.lb.common/project/glite-lb-common.spec b/org.glite.lb.common/project/glite-lb-common.spec
index 6a21fa3..3125b34 100644 (file)
--- a/org.glite.lb.common/project/glite-lb-common.spec
+++ b/org.glite.lb.common/project/glite-lb-common.spec
@@ -1,11 +1,11 @@
-Summary: Virtual package for development with gLite L&B common library
+Summary: @SUMMARY@
 Name: glite-lb-common
 Version: @MAJOR@.@MINOR@.@REVISION@
 Release: @AGE@%{?dist}
 Url: @URL@
 License: Apache Software License
 Vendor: EMI
-Group: Development/Libraries
+Group: System Environment/Libraries
 BuildRequires: c-ares-devel
 BuildRequires: chrpath
 BuildRequires: classads
@@ -25,31 +25,18 @@ Source: http://eticssoft.web.cern.ch/eticssoft/repository/emi/emi.lb.common/%{ve
 
 
 %description
-This is a virtual package providing runtime and development files for gLite
-L&B common library.
-
-
-%package -n lib%{name}
-Summary: @SUMMARY@
-Group: System Environment/Libraries
-Obsoletes: glite-lb-common%{?_isa} <= 8.1.0
-
-
-%description -n lib%{name}
 @DESCRIPTION@
 
 
-%package -n %{name}-devel
+%package devel
 Summary: Development files for gLite L&B common library
 Group: Development/Libraries
-Requires: lib%{name}%{?_isa} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: glite-jobid-api-c-devel
 Requires: glite-lbjp-common-gss-devel
-Provides: %{name}%{?_isa} = %{version}-%{release}
-Obsoletes: glite-lb-common%{?_isa} <= 8.1.0
 
 
-%description -n %{name}-devel
+%description devel
 This package contains development libraries and header files for gLite L&B
 common library.
 
@@ -80,13 +67,13 @@ find $RPM_BUILD_ROOT -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} >
 rm -rf $RPM_BUILD_ROOT
 
 
-%post -n lib%{name} -p /sbin/ldconfig
+%post -p /sbin/ldconfig
 
 
-%postun -n lib%{name} -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 
-%files -n lib%{name}
+%files
 %defattr(-,root,root)
 %dir /usr/share/doc/%{name}-%{version}/
 /usr/share/doc/%{name}-%{version}/LICENSE
@@ -97,7 +84,7 @@ rm -rf $RPM_BUILD_ROOT
 /usr/%{_lib}/libglite_lb_common.so.13
 
 
-%files -n %{name}-devel
+%files devel
 %defattr(-,root,root)
 %dir /usr/include/glite/
 %dir /usr/include/glite/lb/

diff --git a/org.glite.lb.logger-msg/project/glite-lb-logger-msg.spec b/org.glite.lb.logger-msg/project/glite-lb-logger-msg.spec
index fe83b2a..a29a2a8 100644 (file)
--- a/org.glite.lb.logger-msg/project/glite-lb-logger-msg.spec
+++ b/org.glite.lb.logger-msg/project/glite-lb-logger-msg.spec
@@ -7,8 +7,9 @@ License: Apache Software License
 Vendor: EMI
 Group: System Environment/Daemons
 BuildRequires: activemq-cpp-library
-BuildRequires: cppunit-devel
-BuildRequires: glite-lb-logger
+BuildRequires: cppunit-devel%{?_isa}
+BuildRequires: glite-lb-logger-devel%{?_isa}
+BuildRequires: glite-lbjp-common-trio-devel%{?_isa}
 BuildRequires: libtool
 Requires: glite-lb-logger
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)

diff --git a/org.glite.lb.logger/project/glite-lb-logger.spec b/org.glite.lb.logger/project/glite-lb-logger.spec
index 9b33c52..1e85393 100644 (file)
--- a/org.glite.lb.logger/project/glite-lb-logger.spec
+++ b/org.glite.lb.logger/project/glite-lb-logger.spec
@@ -6,13 +6,13 @@ Url: @URL@
 License: Apache Software License
 Vendor: EMI
 Group: System Environment/Daemons
-BuildRequires: cppunit-devel
+BuildRequires: cppunit-devel%{?_isa}
 BuildRequires: chrpath
-BuildRequires: glite-lb-common-devel
-BuildRequires: glite-jobid-api-c-devel
-BuildRequires: glite-lbjp-common-gss-devel
-BuildRequires: glite-lbjp-common-trio-devel
-BuildRequires: glite-lbjp-common-log-devel
+BuildRequires: glite-lb-common-devel%{?_isa}
+BuildRequires: glite-jobid-api-c-devel%{?_isa}
+BuildRequires: glite-lbjp-common-gss-devel%{?_isa}
+BuildRequires: glite-lbjp-common-trio-devel%{?_isa}
+BuildRequires: glite-lbjp-common-log-devel%{?_isa}
 BuildRequires: libtool
 Requires(post): chkconfig
 Requires(preun): chkconfig
@@ -26,6 +26,19 @@ Source: http://eticssoft.web.cern.ch/eticssoft/repository/emi/emi.lb.logger/%{ve
 @DESCRIPTION@
 
 
+%package devel
+Summary: Development files for gLite L&B logger
+Group: Development/Libraries
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: glite-lb-common-devel%{?_isa}
+Requires: glite-lbjp-common-gss-devel%{?_isa}
+Requires: glite-lbjp-common-log-devel%{?_isa}
+
+
+%description devel
+This package contains header files for building plugins for gLite L&B logger.
+
+
 %prep
 %setup -q
 
@@ -77,14 +90,11 @@ fi
 
 %files
 %defattr(-,root,root)
-%dir /usr/include/glite/
-%dir /usr/include/glite/lb/
 %dir /usr/share/doc/%{name}-%{version}/
 /etc/init.d/glite-lb-locallogger
 /usr/bin/glite-lb-notif-interlogd
 /usr/bin/glite-lb-interlogd
 /usr/bin/glite-lb-logd
-/usr/include/glite/lb/*.h
 /usr/share/doc/%{name}-%{version}/ChangeLog
 /usr/share/doc/%{name}-%{version}/LICENSE
 /usr/share/doc/%{name}-%{version}/package.description
@@ -93,6 +103,12 @@ fi
 /usr/share/man/man8/glite-lb-logd.8.gz
 
 
+%files devel
+%dir /usr/include/glite/
+%dir /usr/include/glite/lb/
+/usr/include/glite/lb/*.h
+
+
 %changelog
 * @SPEC_DATE@ @MAINTAINER@ - @MAJOR@.@MINOR@.@REVISION@-@AGE@%{?dist}
 - automatically generated package

diff --git a/org.glite.lb.server/project/glite-lb-server.spec b/org.glite.lb.server/project/glite-lb-server.spec
index 1311f67..aa583c1 100644 (file)
--- a/org.glite.lb.server/project/glite-lb-server.spec
+++ b/org.glite.lb.server/project/glite-lb-server.spec
@@ -42,7 +42,7 @@ BuildRequires: chrpath
 Requires: mysql-server
 # for upgrade from EMI-1:
 # new function glite_srvbones_daemon_listen() in 2.2.0
-Requires: libglite-lbjp-common-server-bones%{?_isa} >= 2.2.0
+Requires: glite-lbjp-common-server-bones%{?_isa} >= 2.2.0
 Requires(post): chkconfig
 Requires(preun): chkconfig
 Requires(preun): initscripts

diff --git a/org.glite.lb.state-machine/project/glite-lb-state-machine.spec b/org.glite.lb.state-machine/project/glite-lb-state-machine.spec
index 5f85e0b..b739877 100644 (file)
--- a/org.glite.lb.state-machine/project/glite-lb-state-machine.spec
+++ b/org.glite.lb.state-machine/project/glite-lb-state-machine.spec
@@ -1,11 +1,11 @@
-Summary: Virtual package for development with gLite L&B state machine
+Summary: @SUMMARY@
 Name: glite-lb-state-machine
 Version: @MAJOR@.@MINOR@.@REVISION@
 Release: @AGE@%{?dist}
 Url: @URL@
 License: Apache Software License
 Vendor: EMI
-Group: Development/Libraries
+Group: System Environment/Libraries
 BuildRequires: chrpath
 BuildRequires: classads-devel
 BuildRequires: expat-devel
@@ -24,30 +24,17 @@ Source: http://eticssoft.web.cern.ch/eticssoft/repository/emi/emi.lb.state-machi
 
 
 %description
-This is a virtual package providing runtime and development files for gLite
-L&B state machine.
-
-
-%package -n lib%{name}
-Summary: @SUMMARY@
-Group: System Environment/Libraries
-Obsoletes: glite-lb-state-machine%{?_isa} <= 1.3.0
-
-
-%description -n lib%{name}
 @DESCRIPTION@
 
 
-%package -n %{name}-devel
+%package devel
 Summary: Development files for gLite L&B state machine
 Group: Development/Libraries
-Requires: lib%{name}%{?_isa} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: glite-lb-common-devel
-Provides: %{name}%{?_isa} = %{version}-%{release}
-Obsoletes: glite-lb-state-machine%{?_isa} <= 1.3.0
 
 
-%description -n %{name}-devel
+%description devel
 This package contains development libraries and header files for gLite L&B
 state machine.
 
@@ -73,17 +60,18 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -rf {} \;
 find $RPM_BUILD_ROOT -name '*.a' -exec rm -rf {} \;
 find $RPM_BUILD_ROOT -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} > /dev/null 2>&1" || echo 'Stripped RPATH'
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%post -n lib%{name} -p /sbin/ldconfig
+%post -p /sbin/ldconfig
 
 
-%postun -n lib%{name} -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 
-%files -n lib%{name}
+%files
 %defattr(-,root,root)
 /usr/%{_lib}/libglite_lb_statemachine.so.@MAJOR@.@MINOR@.@REVISION@
 /usr/%{_lib}/libglite_lb_statemachine.so.@MAJOR@
@@ -91,7 +79,7 @@ rm -rf $RPM_BUILD_ROOT
 /usr/%{_lib}/glite_lb_plugin.so.0.0.0
 
 
-%files -n %{name}-devel
+%files devel
 %defattr(-,root,root)
 %dir /usr/include/glite/
 %dir /usr/include/glite/lb/

diff --git a/org.glite.lb.ws-test/project/glite-lb-ws-test.spec b/org.glite.lb.ws-test/project/glite-lb-ws-test.spec
index 938e123..4f08ee1 100644 (file)
--- a/org.glite.lb.ws-test/project/glite-lb-ws-test.spec
+++ b/org.glite.lb.ws-test/project/glite-lb-ws-test.spec
@@ -5,7 +5,7 @@ Release: @AGE@%{?dist}
 Url: @URL@
 License: Apache Software License
 Vendor: EMI
-Group: Applications/Communications
+Group: System Environment/Base
 BuildRequires: chrpath
 BuildRequires: gsoap-devel
 BuildRequires: glite-lb-ws-interface

diff --git a/org.glite.lbjp-common.db/project/glite-lbjp-common-db.spec b/org.glite.lbjp-common.db/project/glite-lbjp-common-db.spec
index 2396ada..ceba189 100644 (file)
--- a/org.glite.lbjp-common.db/project/glite-lbjp-common-db.spec
+++ b/org.glite.lbjp-common.db/project/glite-lbjp-common-db.spec
@@ -1,11 +1,11 @@
-Summary: Virtual package for development with gLite L&B/JP common DB module
+Summary: @SUMMARY@
 Name: glite-lbjp-common-db
 Version: @MAJOR@.@MINOR@.@REVISION@
 Release: @AGE@%{?dist}
 Url: @URL@
 License: Apache Software License
 Vendor: EMI
-Group: Development/Libraries
+Group: System Environment/Libraries
 BuildRequires: cppunit-devel
 BuildRequires: chrpath
 BuildRequires: log4c-devel
@@ -21,29 +21,16 @@ Source: http://eticssoft.web.cern.ch/eticssoft/repository/emi/emi.lbjp-common.db
 
 
 %description
-This is a virtual package providing runtime and development files for gLite
-L&B/JP common DB module.
-
-
-%package -n lib%{name}
-Summary: @SUMMARY@
-Group: System Environment/Libraries
-Obsoletes: glite-lbjp-common-db%{?_isa} <= 3.1.0
-
-
-%description -n lib%{name}
 @DESCRIPTION@
 
 
-%package -n %{name}-devel
+%package devel
 Summary: Development files for gLite L&B/JP common DB module
 Group: Development/Libraries
-Requires: lib%{name}%{?_isa} = %{version}-%{release}
-Provides: %{name}%{?_isa} = %{version}-%{release}
-Obsoletes: glite-lbjp-common-db%{?_isa} <= 3.1.0
+Requires: %{name}%{?_isa} = %{version}-%{release}
 
 
-%description -n %{name}-devel
+%description devel
 This package contains development libraries and header files for gLite L&B/JP
 common DB module.
 
@@ -69,17 +56,18 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -rf {} \;
 find $RPM_BUILD_ROOT -name '*.a' -exec rm -rf {} \;
 find $RPM_BUILD_ROOT -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} > /dev/null 2>&1" || echo 'Stripped RPATH'
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%post -n lib%{name} -p /sbin/ldconfig
+%post -p /sbin/ldconfig
 
 
-%postun -n lib%{name} -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 
-%files -n lib%{name}
+%files
 %defattr(-,root,root)
 %dir /usr/share/doc/%{name}-%{version}
 %doc /usr/share/doc/%{name}-%{version}/LICENSE
@@ -87,7 +75,7 @@ rm -rf $RPM_BUILD_ROOT
 /usr/%{_lib}/libglite_lbu_db.so.@MAJOR@
 
 
-%files -n %{name}-devel
+%files devel
 %defattr(-,root,root)
 %dir /usr/include/glite
 %dir /usr/include/glite/lbu

diff --git a/org.glite.lbjp-common.gsoap-plugin/project/glite-lbjp-common-gsoap-plugin.spec b/org.glite.lbjp-common.gsoap-plugin/project/glite-lbjp-common-gsoap-plugin.spec
index f70d163..32b4dd9 100644 (file)
--- a/org.glite.lbjp-common.gsoap-plugin/project/glite-lbjp-common-gsoap-plugin.spec
+++ b/org.glite.lbjp-common.gsoap-plugin/project/glite-lbjp-common-gsoap-plugin.spec
@@ -1,11 +1,11 @@
-Summary: Virtual package for development with gLite gsoap-plugin
+Summary: @SUMMARY@
 Name: glite-lbjp-common-gsoap-plugin
 Version: @MAJOR@.@MINOR@.@REVISION@
 Release: @AGE@%{?dist}
 Url: @URL@
 License: Apache Software License
 Vendor: EMI
-Group: Development/Libraries
+Group: System Environment/Libraries
 BuildRequires: c-ares-devel
 BuildRequires: cppunit-devel
 BuildRequires: chrpath
@@ -15,38 +15,25 @@ BuildRequires: gsoap-devel
 BuildRequires: glite-lbjp-common-gss-devel
 BuildRequires: libtool
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+Obsoletes: glite-security-gsoap-plugin%{?_isa} < 2.0.1-1
 AutoReqProv: yes
 Source: http://eticssoft.web.cern.ch/eticssoft/repository/emi/emi.lbjp-common.gsoap-plugin/%{version}/src/%{name}-@VERSION@.src.tar.gz
 
 
 %description
-This is a virtual package providing runtime and development files for gLite
-gsoap-plugin.
-
-
-%package -n lib%{name}
-Summary: @SUMMARY@
-Group: System Environment/Libraries
-Obsoletes: glite-security-gsoap-plugin%{?_isa} < 2.0.1-1
-Obsoletes: glite-lbjp-common-gsoap-plugin%{?_isa} <= 3.1.0
-
-
-%description -n lib%{name}
 @DESCRIPTION@
 
 
-%package -n %{name}-devel
+%package devel
 Summary: Development files for gLite gsoap-plugin
 Group: Development/Libraries
-Requires: lib%{name}%{?_isa} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: glite-lbjp-common-gss-devel
-Provides: %{name}%{?_isa} = %{version}-%{release}
 Provides: glite-security-gsoap-plugin%{?_isa} = %{version}-%{release}
 Obsoletes: glite-security-gsoap-plugin%{?_isa} < 2.0.1-1
-Obsoletes: glite-lbjp-common-gsoap-plugin%{?_isa} <= 3.1.0
 
 
-%description -n %{name}-devel
+%description devel
 This package contains development libraries and header files for gLite
 gsoap-plugin.
 
@@ -77,13 +64,13 @@ find $RPM_BUILD_ROOT -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} >
 rm -rf $RPM_BUILD_ROOT
 
 
-%post -n lib%{name} -p /sbin/ldconfig
+%post -p /sbin/ldconfig
 
 
-%postun -n lib%{name} -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 
-%files -n lib%{name}
+%files
 %defattr(-,root,root)
 %dir /usr/share/doc/gsoap-plugin-%{version}
 %doc /usr/share/doc/gsoap-plugin-%{version}/LICENSE
@@ -91,7 +78,7 @@ rm -rf $RPM_BUILD_ROOT
 /usr/%{_lib}/libglite_security_gsoap_plugin_*.so.9
 
 
-%files -n %{name}-devel
+%files devel
 %defattr(-,root,root)
 %dir /usr/include/glite
 %dir /usr/include/glite/security

diff --git a/org.glite.lbjp-common.gss/project/glite-lbjp-common-gss.spec b/org.glite.lbjp-common.gss/project/glite-lbjp-common-gss.spec
index 0acf090..00c0d6b 100644 (file)
--- a/org.glite.lbjp-common.gss/project/glite-lbjp-common-gss.spec
+++ b/org.glite.lbjp-common.gss/project/glite-lbjp-common-gss.spec
@@ -1,11 +1,11 @@
-Summary: Virtual package for development with gLite GSS library
+Summary: @SUMMARY@
 Name: glite-lbjp-common-gss
 Version: @MAJOR@.@MINOR@.@REVISION@
 Release: @AGE@%{?dist}
 Url: @URL@
 License: Apache Software License
 Vendor: EMI
-Group: Development/Libraries
+Group: System Environment/Libraries
 BuildRequires: c-ares-devel
 BuildRequires: c-ares
 BuildRequires: chrpath
@@ -13,38 +13,25 @@ BuildRequires: cppunit-devel
 BuildRequires: globus-gssapi-gsi-devel
 BuildRequires: libtool
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+Obsoletes: glite-security-gss%{?_isa} < 2.1.5-1
 AutoReqProv: yes
 Source: http://eticssoft.web.cern.ch/eticssoft/repository/emi/emi.lbjp-common.gss/%{version}/src/%{name}-@VERSION@.src.tar.gz
 
 
 %description
-This is a virtual package providing runtime and development files for gLite
-GSS library.
-
-
-%package -n lib%{name}
-Summary: @SUMMARY@
-Group: System Environment/Libraries
-Obsoletes: glite-security-gss%{?_isa} < 2.1.5-1
-Obsoletes: glite-lbjp-common-gss%{?_isa} <= 3.1.0
-
-
-%description -n lib%{name}
 @DESCRIPTION@
 
 
-%package -n %{name}-devel
+%package devel
 Summary: Development files for gLite GSS library
 Group: Development/Libraries
-Requires: lib%{name}%{?_isa} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: globus-gssapi-gsi-devel
-Provides: %{name}%{?_isa} = %{version}-%{release}
 Provides: glite-security-gss%{?_isa} = %{version}-%{release}
 Obsoletes: glite-security-gss%{?_isa} < 2.1.5-1
-Obsoletes: glite-lbjp-common-gss%{?_isa} <= 3.1.0
 
 
-%description -n %{name}-devel
+%description devel
 This package contains development libraries and header files for gLite GSS
 library.
 
@@ -74,13 +61,13 @@ find $RPM_BUILD_ROOT -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} >
 rm -rf $RPM_BUILD_ROOT
 
 
-%post -n lib%{name} -p /sbin/ldconfig
+%post -p /sbin/ldconfig
 
 
-%postun -n lib%{name} -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 
-%files -n lib%{name}
+%files
 %defattr(-,root,root)
 %dir /usr/share/doc/gss-%{version}
 %doc /usr/share/doc/gss-%{version}/LICENSE
@@ -88,7 +75,7 @@ rm -rf $RPM_BUILD_ROOT
 /usr/%{_lib}/libglite_security_gss.so.9
 
 
-%files -n %{name}-devel
+%files devel
 %defattr(-,root,root)
 %dir /usr/include/glite
 %dir /usr/include/glite/security

diff --git a/org.glite.lbjp-common.jp-interface/project/glite-lbjp-common-jp-interface.spec b/org.glite.lbjp-common.jp-interface/project/glite-lbjp-common-jp-interface.spec
index ccafd22..6dfe225 100644 (file)
--- a/org.glite.lbjp-common.jp-interface/project/glite-lbjp-common-jp-interface.spec
+++ b/org.glite.lbjp-common.jp-interface/project/glite-lbjp-common-jp-interface.spec
@@ -1,11 +1,11 @@
-Summary: Virtual package for development with gLite L&B/JP interface library
+Summary: @SUMMARY@
 Name: glite-lbjp-common-jp-interface
 Version: @MAJOR@.@MINOR@.@REVISION@
 Release: @AGE@%{?dist}
 Url: @URL@
 License: Apache Software License
 Vendor: EMI
-Group: Development/Libraries
+Group: System Environment/Libraries
 BuildRequires: chrpath
 BuildRequires: cppunit-devel
 BuildRequires: glite-jobid-api-c-devel
@@ -18,29 +18,16 @@ Source: http://eticssoft.web.cern.ch/eticssoft/repository/emi/emi.lbjp-common.jp
 
 
 %description
-This is a virtual package providing runtime and development files for gLite
-L&B/JP interface library.
-
-
-%package -n lib%{name}
-Summary: @SUMMARY@
-Group: System Environment/Libraries
-Obsoletes: glite-lbjp-common-jp-interface%{?_isa} <= 2.2.0
-
-
-%description -n lib%{name}
 @DESCRIPTION@
 
 
-%package -n %{name}-devel
+%package devel
 Summary: Development files for gLite L&B/JP interface library
 Group: Development/Libraries
-Requires: lib%{name}%{?_isa} = %{version}-%{release}
-Provides: %{name}%{?_isa} = %{version}-%{release}
-Obsoletes: glite-lbjp-common-jp-interface%{?_isa} <= 2.2.0
+Requires: %{name}%{?_isa} = %{version}-%{release}
 
 
-%description -n %{name}-devel
+%description devel
 This package contains development libraries and header files for gLite L&B/JP
 interface library.
 
@@ -70,19 +57,19 @@ find $RPM_BUILD_ROOT -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} >
 rm -rf $RPM_BUILD_ROOT
 
 
-%post -n lib%{name} -p /sbin/ldconfig
+%post -p /sbin/ldconfig
 
 
-%postun -n lib%{name} -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 
-%files -n lib%{name}
+%files
 %defattr(-,root,root)
 /usr/%{_lib}/libglite_jp_common.so.@MAJOR@.@MINOR@.@REVISION@
 /usr/%{_lib}/libglite_jp_common.so.@MAJOR@
 
 
-%files -n %{name}-devel
+%files devel
 %defattr(-,root,root)
 %dir /usr/include/glite
 %dir /usr/include/glite/jp

diff --git a/org.glite.lbjp-common.log/project/glite-lbjp-common-log.spec b/org.glite.lbjp-common.log/project/glite-lbjp-common-log.spec
index a92a6fe..2e69793 100644 (file)
--- a/org.glite.lbjp-common.log/project/glite-lbjp-common-log.spec
+++ b/org.glite.lbjp-common.log/project/glite-lbjp-common-log.spec
@@ -1,11 +1,11 @@
-Summary: Virtual package for development with gLite L&B/JP common log module
+Summary: @SUMMARY@
 Name: glite-lbjp-common-log
 Version: @MAJOR@.@MINOR@.@REVISION@
 Release: @AGE@%{?dist}
 Url: @URL@
 License: Apache Software License
 Vendor: EMI
-Group: Development/Libraries
+Group: System Environment/Libraries
 BuildRequires: chrpath
 BuildRequires: libtool
 BuildRequires: log4c-devel
@@ -16,29 +16,16 @@ Source: http://eticssoft.web.cern.ch/eticssoft/repository/emi/emi.lbjp-common.lo
 
 
 %description
-This is a virtual package providing runtime and development files for gLite
-L&B/JP common log module.
-
-
-%package -n lib%{name}
-Summary: @SUMMARY@
-Group: System Environment/Libraries
-Obsoletes: glite-lbjp-common-log%{?_isa} <= 1.2.0
-
-
-%description -n lib%{name}
 @DESCRIPTION@
 
 
-%package -n %{name}-devel
+%package devel
 Summary: Development files for gLite L&B/JP common log module
 Group: Development/Libraries
-Requires: lib%{name}%{?_isa} = %{version}-%{release}
-Provides: %{name}%{?_isa} = %{version}-%{release}
-Obsoletes: glite-lbjp-common-log%{?_isa} <= 1.2.0
+Requires: %{name}%{?_isa} = %{version}-%{release}
 
 
-%description -n %{name}-devel
+%description devel
 This package contains development libraries and header files for gLite L&B/JP
 common log module.
 
@@ -68,13 +55,13 @@ find $RPM_BUILD_ROOT -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} >
 rm -rf $RPM_BUILD_ROOT
 
 
-%post -n lib%{name} -p /sbin/ldconfig
+%post -p /sbin/ldconfig
 
 
-%postun -n lib%{name} -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 
-%files -n lib%{name}
+%files
 %defattr(-,root,root)
 %dir /usr/share/doc/%{name}-%{version}
 %dir /etc/glite-lb
@@ -87,7 +74,7 @@ rm -rf $RPM_BUILD_ROOT
 /usr/%{_lib}/libglite_lbu_log.so.@MAJOR@
 
 
-%files -n %{name}-devel
+%files devel
 %defattr(-,root,root)
 %dir /usr/include/glite
 %dir /usr/include/glite/lbu

diff --git a/org.glite.lbjp-common.maildir/project/glite-lbjp-common-maildir.spec b/org.glite.lbjp-common.maildir/project/glite-lbjp-common-maildir.spec
index 7b6f271..596e5e7 100644 (file)
--- a/org.glite.lbjp-common.maildir/project/glite-lbjp-common-maildir.spec
+++ b/org.glite.lbjp-common.maildir/project/glite-lbjp-common-maildir.spec
@@ -1,11 +1,11 @@
-Summary: Virtual package for development with gLite L&B/JP common maildir library
+Summary: @SUMMARY@
 Name: glite-lbjp-common-maildir
 Version: @MAJOR@.@MINOR@.@REVISION@
 Release: @AGE@%{?dist}
 Url: @URL@
 License: Apache Software License
 Vendor: EMI
-Group: Development/Libraries
+Group: System Environment/Libraries
 BuildRequires: chrpath
 BuildRequires: libtool
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -14,29 +14,16 @@ Source: http://eticssoft.web.cern.ch/eticssoft/repository/emi/emi.lbjp-common.ma
 
 
 %description
-This is a virtual package providing runtime and development files for gLite
-L&B/JP common maildir library.
-
-
-%package -n lib%{name}
-Summary: @SUMMARY@
-Group: System Environment/Libraries
-Obsoletes: glite-lbjp-common-maildir%{?_isa} <= 2.2.0
-
-
-%description -n lib%{name}
 @DESCRIPTION@
 
 
-%package -n %{name}-devel
+%package devel
 Summary: Development files for gLite L&B/JP common maildir library
 Group: Development/Libraries
-Requires: lib%{name}%{?_isa} = %{version}-%{release}
-Provides: %{name}%{?_isa} = %{version}-%{release}
-Obsoletes: glite-lbjp-common-maildir%{?_isa} <= 2.2.0
+Requires: %{name}%{?_isa} = %{version}-%{release}
 
 
-%description -n %{name}-devel
+%description devel
 This package contains development libraries and header files for gLite L&B/JP
 common maildir library.
 
@@ -62,23 +49,24 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -rf {} \;
 find $RPM_BUILD_ROOT -name '*.a' -exec rm -rf {} \;
 find $RPM_BUILD_ROOT -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} > /dev/null 2>&1" || echo 'Stripped RPATH'
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%post -n lib%{name} -p /sbin/ldconfig
+%post -p /sbin/ldconfig
 
 
-%postun -n lib%{name} -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 
-%files -n lib%{name}
+%files
 %defattr(-,root,root)
 /usr/%{_lib}/libglite_lbu_maildir.so.@MAJOR@.@MINOR@.@REVISION@
 /usr/%{_lib}/libglite_lbu_maildir.so.@MAJOR@
 
 
-%files -n %{name}-devel
+%files devel
 %defattr(-,root,root)
 %dir /usr/include/glite
 %dir /usr/include/glite/lbu

diff --git a/org.glite.lbjp-common.server-bones/project/glite-lbjp-common-server-bones.spec b/org.glite.lbjp-common.server-bones/project/glite-lbjp-common-server-bones.spec
index 9496f40..e6f1108 100644 (file)
--- a/org.glite.lbjp-common.server-bones/project/glite-lbjp-common-server-bones.spec
+++ b/org.glite.lbjp-common.server-bones/project/glite-lbjp-common-server-bones.spec
@@ -1,11 +1,11 @@
-Summary: Virtual package for development with gLite L&B/JP common server-bones.
+Summary: @SUMMARY@
 Name: glite-lbjp-common-server-bones
 Version: @MAJOR@.@MINOR@.@REVISION@
 Release: @AGE@%{?dist}
 Url: @URL@
 License: Apache Software License
 Vendor: EMI
-Group: Development/Libraries
+Group: System Environment/Libraries
 BuildRequires: chrpath
 BuildRequires: glite-lbjp-common-log-devel
 BuildRequires: libtool
@@ -15,29 +15,16 @@ Source: http://eticssoft.web.cern.ch/eticssoft/repository/emi/emi.lbjp-common.se
 
 
 %description
-This is a virtual package providing runtime and development files for gLite
-L&B/JP common server-bones.
-
-
-%package -n lib%{name}
-Summary: @SUMMARY@
-Group: System Environment/Libraries
-Obsoletes: glite-lbjp-common-server-bones%{?_isa} <= 2.2.0
-
-
-%description -n lib%{name}
 @DESCRIPTION@
 
 
-%package -n %{name}-devel
+%package devel
 Summary: Development files for gLite L&B/JP common server-bones
 Group: Development/Libraries
-Requires: lib%{name}%{?_isa} = %{version}-%{release}
-Provides: %{name}%{?_isa} = %{version}-%{release}
-Obsoletes: glite-lbjp-common-server-bones%{?_isa} <= 2.2.0
+Requires: %{name}%{?_isa} = %{version}-%{release}
 
 
-%description -n %{name}-devel
+%description devel
 This package contains development libraries and header files for gLite L&B/JP
 common server-bones.
 
@@ -63,23 +50,24 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -rf {} \;
 find $RPM_BUILD_ROOT -name '*.a' -exec rm -rf {} \;
 find $RPM_BUILD_ROOT -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} > /dev/null 2>&1" || echo 'Stripped RPATH'
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%post -n lib%{name} -p /sbin/ldconfig
+%post -p /sbin/ldconfig
 
 
-%postun -n lib%{name} -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 
-%files -n lib%{name}
+%files
 %defattr(-,root,root)
 /usr/%{_lib}/libglite_lbu_server_bones.so.@MAJOR@.@MINOR@.@REVISION@
 /usr/%{_lib}/libglite_lbu_server_bones.so.@MAJOR@
 
 
-%files -n %{name}-devel
+%files devel
 %defattr(-,root,root)
 %dir /usr/include/glite
 %dir /usr/include/glite/lbu

diff --git a/org.glite.lbjp-common.trio/project/glite-lbjp-common-trio.spec b/org.glite.lbjp-common.trio/project/glite-lbjp-common-trio.spec
index d57f293..a30733d 100644 (file)
--- a/org.glite.lbjp-common.trio/project/glite-lbjp-common-trio.spec
+++ b/org.glite.lbjp-common.trio/project/glite-lbjp-common-trio.spec
@@ -1,11 +1,11 @@
-Summary: Virtual package for development with gLite L&B/JP common trio library
+Summary: @SUMMARY@
 Name: glite-lbjp-common-trio
 Version: @MAJOR@.@MINOR@.@REVISION@
 Release: @AGE@%{?dist}
 Url: @URL@
 License: Apache Software License
 Vendor: EMI
-Group: Development/Libraries
+Group: System Environment/Libraries
 BuildRequires: cppunit-devel
 BuildRequires: chrpath
 BuildRequires: libtool
@@ -15,29 +15,16 @@ Source: http://eticssoft.web.cern.ch/eticssoft/repository/emi/emi.lbjp-common.tr
 
 
 %description
-This is a virtual package providing runtime and development files for gLite
-L&B/JP common trio library.
-
-
-%package -n lib%{name}
-Summary: @SUMMARY@
-Group: System Environment/Libraries
-Obsoletes: glite-lbjp-common-trio%{?_isa} <= 2.2.0
-
-
-%description -n lib%{name}
 @DESCRIPTION@
 
 
-%package -n %{name}-devel
+%package devel
 Summary: Development files for gLite L&B/JP common trio library
 Group: Development/Libraries
-Requires: lib%{name}%{?_isa} = %{version}-%{release}
-Provides: %{name}%{?_isa} = %{version}-%{release}
-Obsoletes: glite-lbjp-common-trio%{?_isa} <= 2.2.0
+Requires: %{name}%{?_isa} = %{version}-%{release}
 
 
-%description -n %{name}-devel
+%description devel
 This package contains development libraries and header files for gLite L&B/JP
 common trio library.
 
@@ -63,17 +50,18 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -rf {} \;
 find $RPM_BUILD_ROOT -name '*.a' -exec rm -rf {} \;
 find $RPM_BUILD_ROOT -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} > /dev/null 2>&1" || echo 'Stripped RPATH'
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%post -n lib%{name} -p /sbin/ldconfig
+%post -p /sbin/ldconfig
 
 
-%postun -n lib%{name} -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 
-%files -n lib%{name}
+%files
 %defattr(-,root,root)
 %dir /usr/share/doc/%{name}-%{version}
 %doc /usr/share/doc/%{name}-%{version}/LICENSE
@@ -81,7 +69,7 @@ rm -rf $RPM_BUILD_ROOT
 /usr/%{_lib}/libglite_lbu_trio.so.@MAJOR@
 
 
-%files -n %{name}-devel
+%files devel
 %defattr(-,root,root)
 %dir /usr/include/glite
 %dir /usr/include/glite/lbu

diff --git a/org.glite.px.proxyrenewal/project/glite-px-proxyrenewal.spec b/org.glite.px.proxyrenewal/project/glite-px-proxyrenewal.spec
index ce10845..0f22cc4 100644 (file)
--- a/org.glite.px.proxyrenewal/project/glite-px-proxyrenewal.spec
+++ b/org.glite.px.proxyrenewal/project/glite-px-proxyrenewal.spec
@@ -14,7 +14,6 @@ BuildRequires: voms-devel%{?_isa}
 Requires: %{name}-devel%{?_isa}
 Requires: %{name}-clients
 Obsoletes: glite-security-proxyrenewal%{?_isa} <= 1.3.11-4
-Obsoletes: glite-px-proxyrenewal%{?_isa} <= 1.3.22
 Provides: %{name}%{?_isa} = %{version}-%{release}
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 AutoReqProv: yes
@@ -26,37 +25,34 @@ This is a virtual package providing runtime and development files for gLite
 proxyrenewal library.
 
 
-%package -n lib%{name}
+%package libs
 Summary: @SUMMARY@
 Group: System Environment/Libraries
 Obsoletes: glite-security-proxyrenewal%{?_isa} <= 1.3.11-4
-Obsoletes: glite-px-proxyrenewal%{?_isa} <= 1.3.22
 
 
-%description -n lib%{name}
+%description libs
 @DESCRIPTION@
 
 
-%package -n %{name}-devel
+%package devel
 Summary: Development files for gLite proxyrenewal library
 Group: Development/Libraries
-Requires: lib%{name}%{?_isa} = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 Obsoletes: glite-security-proxyrenewal%{?_isa} <= 1.3.11-4
-Obsoletes: glite-px-proxyrenewal%{?_isa} <= 1.3.22
 
 
-%description -n %{name}-devel
+%description devel
 This package contains development libraries and header files for gLite
 proxyrenewal library.
 
 
-%package -n %{name}-clients
+%package clients
 Summary: Daemon and client program for gLite proxyrenewal
 Group: System Environment/Base
-Obsoletes: glite-px-proxyrenewal%{?_isa} <= 1.3.22
 
 
-%description -n %{name}-clients
+%description clients
 This package contains daemon and client program for gLite proxyrenewal.
 
 
@@ -86,13 +82,13 @@ find $RPM_BUILD_ROOT -name '*' -print | xargs -I {} -i bash -c "chrpath -d {} >
 rm -rf $RPM_BUILD_ROOT
 
 
-%post -n lib%{name} -p /sbin/ldconfig
+%post libs -p /sbin/ldconfig
 
 
-%postun -n lib%{name} -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
 
 
-%pre -n %{name}-clients
+%pre clients
 getent group glite >/dev/null || groupadd -r glite
 getent passwd glite >/dev/null || useradd -r -g glite -d /var/glite -c "gLite user" glite
 mkdir -p /var/glite /var/log/glite 2>/dev/null || :
@@ -100,28 +96,28 @@ chown glite:glite /var/glite /var/log/glite
 exit 0
 
 
-%post -n %{name}-clients
+%post clients
 /sbin/chkconfig --add glite-proxy-renewald
 
 
-%preun -n %{name}-clients
+%preun clients
 if [ $1 -eq 0 ] ; then
        /sbin/service glite-proxy-renewald stop >/dev/null 2>&1
        /sbin/chkconfig --del glite-proxy-renewald
 fi
 
 
-%postun -n %{name}-clients
+%postun clients
 if [ "$1" -ge "1" ] ; then
        /sbin/service glite-proxy-renewald condrestart >/dev/null 2>&1 || :
 fi
 
 
-%files -n %{name}
+%files
 %defattr(-,root,root)
 
 
-%files -n lib%{name}
+%files libs
 %defattr(-,root,root)
 %dir /usr/share/doc/%{name}-%{version}/
 /usr/share/doc/%{name}-%{version}/LICENSE
@@ -131,7 +127,7 @@ fi
 /usr/%{_lib}/libglite_security_proxyrenewal_core.so.2
 
 
-%files -n %{name}-devel
+%files devel
 %defattr(-,root,root)
 %dir /usr/include/glite/
 %dir /usr/include/glite/security/
@@ -141,7 +137,7 @@ fi
 /usr/%{_lib}/libglite_security_proxyrenewal_core.so
 
 
-%files -n %{name}-clients
+%files clients
 %defattr(-,root,root)
 /etc/init.d/glite-proxy-renewald
 /usr/bin/glite-proxy-renew