- updated build, move gda .defs file to proper package; obsolete gda if building...

diff --git a/python-gnome-extras.spec b/python-gnome-extras.spec
index 57c8d65221faf1c1d7822be290c57ba13546310b..099e94f97ff4677746c4dd581cb1f2affcfd4d19 100644 (file)
--- a/python-gnome-extras.spec
+++ b/python-gnome-extras.spec
@@ -13,11 +13,12 @@ Version:    2.25.3
 Release:       38
 License:       GPL v2/LGPL v2.1 (see COPYING)
 Group:         Libraries/Python
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-python-extras/2.25/%{module}-%{version}.tar.bz2
+Source0:       https://download.gnome.org/sources/gnome-python-extras/2.25/%{module}-%{version}.tar.bz2
 # Source0-md5: 9f3b7ec5c57130b96061cb486b79c076
 # http://bugzilla.gnome.org/show_bug.cgi?id=584126
 Patch0:                %{name}-new-gdl.patch
 Patch1:                %{name}-gtkdocdir.patch
+URL:           https://www.gnome.org/
 BuildRequires: autoconf >= 2.52
 BuildRequires: automake
 BuildRequires: docbook-dtd412-xml
@@ -42,9 +43,11 @@ BuildRequires:       python-pygobject-apidocs
 BuildRequires: readline-devel
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.234
+BuildRequires: sed >= 4.0
 %pyrequires_eq python-modules
+%{!?with_gda4:Obsoletes:       python-gnome-extras-gda < 2.25.3-35}
 Obsoletes:     python-gnome-extras-libgksu < 2.25.3-33
-Obsoletes:     python-gnome-extras-mozilla
+Obsoletes:     python-gnome-extras-mozilla < 2.25.3-32
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define pydefsdir %(pkg-config --variable=defsdir pygtk-2.0)
@@ -62,6 +65,7 @@ Group:                Libraries/Python
 Requires:      %{name}-egg = %{version}-%{release}
 Requires:      %{name}-gtkhtml = %{version}-%{release}
 Requires:      python-pygtk-devel >= %{pygtk_req}
+%{!?with_gda4:Obsoletes:       python-gnome-extras-gda-devel < 2.25.3-35}
 
 %description devel
 Development files for GNOME bindings for Python.
@@ -164,13 +168,20 @@ Wiązania Pythona do biblioteki gtkspell.
 %patch0 -p1
 %patch1 -p1
 
+%{__sed} -i -e '1s,/usr/bin/python$,%{__python},' examples/egg/trayicon.py
+
 %build
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 %configure \
        --enable-docs \
+       %{!?with_gda4:--disable-gda} \
+       --disable-gksu \
+       --disable-gksu2 \
+       --disable-gksuui \
        --disable-gtkmozembed
 
 %{__make}
@@ -196,7 +207,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
-%{pydefsdir}/*
+%{pydefsdir}/gtkhtml2.defs
+%{pydefsdir}/trayicon.defs
 %{_pkgconfigdir}/gnome-python-extras-2.0.pc
 
 %files examples
@@ -218,6 +230,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_includedir}/pygda-4.0
 %{_datadir}/pygtk/2.0/argtypes/gda-arg-types.py[co]
+%{pydefsdir}/gda.defs
 %{_pkgconfigdir}/pygda-4.0.pc
 %endif