commit 9118db3b94f98a4943c436f1908dfee21caa8947
Author: Jakub Bogusz <[email protected]>
Date: Fri Mar 4 21:51:06 2022 +0100
- rediffed, updated Source URL, versioned Obsoletes
python-pygtk-pyc.patch | 15 +++++++--------
python-pygtk.spec | 5 +++--
2 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/python-pygtk.spec b/python-pygtk.spec
index 761d087..f6ac285 100644
--- a/python-pygtk.spec
+++ b/python-pygtk.spec
@@ -13,7 +13,7 @@ Release: 4
Epoch: 2
License: LGPL v2.1+
Group: Libraries/Python
-Source0:
http://ftp.gnome.org/pub/GNOME/sources/pygtk/2.24/%{module}-%{version}.tar.bz2
+Source0:
https://download.gnome.org/sources/pygtk/2.24/%{module}-%{version}.tar.bz2
# Source0-md5: a1051d5794fd7696d3c1af6422d17a49
Source1: %{name}-python.m4
Source2: %{name}-jhflags.m4
@@ -36,6 +36,7 @@ BuildRequires: python-pycairo-devel >= 1.2.6
BuildRequires: python-pygobject-devel >= 2.22.0
# needs /usr/share/doc/gtk-doc/html/pygobject/style.css
BuildRequires: python-pygobject-apidocs
+BuildRequires: rpm-build >= 4.6
BuildRequires: rpm-pythonprov
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -88,7 +89,7 @@ Requires: %{name}-atk = %{epoch}:%{version}-%{release}
Requires: %{name}-pango = %{epoch}:%{version}-%{release}
Requires: gtk+2 >= 2:2.24.0
Requires: python-pycairo >= 1.2.6
-Obsoletes: python-pygtk-glarea
+Obsoletes: python-pygtk-glarea < 1:2.2.0
Conflicts: python-pygtk < 1:1.0
%description gtk
diff --git a/python-pygtk-pyc.patch b/python-pygtk-pyc.patch
index a51e81f..f82599d 100644
--- a/python-pygtk-pyc.patch
+++ b/python-pygtk-pyc.patch
@@ -1,8 +1,7 @@
-diff -urN pygtk-2.14.0/gtk/Makefile.am pygtk-2.14.0.new/gtk/Makefile.am
---- pygtk-2.14.0/gtk/Makefile.am 2009-01-27 18:54:50.000000000 +0100
-+++ pygtk-2.14.0.new/gtk/Makefile.am 2009-02-16 11:04:37.000000000 +0100
-@@ -81,7 +81,7 @@
- GTKUNIXPRINT_DEFS += gtkunixprint-2.14.defs
+--- pygtk-2.24.0/gtk/Makefile.am.orig 2022-03-04 21:45:35.749117575 +0100
++++ pygtk-2.24.0/gtk/Makefile.am 2022-03-04 21:48:25.118200024 +0100
+@@ -139,7 +139,7 @@ GTK_DEFS += gtk-2.24.defs
+ GTK_TYPES_DEFS += gtk-2.24-types.defs
endif
-CREATEDEFS = $(PYTHON) $(CODEGENDIR)/createdefs.py
@@ -10,15 +9,15 @@ diff -urN pygtk-2.14.0/gtk/Makefile.am
pygtk-2.14.0.new/gtk/Makefile.am
GDK_OVERRIDES = \
gdk.override \
-@@ -217,7 +217,7 @@
-
+@@ -290,7 +290,7 @@ extra_codegen_args += --register $(PYGOB
+ endif
.defs.c:
- ($(PYTHON) $(CODEGENDIR)/codegen.py \
+ ($(PYTHON) $(CODEGENDIR)/codegen.pyc \
$(PYGTK_CODEGEN_DEFINES) \
-I $(srcdir) \
- --py_ssize_t-clean \
+ --py_ssize_t-clean $(extra_codegen_args) \
diff -urN pygtk-2.14.0/Makefile.am pygtk-2.14.0.new/Makefile.am
--- pygtk-2.14.0/Makefile.am 2009-01-27 18:55:44.000000000 +0100
+++ pygtk-2.14.0.new/Makefile.am 2009-02-16 11:04:10.000000000 +0100
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/python-pygtk.git/commitdiff/9118db3b94f98a4943c436f1908dfee21caa8947
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
