2009-12-03 Wang Xin <
[email protected]>
Fixes python 2.6 problem.
* SUNWgnome-panel.spec:
* base-specs/gnome-menus.spec:
* patches/gnome-menus-06-python2.6.diff:
--- a/SUNWgnome-panel.spec Thu Dec 03 10:41:30 2009 +0000
+++ b/SUNWgnome-panel.spec Thu Dec 03 11:54:35 2009 +0000
@@ -45,7 +45,7 @@
BuildRequires: SUNWlxml-python
BuildRequires: SUNWlibrsvg-devel
BuildRequires: SUNWlibsexy-devel
-BuildRequires: SUNWpython-setuptools
+BuildRequires: SUNWpython26-setuptools
BuildRequires: SUNWgtk-doc
Requires: SUNWxorg-clientlibs
Requires: SUNWlibglade
@@ -64,7 +64,7 @@
Requires: SUNWevolution-data-server
Requires: SUNWiso-codes
Requires: SUNWdbus
-Requires: SUNWPython
+Requires: SUNWPython26
BuildRequires: SUNWtgnome-tsol-libs-devel
%if %option_without_fox
--- a/base-specs/gnome-menus.spec Thu Dec 03 10:41:30 2009 +0000
+++ b/base-specs/gnome-menus.spec Thu Dec 03 11:54:35 2009 +0000
@@ -32,6 +32,8 @@
Patch4: gnome-menus-04-menu-monitor.diff
# date:2009-10-16 type:bug owner:jedy doo:11689
Patch5: gnome-menus-05-lost-menu.diff
+# date:2009-12-03 type:branding owner:jedy
+Patch6: gnome-menus-06-python2.6.diff
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/%{name}
@@ -81,6 +83,7 @@
%endif
%patch4 -p1
%patch5 -p1
+%patch6 -p1
%build
%ifos linux
@@ -94,6 +97,8 @@
CPUS=1
fi
+export PYTHON=/usr/bin/python%{default_python_version}
+
libtoolize --force
glib-gettextize -f
intltoolize --force --copy --automake
@@ -159,6 +164,8 @@
%{_includedir}/gnome-menus/*
%changelog
+* Thu Dec 03 2009 - [email protected]
+- Add 17-python2.6.diff to fix python 2.6 problem.
* Fri Oct 23 2009 - [email protected]
- Change owner to jedy.
* Fri Oct 16 2009 - [email protected]
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-menus-06-python2.6.diff Thu Dec 03 11:54:35 2009 +0000
@@ -0,0 +1,9 @@
+diff -uprN gnome-menus-2.28.0.1/simple-editor/GMenuSimpleEditor/config.py.in gnome-menus-2.28.0.1-new/simple-editor/GMenuSimpleEditor/config.py.in
+--- gnome-menus-2.28.0.1/simple-editor/GMenuSimpleEditor/config.py.in 2009-06-30 07:13:03.000000000 +0800
++++ gnome-menus-2.28.0.1-new/simple-editor/GMenuSimpleEditor/config.py.in 2009-12-03 18:42:27.643870037 +0800
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2.6
+
+ #
+ # Copyright (C) 2005 Red Hat, Inc.