From ecb72cda9c07131769d4d08d741587b42827bc40 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Thu, 6 Dec 2012 10:15:52 +0000 Subject: [PATCH] Track library sonames in rpm (package review for Fedora), fix major version in Debian packaging of lb.state-machine. --- emi.canl.canl-c/project/canl-c.spec | 3 ++- org.glite.jobid.api-c/project/glite-jobid-api-c.spec | 3 ++- org.glite.lb.client/project/glite-lb-client.spec | 6 ++++-- org.glite.lb.common/project/glite-lb-common.spec | 3 ++- org.glite.lb.state-machine/project/debian.control | 6 +++--- ...machine5.install => debian.libglite-lb-state-machine6.install} | 0 org.glite.lb.state-machine/project/debian.rules | 2 +- org.glite.lb.state-machine/project/glite-lb-state-machine.spec | 3 ++- org.glite.lbjp-common.db/project/glite-lbjp-common-db.spec | 3 ++- .../project/glite-lbjp-common-gsoap-plugin.spec | 3 ++- org.glite.lbjp-common.gss/project/glite-lbjp-common-gss.spec | 3 ++- .../project/glite-lbjp-common-jp-interface.spec | 3 ++- org.glite.lbjp-common.log/project/glite-lbjp-common-log.spec | 3 ++- .../project/glite-lbjp-common-maildir.spec | 3 ++- .../project/glite-lbjp-common-server-bones.spec | 3 ++- org.glite.lbjp-common.trio/project/glite-lbjp-common-trio.spec | 3 ++- org.glite.px.proxyrenewal/project/glite-px-proxyrenewal.spec | 8 ++++++-- 17 files changed, 38 insertions(+), 20 deletions(-) rename org.glite.lb.state-machine/project/{debian.libglite-lb-state-machine5.install => debian.libglite-lb-state-machine6.install} (100%) diff --git a/emi.canl.canl-c/project/canl-c.spec b/emi.canl.canl-c/project/canl-c.spec index da7ecb6..72245a9 100644 --- a/emi.canl.canl-c/project/canl-c.spec +++ b/emi.canl.canl-c/project/canl-c.spec @@ -91,7 +91,8 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc LICENSE project/ChangeLog -%{_libdir}/libcanl_c.so.* +%{_libdir}/libcanl_c.so.2 +%{_libdir}/libcanl_c.so.2.* %files devel %defattr(-,root,root) 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 8f4996c..3d8c61a 100644 --- a/org.glite.jobid.api-c/project/glite-jobid-api-c.spec +++ b/org.glite.jobid.api-c/project/glite-jobid-api-c.spec @@ -65,7 +65,8 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc LICENSE project/ChangeLog -%{_libdir}/libglite_jobid.so.* +%{_libdir}/libglite_jobid.so.2 +%{_libdir}/libglite_jobid.so.2.* %files devel %defattr(-,root,root) diff --git a/org.glite.lb.client/project/glite-lb-client.spec b/org.glite.lb.client/project/glite-lb-client.spec index adb2fd1..58e2faf 100644 --- a/org.glite.lb.client/project/glite-lb-client.spec +++ b/org.glite.lb.client/project/glite-lb-client.spec @@ -84,8 +84,10 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %dir %{_docdir}/%{name}-%{version}/ -%{_libdir}/libglite_lb_client.so.* -%{_libdir}/libglite_lb_clientpp.so.* +%{_libdir}/libglite_lb_client.so.14 +%{_libdir}/libglite_lb_client.so.14.* +%{_libdir}/libglite_lb_clientpp.so.14 +%{_libdir}/libglite_lb_clientpp.so.14.* %{_docdir}/%{name}-%{version}/ChangeLog %{_docdir}/%{name}-%{version}/LICENSE diff --git a/org.glite.lb.common/project/glite-lb-common.spec b/org.glite.lb.common/project/glite-lb-common.spec index a75ad2f..070f158 100644 --- a/org.glite.lb.common/project/glite-lb-common.spec +++ b/org.glite.lb.common/project/glite-lb-common.spec @@ -77,7 +77,8 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc LICENSE project/ChangeLog -%{_libdir}/libglite_lb_common.so.* +%{_libdir}/libglite_lb_common.so.16 +%{_libdir}/libglite_lb_common.so.16.* %files devel %defattr(-,root,root) diff --git a/org.glite.lb.state-machine/project/debian.control b/org.glite.lb.state-machine/project/debian.control index fe732f4..55fdf3b 100644 --- a/org.glite.lb.state-machine/project/debian.control +++ b/org.glite.lb.state-machine/project/debian.control @@ -9,7 +9,7 @@ Homepage: @URL@ DM-Upload-Allowed: yes @DEBIAN_VCS@ -Package: libglite-lb-state-machine5 +Package: libglite-lb-state-machine6 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} @@ -20,7 +20,7 @@ Package: libglite-lb-state-machine-dev Section: libdevel Architecture: any Provides: glite-lb-state-machine -Depends: libglite-lb-state-machine5 (= ${binary:Version}), ${misc:Depends}, libglite-lb-common-dev, libglite-lbjp-common-gss-dev +Depends: libglite-lb-state-machine6 (= ${binary:Version}), ${misc:Depends}, libglite-lb-common-dev, libglite-lbjp-common-gss-dev Description: Development files for gLite L&B state machine This package contains development libraries and header files for gLite L&B state machine. @@ -36,6 +36,6 @@ Package: glite-lb-state-machine-dbg Section: debug Architecture: any Priority: extra -Depends: libglite-lb-state-machine5 (= ${binary:Version}), ${misc:Depends}, libglite-jobid-api-c-dev +Depends: libglite-lb-state-machine6 (= ${binary:Version}), ${misc:Depends}, libglite-jobid-api-c-dev Description: gLite L&B state-machine debugging symbols This package contains debugging symbols for gLite L&B state machine. diff --git a/org.glite.lb.state-machine/project/debian.libglite-lb-state-machine5.install b/org.glite.lb.state-machine/project/debian.libglite-lb-state-machine6.install similarity index 100% rename from org.glite.lb.state-machine/project/debian.libglite-lb-state-machine5.install rename to org.glite.lb.state-machine/project/debian.libglite-lb-state-machine6.install diff --git a/org.glite.lb.state-machine/project/debian.rules b/org.glite.lb.state-machine/project/debian.rules index 350f7ee..e8b55bf 100644 --- a/org.glite.lb.state-machine/project/debian.rules +++ b/org.glite.lb.state-machine/project/debian.rules @@ -5,7 +5,7 @@ p_dbg=glite-lb-state-machine-dbg p_dev=libglite-lb-state-machine-dev -p_lib=libglite-lb-state-machine5 +p_lib=libglite-lb-state-machine6 p_plugs=glite-lb-state-machine-plugins # Uncomment this to turn on verbose mode. 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 f1ccd18..c457820 100644 --- a/org.glite.lb.state-machine/project/glite-lb-state-machine.spec +++ b/org.glite.lb.state-machine/project/glite-lb-state-machine.spec @@ -82,7 +82,8 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc LICENSE project/ChangeLog -%{_libdir}/libglite_lb_statemachine.so.* +%{_libdir}/libglite_lb_statemachine.so.6 +%{_libdir}/libglite_lb_statemachine.so.6.* %files devel %defattr(-,root,root) 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 ae52a15..2b4ab1d 100644 --- a/org.glite.lbjp-common.db/project/glite-lbjp-common-db.spec +++ b/org.glite.lbjp-common.db/project/glite-lbjp-common-db.spec @@ -69,7 +69,8 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc LICENSE project/ChangeLog -%{_libdir}/libglite_lbu_db.so.* +%{_libdir}/libglite_lbu_db.so.3 +%{_libdir}/libglite_lbu_db.so.3.* %files devel %defattr(-,root,root) 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 2b89a34..6619610 100644 --- 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 @@ -78,7 +78,8 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc project/ChangeLog LICENSE -%{_libdir}/libglite_security_gsoap_plugin_*.so.* +%{_libdir}/libglite_security_gsoap_plugin_*.so.9 +%{_libdir}/libglite_security_gsoap_plugin_*.so.9.* %files devel %defattr(-,root,root) 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 8f9f9c0..2b0f9ea 100644 --- a/org.glite.lbjp-common.gss/project/glite-lbjp-common-gss.spec +++ b/org.glite.lbjp-common.gss/project/glite-lbjp-common-gss.spec @@ -87,7 +87,8 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc project/ChangeLog LICENSE -%{_libdir}/libglite_security_gss.so.* +%{_libdir}/libglite_security_gss.so.9 +%{_libdir}/libglite_security_gss.so.9.* %files devel %defattr(-,root,root) 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 99bf2fe..c94b521 100644 --- 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 @@ -66,7 +66,8 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc LICENSE project/ChangeLog -%{_libdir}/libglite_jp_common.so.* +%{_libdir}/libglite_jp_common.so.2 +%{_libdir}/libglite_jp_common.so.2.* %files devel %defattr(-,root,root) 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 2309cca..e547714 100644 --- a/org.glite.lbjp-common.log/project/glite-lbjp-common-log.spec +++ b/org.glite.lbjp-common.log/project/glite-lbjp-common-log.spec @@ -68,7 +68,8 @@ rm -rf $RPM_BUILD_ROOT %doc %{_docdir}/%{name}-%{version}/README %doc %{_docdir}/%{name}-%{version}/log4crc.example-debugging %doc %{_docdir}/%{name}-%{version}/log4crc.example-production -%{_libdir}/libglite_lbu_log.so.* +%{_libdir}/libglite_lbu_log.so.1 +%{_libdir}/libglite_lbu_log.so.1.* %files devel %defattr(-,root,root) 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 142bdb5..a16c0e7 100644 --- a/org.glite.lbjp-common.maildir/project/glite-lbjp-common-maildir.spec +++ b/org.glite.lbjp-common.maildir/project/glite-lbjp-common-maildir.spec @@ -62,7 +62,8 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc LICENSE project/ChangeLog -%{_libdir}/libglite_lbu_maildir.so.* +%{_libdir}/libglite_lbu_maildir.so.2 +%{_libdir}/libglite_lbu_maildir.so.2.* %files devel %defattr(-,root,root) 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 eecfbc4..c2f3fe5 100644 --- 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 @@ -63,7 +63,8 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc LICENSE project/ChangeLog -%{_libdir}/libglite_lbu_server_bones.so.* +%{_libdir}/libglite_lbu_server_bones.so.2 +%{_libdir}/libglite_lbu_server_bones.so.2.* %files devel %defattr(-,root,root) 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 e2ae4d0..cf989bb 100644 --- a/org.glite.lbjp-common.trio/project/glite-lbjp-common-trio.spec +++ b/org.glite.lbjp-common.trio/project/glite-lbjp-common-trio.spec @@ -62,7 +62,8 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc LICENSE project/ChangeLog -%{_libdir}/libglite_lbu_trio.so.* +%{_libdir}/libglite_lbu_trio.so.2 +%{_libdir}/libglite_lbu_trio.so.2.* %files devel %defattr(-,root,root) diff --git a/org.glite.px.proxyrenewal/project/glite-px-proxyrenewal.spec b/org.glite.px.proxyrenewal/project/glite-px-proxyrenewal.spec index c06174b..4d13f73 100644 --- a/org.glite.px.proxyrenewal/project/glite-px-proxyrenewal.spec +++ b/org.glite.px.proxyrenewal/project/glite-px-proxyrenewal.spec @@ -77,6 +77,7 @@ 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' mkdir -p $RPM_BUILD_ROOT/var/glite +mkdir -p $RPM_BUILD_ROOT/var/spool/glite-renewd %clean @@ -121,14 +122,17 @@ fi %files libs %defattr(-,root,root) %doc LICENSE project/ChangeLog -%{_libdir}/libglite_security_proxyrenewal.so.* -%{_libdir}/libglite_security_proxyrenewal_core.so.* +%{_libdir}/libglite_security_proxyrenewal.so.1 +%{_libdir}/libglite_security_proxyrenewal.so.1.* +%{_libdir}/libglite_security_proxyrenewal_core.so.1 +%{_libdir}/libglite_security_proxyrenewal_core.so.1.* %files devel %defattr(-,root,root) %dir %{_includedir}/glite/ %dir %{_includedir}/glite/security/ %dir %{_includedir}/glite/security/proxyrenewal/ +%attr(0700,glite,glite) %{_localstatedir}/spool/glite-renewd %{_includedir}/glite/security/proxyrenewal/*.h %{_libdir}/libglite_security_proxyrenewal.so %{_libdir}/libglite_security_proxyrenewal_core.so -- 1.8.2.3