From aa7dd1eef95a5fc2781fa0ff2e8a06cf9bbf46dd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Tue, 16 Oct 2012 01:19:11 +0000 Subject: [PATCH] Preparation for major version bump. --- org.glite.jobid.api-c/project/glite-jobid-api-c.spec | 3 +-- org.glite.lb.client/Makefile | 4 ++-- org.glite.lb.client/project/debian.control | 6 +++--- ...n.libglite-lb-client11.dirs => debian.libglite-lb-client14.dirs} | 0 ...lite-lb-client11.install => debian.libglite-lb-client14.install} | 0 org.glite.lb.client/project/glite-lb-client.spec | 6 ++---- org.glite.lb.common/Makefile | 4 ++-- org.glite.lb.common/project/debian.control | 6 +++--- ...n.libglite-lb-common13.dirs => debian.libglite-lb-common16.dirs} | 0 ...lite-lb-common13.install => debian.libglite-lb-common16.install} | 0 org.glite.lb.common/project/glite-lb-common.spec | 3 +-- org.glite.lb.state-machine/Makefile | 4 ++-- org.glite.lb.state-machine/project/debian.control | 6 +++--- ...b-state-machine1.dirs => debian.libglite-lb-state-machine5.dirs} | 0 ...e-machine1.install => debian.libglite-lb-state-machine5.install} | 0 org.glite.lb.state-machine/project/glite-lb-state-machine.spec | 6 ++---- 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 +-- 24 files changed, 29 insertions(+), 43 deletions(-) rename org.glite.lb.client/project/{debian.libglite-lb-client11.dirs => debian.libglite-lb-client14.dirs} (100%) rename org.glite.lb.client/project/{debian.libglite-lb-client11.install => debian.libglite-lb-client14.install} (100%) rename org.glite.lb.common/project/{debian.libglite-lb-common13.dirs => debian.libglite-lb-common16.dirs} (100%) rename org.glite.lb.common/project/{debian.libglite-lb-common13.install => debian.libglite-lb-common16.install} (100%) rename org.glite.lb.state-machine/project/{debian.libglite-lb-state-machine1.dirs => debian.libglite-lb-state-machine5.dirs} (100%) rename org.glite.lb.state-machine/project/{debian.libglite-lb-state-machine1.install => debian.libglite-lb-state-machine5.install} (100%) 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 22d4a3b..e92bbc9 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 @@ -64,8 +64,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -%{_libdir}/libglite_jobid.so.@MAJOR@.@MINOR@.@REVISION@ -%{_libdir}/libglite_jobid.so.@MAJOR@ +%{_libdir}/libglite_jobid.so.* %files devel %defattr(-,root,root) diff --git a/org.glite.lb.client/Makefile b/org.glite.lb.client/Makefile index 6da718f..e80cd3f 100644 --- a/org.glite.lb.client/Makefile +++ b/org.glite.lb.client/Makefile @@ -204,8 +204,8 @@ PLUS_EXTRA_LIB:=-lglite_jobid # version_info=-version-info `echo ${version} | cut -d. -f1,2 | tr . :` -# counted minor versions: 1.0, 2.3, 3.2, 4.1 -offset=6 +# counted minor versions: 1.0, 2.3, 3.2, 4.1, 5.2 +offset=8 version_info:=-version-info ${shell \ perl -e '$$,=":"; @F=split "\\.","${version}"; print $$F[0]+$$F[1]+${offset},$$F[2],$$F[1]' } diff --git a/org.glite.lb.client/project/debian.control b/org.glite.lb.client/project/debian.control index 0bd404b..863c873 100644 --- a/org.glite.lb.client/project/debian.control +++ b/org.glite.lb.client/project/debian.control @@ -9,7 +9,7 @@ Homepage: @URL@ DM-Upload-Allowed: yes @DEBIAN_VCS@ -Package: libglite-lb-client11 +Package: libglite-lb-client14 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} @@ -20,7 +20,7 @@ Package: libglite-lb-client-dev Section: libdevel Architecture: any Provides: glite-lb-client -Depends: libglite-lb-client11 (= ${binary:Version}), ${misc:Depends}, libglite-lb-common-dev, libglite-jobid-api-c-dev, libglite-jobid-api-cpp-dev +Depends: libglite-lb-client14 (= ${binary:Version}), ${misc:Depends}, libglite-lb-common-dev, libglite-jobid-api-c-dev, libglite-jobid-api-cpp-dev Description: Development files for gLite L&B/JP common log module This package contains development libraries and header files for gLite L&B client library. @@ -36,6 +36,6 @@ Package: glite-lb-client-dbg Section: debug Architecture: any Priority: extra -Depends: libglite-lb-client11 (= ${binary:Version}), ${misc:Depends} +Depends: libglite-lb-client14 (= ${binary:Version}), ${misc:Depends} Description: gLite L&B client library debugging symbols This package contains debugging symbols for gLite L&B client library. diff --git a/org.glite.lb.client/project/debian.libglite-lb-client11.dirs b/org.glite.lb.client/project/debian.libglite-lb-client14.dirs similarity index 100% rename from org.glite.lb.client/project/debian.libglite-lb-client11.dirs rename to org.glite.lb.client/project/debian.libglite-lb-client14.dirs diff --git a/org.glite.lb.client/project/debian.libglite-lb-client11.install b/org.glite.lb.client/project/debian.libglite-lb-client14.install similarity index 100% rename from org.glite.lb.client/project/debian.libglite-lb-client11.install rename to org.glite.lb.client/project/debian.libglite-lb-client14.install diff --git a/org.glite.lb.client/project/glite-lb-client.spec b/org.glite.lb.client/project/glite-lb-client.spec index 4fb93f2..8a44aec 100644 --- a/org.glite.lb.client/project/glite-lb-client.spec +++ b/org.glite.lb.client/project/glite-lb-client.spec @@ -83,10 +83,8 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %dir /usr/share/doc/%{name}-%{version}/ -%{_libdir}/libglite_lb_client.so.11.@MINOR@.@REVISION@ -%{_libdir}/libglite_lb_client.so.11 -%{_libdir}/libglite_lb_clientpp.so.11.@MINOR@.@REVISION@ -%{_libdir}/libglite_lb_clientpp.so.11 +%{_libdir}/libglite_lb_client.so.* +%{_libdir}/libglite_lb_clientpp.so.* /usr/share/doc/%{name}-%{version}/ChangeLog /usr/share/doc/%{name}-%{version}/LICENSE /usr/share/doc/%{name}-%{version}/README-notify diff --git a/org.glite.lb.common/Makefile b/org.glite.lb.common/Makefile index b0db5ad..3e8fab7 100644 --- a/org.glite.lb.common/Makefile +++ b/org.glite.lb.common/Makefile @@ -153,8 +153,8 @@ all compile: generate ${lib_LTLIBRARIES} ${lib_LIBRARIES} # where offset is a sum of maximal released minor's of all previous major's # -# counted minors: 1.1, 2.0, 3.1, 4.0, 5.1, 6.1, 7.1 -offset=5 +# counted minors: 1.1, 2.0, 3.1, 4.0, 5.1, 6.1, 7.1, 8.2 +offset=7 version_info:=-version-info ${shell \ perl -e '$$,=":"; @F=split "\\.","${version}"; print $$F[0]+$$F[1]+${offset},$$F[2],$$F[1]' } diff --git a/org.glite.lb.common/project/debian.control b/org.glite.lb.common/project/debian.control index 629b09a..035a3c0 100644 --- a/org.glite.lb.common/project/debian.control +++ b/org.glite.lb.common/project/debian.control @@ -9,7 +9,7 @@ Homepage: @URL@ DM-Upload-Allowed: yes @DEBIAN_VCS@ -Package: libglite-lb-common13 +Package: libglite-lb-common16 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} @@ -20,7 +20,7 @@ Package: libglite-lb-common-dev Section: libdevel Architecture: any Provides: glite-lb-common -Depends: glite-lb-types, libglite-lb-common13 (= ${binary:Version}), ${misc:Depends}, libglite-jobid-api-c-dev, libglite-lbjp-common-gss-dev +Depends: glite-lb-types, libglite-lb-common16 (= ${binary:Version}), ${misc:Depends}, libglite-jobid-api-c-dev, libglite-lbjp-common-gss-dev Description: Development files for gLite L&B common library This package contains development libraries and header files for gLite L&B common library. @@ -29,6 +29,6 @@ Package: glite-lb-common-dbg Section: debug Architecture: any Priority: extra -Depends: libglite-lb-common13 (= ${binary:Version}), ${misc:Depends} +Depends: libglite-lb-common16 (= ${binary:Version}), ${misc:Depends} Description: gLite L&B common library debugging symbols This package contains debugging symbols for gLite L&B common library. diff --git a/org.glite.lb.common/project/debian.libglite-lb-common13.dirs b/org.glite.lb.common/project/debian.libglite-lb-common16.dirs similarity index 100% rename from org.glite.lb.common/project/debian.libglite-lb-common13.dirs rename to org.glite.lb.common/project/debian.libglite-lb-common16.dirs diff --git a/org.glite.lb.common/project/debian.libglite-lb-common13.install b/org.glite.lb.common/project/debian.libglite-lb-common16.install similarity index 100% rename from org.glite.lb.common/project/debian.libglite-lb-common13.install rename to org.glite.lb.common/project/debian.libglite-lb-common16.install diff --git a/org.glite.lb.common/project/glite-lb-common.spec b/org.glite.lb.common/project/glite-lb-common.spec index d1df097..83c8e50 100644 --- a/org.glite.lb.common/project/glite-lb-common.spec +++ b/org.glite.lb.common/project/glite-lb-common.spec @@ -81,8 +81,7 @@ rm -rf $RPM_BUILD_ROOT /usr/share/doc/%{name}-%{version}/ChangeLog /usr/share/doc/%{name}-%{version}/package.description /usr/share/doc/%{name}-%{version}/package.summary -%{_libdir}/libglite_lb_common.so.13.@MINOR@.@REVISION@ -%{_libdir}/libglite_lb_common.so.13 +%{_libdir}/libglite_lb_common.so.* %files devel %defattr(-,root,root) diff --git a/org.glite.lb.state-machine/Makefile b/org.glite.lb.state-machine/Makefile index a6606b6..b035e8d 100644 --- a/org.glite.lb.state-machine/Makefile +++ b/org.glite.lb.state-machine/Makefile @@ -86,8 +86,8 @@ compile: ${MACHINE_LIB} ${PLUGIN_LIB} ${XSD} # where offset is a sum of maximal released minor's of all previous major's # -# counted minors: 1.0 -offset=0 +# counted minors: 1.4 +offset=4 version_info:=-version-info ${shell \ perl -e '$$,=":"; @F=split /\./,"${version}"; print $$F[0]+$$F[1]+${offset},$$F[2],$$F[1]' } diff --git a/org.glite.lb.state-machine/project/debian.control b/org.glite.lb.state-machine/project/debian.control index 7fead08..b8262ee 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-machine1 +Package: libglite-lb-state-machine5 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-machine1 (= ${binary:Version}), ${misc:Depends}, libglite-lb-common-dev, libglite-lbjp-common-gss-dev +Depends: libglite-lb-state-machine5 (= ${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. @@ -29,6 +29,6 @@ Package: glite-lb-state-machine-dbg Section: debug Architecture: any Priority: extra -Depends: libglite-lb-state-machine1 (= ${binary:Version}), ${misc:Depends}, libglite-jobid-api-c-dev +Depends: libglite-lb-state-machine5 (= ${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-machine1.dirs b/org.glite.lb.state-machine/project/debian.libglite-lb-state-machine5.dirs similarity index 100% rename from org.glite.lb.state-machine/project/debian.libglite-lb-state-machine1.dirs rename to org.glite.lb.state-machine/project/debian.libglite-lb-state-machine5.dirs diff --git a/org.glite.lb.state-machine/project/debian.libglite-lb-state-machine1.install b/org.glite.lb.state-machine/project/debian.libglite-lb-state-machine5.install similarity index 100% rename from org.glite.lb.state-machine/project/debian.libglite-lb-state-machine1.install rename to org.glite.lb.state-machine/project/debian.libglite-lb-state-machine5.install 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 8cf9c3c..4f32c23 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 @@ -73,10 +73,8 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -%{_libdir}/libglite_lb_statemachine.so.@MAJOR@.@MINOR@.@REVISION@ -%{_libdir}/libglite_lb_statemachine.so.@MAJOR@ -%{_libdir}/glite_lb_plugin.so.0 -%{_libdir}/glite_lb_plugin.so.0.0.0 +%{_libdir}/libglite_lb_statemachine.so.* +%{_libdir}/glite_lb_plugin.so.* %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 779e505..89dcb56 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 @@ -70,8 +70,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %dir /usr/share/doc/%{name}-%{version} %doc /usr/share/doc/%{name}-%{version}/LICENSE -%{_libdir}/libglite_lbu_db.so.@MAJOR@.@MINOR@.@REVISION@ -%{_libdir}/libglite_lbu_db.so.@MAJOR@ +%{_libdir}/libglite_lbu_db.so.* %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 9262678..25df795 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 @@ -79,8 +79,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %dir /usr/share/doc/%{name}-%{version} %doc /usr/share/doc/%{name}-%{version}/LICENSE -%{_libdir}/libglite_security_gsoap_plugin_*.so.9.@MINOR@.@REVISION@ -%{_libdir}/libglite_security_gsoap_plugin_*.so.9 +%{_libdir}/libglite_security_gsoap_plugin_*.so.* %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 1041995..2c3f28e 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 @@ -92,8 +92,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %dir /usr/share/doc/%{name}-%{version} %doc /usr/share/doc/%{name}-%{version}/LICENSE -%{_libdir}/libglite_security_gss.so.9.@MINOR@.@REVISION@ -%{_libdir}/libglite_security_gss.so.9 +%{_libdir}/libglite_security_gss.so.* %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 a5b87cf..a3df382 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 @@ -65,8 +65,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -%{_libdir}/libglite_jp_common.so.@MAJOR@.@MINOR@.@REVISION@ -%{_libdir}/libglite_jp_common.so.@MAJOR@ +%{_libdir}/libglite_jp_common.so.* %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 125dea1..1a724e4 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 @@ -69,8 +69,7 @@ rm -rf $RPM_BUILD_ROOT %doc /usr/share/doc/%{name}-%{version}/README %doc /usr/share/doc/%{name}-%{version}/log4crc.example-debugging %doc /usr/share/doc/%{name}-%{version}/log4crc.example-production -%{_libdir}/libglite_lbu_log.so.@MAJOR@.@MINOR@.@REVISION@ -%{_libdir}/libglite_lbu_log.so.@MAJOR@ +%{_libdir}/libglite_lbu_log.so.* %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 c65ca1f..50a9ea7 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 @@ -61,8 +61,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -%{_libdir}/libglite_lbu_maildir.so.@MAJOR@.@MINOR@.@REVISION@ -%{_libdir}/libglite_lbu_maildir.so.@MAJOR@ +%{_libdir}/libglite_lbu_maildir.so.* %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 20e4888..22675f3 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 @@ -62,8 +62,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -%{_libdir}/libglite_lbu_server_bones.so.@MAJOR@.@MINOR@.@REVISION@ -%{_libdir}/libglite_lbu_server_bones.so.@MAJOR@ +%{_libdir}/libglite_lbu_server_bones.so.* %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 871d918..8e68234 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 @@ -65,8 +65,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %dir /usr/share/doc/%{name}-%{version} %doc /usr/share/doc/%{name}-%{version}/LICENSE -%{_libdir}/libglite_lbu_trio.so.@MAJOR@.@MINOR@.@REVISION@ -%{_libdir}/libglite_lbu_trio.so.@MAJOR@ +%{_libdir}/libglite_lbu_trio.so.* %files devel %defattr(-,root,root) -- 1.8.2.3