From b9bc15499946062dd20d403faa61cf62cf619c554cea24be34e13ad4cbb64762 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sun, 29 Sep 2013 16:59:39 +0000 Subject: [PATCH] Accepting request 200563 from devel:languages:python3 Fix building python 3 version on openSUSE <= 12.3 (forwarded request 200562 from TheBlackCat) OBS-URL: https://build.opensuse.org/request/show/200563 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/python-gobject2?expand=0&rev=10 --- python-gobject2.changes | 5 +++++ python-gobject2.spec | 12 ++++++------ python3-gobject2.changes | 5 +++++ python3-gobject2.spec | 12 ++++++------ 4 files changed, 22 insertions(+), 12 deletions(-) diff --git a/python-gobject2.changes b/python-gobject2.changes index a832f64..7f25488 100644 --- a/python-gobject2.changes +++ b/python-gobject2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Sep 25 12:24:06 UTC 2013 - toddrme2178@gmail.com + +- Fix building python 3 version on openSUSE <= 12.3 + ------------------------------------------------------------------- Tue Jul 16 08:53:05 UTC 2013 - dimstar@opensuse.org diff --git a/python-gobject2.spec b/python-gobject2.spec index 3bd4329..314c978 100644 --- a/python-gobject2.spec +++ b/python-gobject2.spec @@ -19,7 +19,7 @@ %define build_for_python3 0 %if %{build_for_python3} -%define local_py_requires Requires: python(abi) = %py3_ver +%define local_py_requires Requires: python(abi) = %{py3_ver} %define local_py_sitedir %{python3_sitearch} %else %define local_py_requires %{py_requires} @@ -103,10 +103,10 @@ make %{?jobs:-j%jobs} V=1 %makeinstall find %{buildroot} -name '*.la' -delete -print rm examples/Makefile* -%fdupes $RPM_BUILD_ROOT +%fdupes %{buildroot} %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %post -p /sbin/ldconfig @@ -115,14 +115,14 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc AUTHORS NEWS README ChangeLog examples -%dir %{local_py_sitedir}/gtk-2.0 -%{local_py_sitedir}/gtk-2.0/gio/ %{local_py_sitedir}/glib/ %{local_py_sitedir}/gobject/ +%dir %{local_py_sitedir}/gtk-2.0 %{local_py_sitedir}/gtk-2.0/dsextras.py* +%{local_py_sitedir}/gtk-2.0/gio/ %{local_py_sitedir}/pygtk.* %{_libdir}/*.so.* -%if %{build_for_python3} +%if %{build_for_python3} && 0%{?suse_version} > 1230 %{local_py_sitedir}/__pycache__/ %{local_py_sitedir}/gtk-2.0/__pycache__/ %endif diff --git a/python3-gobject2.changes b/python3-gobject2.changes index a832f64..7f25488 100644 --- a/python3-gobject2.changes +++ b/python3-gobject2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Sep 25 12:24:06 UTC 2013 - toddrme2178@gmail.com + +- Fix building python 3 version on openSUSE <= 12.3 + ------------------------------------------------------------------- Tue Jul 16 08:53:05 UTC 2013 - dimstar@opensuse.org diff --git a/python3-gobject2.spec b/python3-gobject2.spec index 4872ab6..23266fd 100644 --- a/python3-gobject2.spec +++ b/python3-gobject2.spec @@ -19,7 +19,7 @@ %define build_for_python3 1 %if %{build_for_python3} -%define local_py_requires Requires: python(abi) = %py3_ver +%define local_py_requires Requires: python(abi) = %{py3_ver} %define local_py_sitedir %{python3_sitearch} %else %define local_py_requires %{py_requires} @@ -103,10 +103,10 @@ make %{?jobs:-j%jobs} V=1 %makeinstall find %{buildroot} -name '*.la' -delete -print rm examples/Makefile* -%fdupes $RPM_BUILD_ROOT +%fdupes %{buildroot} %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %post -p /sbin/ldconfig @@ -115,14 +115,14 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc AUTHORS NEWS README ChangeLog examples -%dir %{local_py_sitedir}/gtk-2.0 -%{local_py_sitedir}/gtk-2.0/gio/ %{local_py_sitedir}/glib/ %{local_py_sitedir}/gobject/ +%dir %{local_py_sitedir}/gtk-2.0 %{local_py_sitedir}/gtk-2.0/dsextras.py* +%{local_py_sitedir}/gtk-2.0/gio/ %{local_py_sitedir}/pygtk.* %{_libdir}/*.so.* -%if %{build_for_python3} +%if %{build_for_python3} && 0%{?suse_version} > 1230 %{local_py_sitedir}/__pycache__/ %{local_py_sitedir}/gtk-2.0/__pycache__/ %endif