.gitignore

@@ -1 +1 @@
-SOURCES/glade-3.38.2.tar.xz
+SOURCES/glade-3.22.1.tar.xz

.glade.metadata

@@ -1 +1 @@
-d433fb5085c8f07d559f5a310be31238c1fdf36e SOURCES/glade-3.38.2.tar.xz
+395728b7f0b4c3a0acadd7e12c39db6296761b22 SOURCES/glade-3.22.1.tar.xz

SPECS/glade.spec

@@ -1,6 +1,6 @@
 Name:           glade
-Version:        3.38.2
-Release:        4%{?dist}
+Version:        3.22.1
+Release:        1%{?dist}
 Summary:        User Interface Designer for GTK+
 
 # - /usr/bin/glade is GPLv2+
@@ -8,26 +8,29 @@ Summary:        User Interface Designer for GTK+
 # - libgladeui-2.so, libgladegtk.so, and libgladepython.so all combine
 #   GPLv2+ and LGPLv2+ code, so the resulting binaries are GPLv2+
 License:        GPLv2+ and LGPLv2+
-URL:            https://glade.gnome.org/
-Source0:        https://download.gnome.org/sources/glade/3.38/glade-%{version}.tar.xz
+URL:            http://glade.gnome.org/
+Source0:        http://ftp.gnome.org/pub/GNOME/sources/glade/3.22/glade-%{version}.tar.xz
 
+BuildRequires:  chrpath
 BuildRequires:  desktop-file-utils
 BuildRequires:  docbook-style-xsl
-BuildRequires:  gcc
 BuildRequires:  gettext
-BuildRequires:  gjs-devel
 BuildRequires:  gtk3-devel
-BuildRequires:  gtk-doc
+BuildRequires:  intltool
 BuildRequires:  itstool
 BuildRequires:  libxml2-devel
-BuildRequires:  meson
+BuildRequires:  pygobject3-devel
 BuildRequires:  python3-devel
-BuildRequires:  python3-gobject-devel
 BuildRequires:  webkit2gtk3-devel
 BuildRequires:  /usr/bin/appstream-util
 BuildRequires:  /usr/bin/xsltproc
 
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
+# The gtk3 version of glade was packaged under the name of 'glade3' for a
+# while. However, following upstream naming, 'glade3' package is now the gtk2
+# version and 'glade' package is the gtk3 one. The obsoletes are here to
+# provide seamless upgrade path from the gtk3 based 'glade3'.
+Obsoletes:      glade3 < 1:3.11.0-3
 
 %description
 Glade is a RAD tool to enable quick and easy development of user interfaces for
@@ -40,6 +43,7 @@ and others.
 
 %package libs
 Summary:        Widget library for Glade UI designer
+Obsoletes:      glade3-libgladeui < 1:3.11.0-3
 
 %description    libs
 The %{name}-libs package consists of the widgets that compose the Glade GUI as
@@ -49,6 +53,7 @@ a separate library to ease the integration of Glade into other applications.
 %package devel
 Summary:        Development files for %{name}
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
+Obsoletes:      glade3-libgladeui-devel < 1:3.11.0-3
 
 %description    devel
 The %{name}-devel package contains libraries and header files for
@@ -60,31 +65,41 @@ developing applications that use Glade widget library.
 
 
 %build
-%meson -Dgtk_doc=true
-%meson_build
+export PYTHON=%{__python3}
+%configure --disable-static
+
+# Omit unused direct shared library dependencies.
+sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+make %{?_smp_mflags}
 
 
 %install
-%meson_install
+%make_install
+find $RPM_BUILD_ROOT -type f -name "*.la" -delete
+
+# Remove rpaths.
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/glade*
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/glade/modules/*.so
 
 %find_lang glade --with-gnome
 
 
 %check
-appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/metainfo/org.gnome.Glade.appdata.xml
-desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.Glade.desktop
+appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/metainfo/glade.appdata.xml
+desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/glade.desktop
 
 
 %files -f glade.lang
 %license COPYING*
-%doc AUTHORS NEWS
+%doc AUTHORS NEWS README
 %{_bindir}/glade
 %{_bindir}/glade-previewer
-%{_datadir}/applications/org.gnome.Glade.desktop
-%{_datadir}/icons/hicolor/scalable/apps/org.gnome.Glade.svg
-%{_datadir}/icons/hicolor/symbolic/apps/glade-brand-symbolic.svg
-%{_datadir}/icons/hicolor/symbolic/apps/org.gnome.Glade-symbolic.svg
-%{_datadir}/metainfo/org.gnome.Glade.appdata.xml
+%{_datadir}/applications/glade.desktop
+%{_datadir}/icons/hicolor/*/apps/glade.png
+%{_datadir}/icons/hicolor/scalable/apps/glade-brand-symbolic.svg
+%{_datadir}/icons/hicolor/scalable/apps/glade-symbolic.svg
+%{_datadir}/metainfo/glade.appdata.xml
 %{_mandir}/man1/glade.1*
 %{_mandir}/man1/glade-previewer*
 
@@ -94,94 +109,22 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.Glade.de
 %{_libdir}/girepository-1.0/Gladeui-2.0.typelib
 %dir %{_libdir}/glade/
 %dir %{_libdir}/glade/modules/
-%{_libdir}/glade/modules/libgladegjs.so
 %{_libdir}/glade/modules/libgladegtk.so
 %{_libdir}/glade/modules/libgladepython.so
 %{_libdir}/glade/modules/libgladewebkit2gtk.so
-%{_libdir}/libgladeui-2.so.13*
+%{_libdir}/libgladeui-2.so.*
 %{_datadir}/glade/
 
 %files devel
 %{_includedir}/libgladeui-2.0/
 %{_libdir}/libgladeui-2.so
 %{_libdir}/pkgconfig/gladeui-2.0.pc
-%dir %{_datadir}/gettext
-%dir %{_datadir}/gettext/its
-%{_datadir}/gettext/its/glade-catalog.its
-%{_datadir}/gettext/its/glade-catalog.loc
 %dir %{_datadir}/gir-1.0
 %{_datadir}/gir-1.0/Gladeui-2.0.gir
 %doc %{_datadir}/gtk-doc/
 
 
 %changelog
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 3.38.2-4
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 3.38.2-3
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.38.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Nov 25 2020 Kalev Lember <klember@redhat.com> - 3.38.2-1
-- Update to 3.38.2
-- Drop old obsoletes
-- BR python3-gobject-devel rather than pygobject3-devel
-
-* Mon Oct  5 2020 Kalev Lember <klember@redhat.com> - 3.38.1-1
-- Update to 3.38.1
-
-* Fri Oct 02 2020 Kalev Lember <klember@redhat.com> - 3.38.0-2
-- Drop compat ABI version
-
-* Sun Sep 13 2020 Kalev Lember <klember@redhat.com> - 3.38.0-1
-- Update to 3.38.0
-- Temporarily ship previous soname for ABI compat
-
-* Mon Aug 17 2020 Kalev Lember <klember@redhat.com> - 3.37.0-1
-- Update to 3.37.0
-- Switch to the meson build system
-
-* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.36.0-5
-- Second attempt - Rebuilt for
-  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.36.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Sat May 23 2020 Miro Hrončok <mhroncok@redhat.com> - 3.36.0-3
-- Rebuilt for Python 3.9
-
-* Fri May 22 2020 Kalev Lember <klember@redhat.com> - 3.36.0-2
-- Tighten libgladeui soname globs
-
-* Thu May 07 2020 Kalev Lember <klember@redhat.com> - 3.36.0-1
-- Update to 3.36.0
-- Use https download URLs
-
-* Wed Feb 26 2020 Kalev Lember <klember@redhat.com> - 3.22.2-1
-- Update to 3.22.2
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.22.1-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Fri Aug 16 2019 Miro Hrončok <mhroncok@redhat.com> - 3.22.1-6
-- Rebuilt for Python 3.8
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.22.1-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.22.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.22.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Sun Jun 17 2018 Miro Hrončok <mhroncok@redhat.com> - 3.22.1-2
-- Rebuilt for Python 3.7
-
 * Tue Apr 03 2018 Kalev Lember <klember@redhat.com> - 3.22.1-1
 - Update to 3.22.1