From 67c44837402605a216eb059f50af5b54284f1cb1 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Sep 11 2019 10:14:18 +0000
Subject: Retire and obsolete unused sub packages


---

diff --git a/gnome-python2-extras.spec b/gnome-python2-extras.spec
index 6686c00..ce21f1b 100644
--- a/gnome-python2-extras.spec
+++ b/gnome-python2-extras.spec
@@ -7,14 +7,11 @@
 %define libgda_version 3.99.9
 %define libgdl_version 2.24.0
 
-%define enable_gda 0
-%define enable_gdl 0
-
 ### Abstract ###
 
 Name: gnome-python2-extras
 Version: 2.25.3
-Release: 56%{?dist}
+Release: 57%{?dist}
 License: GPLv2+ and LGPLv2+
 Summary: Additional PyGNOME Python extension modules
 URL: http://www.pygtk.org/
@@ -27,6 +24,8 @@ Obsoletes: gnome-python2-gdl < 2.25.3-36
 Obsoletes: gnome-python2-gtkhtml2 < 2.25.3-36
 Obsoletes: gnome-python2-gtkmozembed < 2.25.3-36
 
+Obsoletes: gnome-python2-libegg < 2.25.3-57
+
 ### Patches ###
 
 # GNOME bug #584126
@@ -38,7 +37,7 @@ Requires: gnome-python2 >= %{gnome_python_version}
 
 ### Build Dependencies ###
 
-BuildRequires:  gcc
+BuildRequires: gcc
 BuildRequires: glib2 >= %{glib_version}
 BuildRequires: gnome-python2-bonobo >= %{gnome_python_version}
 BuildRequires: gnome-python2-devel >= %{gnome_python_version}
@@ -49,50 +48,10 @@ BuildRequires: libbonoboui-devel
 BuildRequires: pygtk2-devel
 BuildRequires: python2-devel
 
-%if %{enable_gda}
-BuildRequires: libgda-devel >= %{libgda_version}
-%endif
-
-%if %{enable_gdl}
-BuildRequires: libgdl-devel >= %{libgdl_version}
-%endif
-
 %description
 The gnome-python-extra package contains the source packages for additional 
 Python bindings for GNOME. It should be used together with gnome-python.
 
-%if %{enable_gda}
-%package -n gnome-python2-gda
-Summary: Python bindings for interacting with libgda
-Requires: %{name} = %{version}-%{release}
-Requires: libgda >= %{libgda_version}
-
-%description -n gnome-python2-gda
-This module contains a wrapper that allows the use of libgda via Python.
-
-%package -n gnome-python2-gda-devel
-Summary: Headers for developing programs that will use gnome-python2-gda
-Requires: gnome-python2-gda = %{version}-%{release}
-Requires: pkgconfig
-Requires: pygobject2-devel
-Requires: libgda-devel >= %{libgda_version}
-
-%description -n gnome-python2-gda-devel
-This module contains files needed for developing applications using
-gnome-python2-gda.
-%endif
-
-%if %{enable_gdl}
-%package -n gnome-python2-gdl
-Summary: Python bindings for the GNOME Development Library
-Requires: %{name} = %{version}-%{release}
-Requires: libgdl >= %{libgdl_version}
-
-%description -n gnome-python2-gdl
-This module contains a wrapper that allows the use of the GNOME Development
-Library (gdl) via Python.
-%endif
-
 %package -n gnome-python2-gtkspell
 Summary: Python bindings for interacting with gtkspell
 Requires: %{name} = %{version}-%{release}
@@ -101,73 +60,33 @@ Requires: gtkspell >= %{gtkspell_version}
 %description -n gnome-python2-gtkspell
 This module contains a wrapper that allows the use of gtkspell via Python.
 
-%package -n gnome-python2-libegg
-Summary: Python bindings for recent files and tray icons
-Requires: %{name} = %{version}-%{release}
-Requires: gnome-python2-bonobo >= %{gnome_python_version}
-Requires: gnome-python2-gnome >= %{gnome_python_version}
-
-%description -n gnome-python2-libegg
-This module contains a wrapper that allows the use of recent files and tray
-icons via Python.
-
 %prep
 %setup -q -n gnome-python-extras-%{version}
 %patch1 -p1 -b .update-for-2.27.2
 
 %build
-
-%if %{enable_gda}
-%define gda_flags --enable-gda
-%else
-%define gda_flags --disable-gda
-%endif
-
-%if %{enable_gdl}
-%define gdl_flags --enable-gdl
-%else
-%define gdl_flags --disable-gdl
-%endif
-
-%configure --enable-docs %gda_flags %gdl_flags
-make %{?_smp_mflags}
+%configure --enable-docs --disable-gda --disable-gdl --disable-eggtray --disable-eggrecent
+%{make_build}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+%{make_install}
 
-find $RPM_BUILD_ROOT -name '*.la' -exec rm {} \;
+find $RPM_BUILD_ROOT -name '*.la' -delete
 
 rm -rf $RPM_BUILD_ROOT/%{python_sitearch}/gtk-2.0/gksu
 
 %files
 %doc AUTHORS ChangeLog NEWS
 %{_libdir}/pkgconfig/gnome-python-extras-2.0.pc
-%{_datadir}/pygtk
-
-%if %{enable_gda}
-%files -n gnome-python2-gda
-%{python2_sitearch}/gtk-2.0/gda.so
-
-%files -n gnome-python2-gda-devel
-%{_includedir}/pygda-4.0/
-%{_libdir}/pkgconfig/pygda-4.0.pc
-%endif
-
-%if %{enable_gdl}
-%files -n gnome-python2-gdl
-%{python2_sitearch}/gtk-2.0/gdl.so
-%endif
 
 %files -n gnome-python2-gtkspell
 %{python2_sitearch}/gtk-2.0/gtkspell.so
 %{_datadir}/gtk-doc/html/pygtkspell
 
-%files -n gnome-python2-libegg
-%{python2_sitearch}/gtk-2.0/egg
-%doc examples/egg/*
-
 %changelog
+* Wed Sep 11 2019 Peter Robinson <pbrobinson@fedoraproject.org> 2.25.3-57
+- Retire and obsolete unused sub packages
+
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.25.3-56
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild