From: František Dvořák Date: Mon, 19 Dec 2011 20:59:58 +0000 (+0000) Subject: Working upgrade (from EMI-1) after tearing packages apart. X-Git-Tag: emi-canl-c_R_1_0_0_0~101 X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=0c34a208cd96ede73d0c68faa21fff355bb02320;p=jra1mw.git Working upgrade (from EMI-1) after tearing packages apart. --- 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 1d8dd95..c35bf48 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 @@ -23,6 +23,7 @@ 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} @@ -34,6 +35,7 @@ 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 %description -n %{name}-devel 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 aa8ed9c..cf424ad 100644 --- a/org.glite.jobid.api-cpp/project/glite-jobid-api-cpp.spec +++ b/org.glite.jobid.api-cpp/project/glite-jobid-api-cpp.spec @@ -24,6 +24,7 @@ Summary: @SUMMARY@ Group: Development/Libraries Requires: libglite-jobid-api-c%{?_isa} Provides: %{name} = %{version}-%{release} +Obsoletes: glite-jobid-api-cpp <= 1.2.0 %description -n %{name}-devel diff --git a/org.glite.lb.client/project/glite-lb-client.spec b/org.glite.lb.client/project/glite-lb-client.spec index 0ebac2b..7589d43 100644 --- a/org.glite.lb.client/project/glite-lb-client.spec +++ b/org.glite.lb.client/project/glite-lb-client.spec @@ -30,6 +30,7 @@ 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} @@ -44,6 +45,7 @@ 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 @@ -54,6 +56,7 @@ client library. %package -n %{name}-progs Summary: gLite L&B client programs and examples Group: Applications/Communications +Obsoletes: glite-lb-client%{?_isa} <= 5.1.0 %description -n %{name}-progs diff --git a/org.glite.lb.common/project/glite-lb-common.spec b/org.glite.lb.common/project/glite-lb-common.spec index 9b6a9ec..6a21fa3 100644 --- a/org.glite.lb.common/project/glite-lb-common.spec +++ b/org.glite.lb.common/project/glite-lb-common.spec @@ -32,6 +32,7 @@ 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} @@ -45,6 +46,7 @@ Requires: lib%{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 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 55166ae..5f85e0b 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 @@ -31,6 +31,7 @@ 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} @@ -43,6 +44,7 @@ Group: Development/Libraries Requires: lib%{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 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 28abce7..2396ada 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 @@ -28,6 +28,7 @@ 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} @@ -39,6 +40,7 @@ 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 %description -n %{name}-devel 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 21258fd..f70d163 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 @@ -27,6 +27,8 @@ 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} @@ -40,7 +42,8 @@ Requires: lib%{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 < 2.0.1-1 +Obsoletes: glite-security-gsoap-plugin%{?_isa} < 2.0.1-1 +Obsoletes: glite-lbjp-common-gsoap-plugin%{?_isa} <= 3.1.0 %description -n %{name}-devel 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 96cbe2d..0acf090 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 @@ -25,6 +25,8 @@ 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} @@ -38,7 +40,8 @@ Requires: lib%{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 < 2.1.5-1 +Obsoletes: glite-security-gss%{?_isa} < 2.1.5-1 +Obsoletes: glite-lbjp-common-gss%{?_isa} <= 3.1.0 %description -n %{name}-devel 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 be74d3d..ccafd22 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 @@ -25,6 +25,7 @@ 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} @@ -36,6 +37,7 @@ 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 %description -n %{name}-devel 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 092e2dd..a92a6fe 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 @@ -23,6 +23,7 @@ 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} @@ -34,6 +35,7 @@ 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 %description -n %{name}-devel 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 5ac2add..7b6f271 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 @@ -21,6 +21,7 @@ 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} @@ -32,6 +33,7 @@ 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 %description -n %{name}-devel 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 c729b62..9496f40 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 @@ -22,6 +22,7 @@ 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} @@ -33,6 +34,7 @@ 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 %description -n %{name}-devel 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 8062fd2..d57f293 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 @@ -22,6 +22,7 @@ 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} @@ -33,6 +34,7 @@ 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 %description -n %{name}-devel diff --git a/org.glite.px.proxyrenewal/project/glite-px-proxyrenewal.spec b/org.glite.px.proxyrenewal/project/glite-px-proxyrenewal.spec index bbea177..ce10845 100644 --- a/org.glite.px.proxyrenewal/project/glite-px-proxyrenewal.spec +++ b/org.glite.px.proxyrenewal/project/glite-px-proxyrenewal.spec @@ -13,7 +13,8 @@ BuildRequires: myproxy-devel%{?_isa} BuildRequires: voms-devel%{?_isa} Requires: %{name}-devel%{?_isa} Requires: %{name}-clients -Obsoletes: glite-security-proxyrenewal <= 1.3.11-4 +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 @@ -28,6 +29,8 @@ proxyrenewal library. %package -n lib%{name} 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} @@ -38,6 +41,8 @@ Group: System Environment/Libraries Summary: Development files for gLite proxyrenewal library Group: Development/Libraries Requires: lib%{name}%{?_isa} = %{version}-%{release} +Obsoletes: glite-security-proxyrenewal%{?_isa} <= 1.3.11-4 +Obsoletes: glite-px-proxyrenewal%{?_isa} <= 1.3.22 %description -n %{name}-devel @@ -48,6 +53,7 @@ proxyrenewal library. %package -n %{name}-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