2011-03-25 Laszlo (Laca) Peter <
[email protected]>
* specs/SUNWobsolete-gnome.spec: add %ifarch i386 around some
x86-only renamed packages, fixes 18065
--- a/ChangeLog Fri Mar 25 06:00:57 2011 +0000
+++ b/ChangeLog Fri Mar 25 10:05:36 2011 +0000
@@ -1,3 +1,8 @@
+2011-03-25 Laszlo (Laca) Peter <[email protected]>
+
+ * specs/SUNWobsolete-gnome.spec: add %ifarch i386 around some
+ x86-only renamed packages, fixes 18065
+
2011-03-25 Leon Sha <[email protected]>
* specs/SUNWflash-player-plugin.spec:
--- a/specs/SUNWobsolete-gnome.spec Fri Mar 25 06:00:57 2011 +0000
+++ b/specs/SUNWobsolete-gnome.spec Fri Mar 25 10:05:36 2011 +0000
@@ -133,6 +133,7 @@
Obsoleted_By: desktop/studio/jokosher >= 0.5.11-0.133
PkgBuild_Make_Empty_Package: true
+%ifarch i386
%package -n SUNWcompiz-fusion-extra
IPS_Package_Name: SUNWcompiz-fusion-extra
SUNW_Pkg: SUNWobsolete-gnome
@@ -146,6 +147,7 @@
Obsoleted_By: consolidation/gnome/gnome-incorporation = *
Obsoleted_By: desktop/compiz/plugin/compiz-fusion-extra >= 0.5.11-0.133
PkgBuild_Make_Empty_Package: true
+%endif
%package -n SUNWgnome-time-slider
IPS_Package_Name: SUNWgnome-time-slider
@@ -187,6 +189,7 @@
Obsoleted_By: consolidation/gnome/gnome-incorporation = *
PkgBuild_Make_Empty_Package: true
+%ifarch i386
%package -n SUNWlibcompizconfig
IPS_Package_Name: SUNWlibcompizconfig
SUNW_Pkg: SUNWobsolete-gnome
@@ -200,6 +203,7 @@
Obsoleted_By: desktop/compiz/library/libcompizconfig >= 0.5.11-0.133
Obsoleted_By: consolidation/gnome/gnome-incorporation = *
PkgBuild_Make_Empty_Package: true
+%endif
%package -n SUNWpython24-simplejson
IPS_Package_Name: SUNWpython24-simplejson
@@ -953,6 +957,7 @@
Meta(variant.opensolaris.zone): global, nonglobal
PkgBuild_Make_Empty_Package: true
+%ifarch i386
%package -n SUNWclutter-gst
IPS_Package_Name: SUNWclutter-gst
SUNW_Pkg: SUNWobsolete-gnome
@@ -966,6 +971,7 @@
Obsoleted_By: library/desktop/clutter/clutter-gst >= 0.5.11-0.133
Obsoleted_By: consolidation/gnome/gnome-incorporation = *
PkgBuild_Make_Empty_Package: true
+%endif
%package -n SUNWgnome-applets
IPS_Package_Name: SUNWgnome-applets
@@ -1185,6 +1191,7 @@
Obsoleted_By: consolidation/gnome/gnome-incorporation = *
PkgBuild_Make_Empty_Package: true
+%ifarch i386
%package -n SUNWccsm
IPS_Package_Name: SUNWccsm
SUNW_Pkg: SUNWobsolete-gnome
@@ -1198,6 +1205,7 @@
Obsoleted_By: desktop/compiz/ccsm >= 0.5.11-0.133
Obsoleted_By: consolidation/gnome/gnome-incorporation = *
PkgBuild_Make_Empty_Package: true
+%endif
%package -n SUNWdmz-cursor-aa
IPS_Package_Name: SUNWdmz-cursor-aa
@@ -1673,6 +1681,7 @@
Obsoleted_By: consolidation/gnome/gnome-incorporation = *
PkgBuild_Make_Empty_Package: true
+%ifarch i386
%package -n SUNWcompizconfig-gconf
IPS_Package_Name: SUNWcompizconfig-gconf
SUNW_Pkg: SUNWobsolete-gnome
@@ -1686,6 +1695,7 @@
Obsoleted_By: desktop/compiz/library/compizconfig-gconf >= 0.5.11-0.133
Obsoleted_By: consolidation/gnome/gnome-incorporation = *
PkgBuild_Make_Empty_Package: true
+%endif
%package -n SUNWseahorse-plugins
IPS_Package_Name: SUNWseahorse-plugins
@@ -1849,6 +1859,7 @@
Obsoleted_By: library/gnutls >= 0.5.11-0.133
PkgBuild_Make_Empty_Package: true
+%ifarch i386
%package -n SUNWdrivel
IPS_Package_Name: SUNWdrivel
SUNW_Pkg: SUNWobsolete-gnome
@@ -1862,6 +1873,7 @@
Obsoleted_By: editor/blog/drivel >= 0.5.11-0.133
Obsoleted_By: consolidation/gnome/gnome-incorporation = *
PkgBuild_Make_Empty_Package: true
+%endif
%package -n SUNWpython-twisted
IPS_Package_Name: SUNWpython-twisted
@@ -3249,6 +3261,7 @@
Obsoleted_By: consolidation/gnome/gnome-incorporation = *
PkgBuild_Make_Empty_Package: true
+%ifarch i386
%package -n SUNWavant
IPS_Package_Name: SUNWavant
SUNW_Pkg: SUNWobsolete-gnome
@@ -3262,6 +3275,7 @@
Obsoleted_By: desktop/avant-window-navigator >= 0.3.2.1-0.133
Obsoleted_By: consolidation/gnome/gnome-incorporation = *
PkgBuild_Make_Empty_Package: true
+%endif
%package -n SUNWpython25-simplejson
IPS_Package_Name: SUNWpython25-simplejson
@@ -3717,6 +3731,7 @@
Obsoleted_By: consolidation/gnome/gnome-incorporation = *
PkgBuild_Make_Empty_Package: true
+%ifarch i386
%package -n SUNWsexy-python
IPS_Package_Name: SUNWsexy-python
SUNW_Pkg: SUNWobsolete-gnome
@@ -3730,6 +3745,7 @@
Obsoleted_By: consolidation/gnome/gnome-incorporation = *
Obsoleted_By: library/python-2/python-sexy-24 >= 0.1.9-0.133
PkgBuild_Make_Empty_Package: true
+%endif
%package -n SUNWgnome-keyring-manager
IPS_Package_Name: SUNWgnome-keyring-manager
@@ -4033,6 +4049,7 @@
Obsoleted_By: consolidation/gnome/gnome-incorporation = *
PkgBuild_Make_Empty_Package: true
+%ifarch i386
%package -n SUNWclutter
IPS_Package_Name: SUNWclutter
SUNW_Pkg: SUNWobsolete-gnome
@@ -4046,6 +4063,7 @@
Obsoleted_By: library/desktop/clutter >= 0.5.11-0.133
Obsoleted_By: consolidation/gnome/gnome-incorporation = *
PkgBuild_Make_Empty_Package: true
+%endif
%package -n SUNWPython26-extra
IPS_Package_Name: SUNWPython26-extra
@@ -4243,6 +4261,7 @@
Obsoleted_By: consolidation/gnome/gnome-incorporation = *
PkgBuild_Make_Empty_Package: true
+%ifarch i386
%package -n SUNWclutter-gtk
IPS_Package_Name: SUNWclutter-gtk
SUNW_Pkg: SUNWobsolete-gnome
@@ -4256,7 +4275,9 @@
Obsoleted_By: library/desktop/clutter/clutter-gtk >= 0.5.11-0.133
Obsoleted_By: consolidation/gnome/gnome-incorporation = *
PkgBuild_Make_Empty_Package: true
-
+%endif
+
+%ifarch i386
%package -n SUNWGParted
IPS_Package_Name: SUNWGParted
SUNW_Pkg: SUNWobsolete-gnome
@@ -4270,6 +4291,7 @@
Obsoleted_By: consolidation/gnome/gnome-incorporation = *
Obsoleted_By: desktop/administration/gparted >= 0.4.5-0.133
PkgBuild_Make_Empty_Package: true
+%endif
%package -n SUNWpython25-twisted-web2
IPS_Package_Name: SUNWpython25-twisted-web2
@@ -4361,6 +4383,7 @@
Obsoleted_By: library/libgtop >= 0.5.11-0.133
PkgBuild_Make_Empty_Package: true
+%ifarch i386
%package -n SUNWcompizconfig-python
IPS_Package_Name: SUNWcompizconfig-python
SUNW_Pkg: SUNWobsolete-gnome
@@ -4374,6 +4397,7 @@
Obsoleted_By: library/python-2/python-compizconfig-26 >= 0.5.11-0.133
Obsoleted_By: consolidation/gnome/gnome-incorporation = *
PkgBuild_Make_Empty_Package: true
+%endif
%package -n SUNWgnome-python26-desktop
IPS_Package_Name: SUNWgnome-python26-desktop
@@ -4553,6 +4577,7 @@
Obsoleted_By: consolidation/gnome/gnome-incorporation = *
PkgBuild_Make_Empty_Package: true
+%ifarch i386
%package -n SUNWcompiz-fusion-main
IPS_Package_Name: SUNWcompiz-fusion-main
SUNW_Pkg: SUNWobsolete-gnome
@@ -4566,6 +4591,7 @@
Obsoleted_By: desktop/compiz/plugin/compiz-fusion-main >= 0.5.11-0.133
Obsoleted_By: consolidation/gnome/gnome-incorporation = *
PkgBuild_Make_Empty_Package: true
+%endif
%package -n SUNWmysql-python26
IPS_Package_Name: SUNWmysql-python26