[glade3] Revert back to gtk2-based 3.8.2 (#731227)

Fri Apr 13 20:15:42 UTC 2012

commit e155417b253c3da4b05169306648cf2ae86e120c
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Fri Apr 13 23:14:49 2012 +0300

    Revert back to gtk2-based 3.8.2 (#731227)
    
    Following upstream, the gtk3 version is now in 'glade' package.

 .gitignore                                         |    1 +
 ...69272-Emit-a-signal-to-notify-signal-acti.patch |  121 --------------------
 bump-to-pygobject3.patch                           |   93 ---------------
 glade-fixdso.patch                                 |   11 --
 glade3.spec                                        |   90 +++++++-------
 sources                                            |    2 +-
 6 files changed, 47 insertions(+), 271 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 36cfa4d..de767ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 glade-3.10.0.tar.bz2
 /glade-3.10.2.tar.xz
 /glade-3.11.0.tar.xz
+/glade3-3.8.2.tar.xz
diff --git a/glade3.spec b/glade3.spec
index 50e1a9d..2f1a260 100644
--- a/glade3.spec
+++ b/glade3.spec
@@ -1,26 +1,25 @@
 Summary:	User Interface Designer for GTK+ and GNOME
 Name:		glade3
-Version:	3.11.0
-Release:	2%{?dist}
-Epoch:		1
+Version:	3.8.2
+Release:	1%{?dist}
+Epoch:		2
 License:	GPLv2+
 Group:		Development/Tools
 URL:		http://glade.gnome.org/
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/glade/3.11/glade-%{version}.tar.xz
-# Upstream patch that adds glade_signal_editor_get_widget(), needed for Anjuta
-Patch0:		0001-Fixed-bug-669272-Emit-a-signal-to-notify-signal-acti.patch
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/glade3/3.8/glade3-%{version}.tar.xz
 
 Requires:	hicolor-icon-theme
 Requires:	%{name}-libgladeui = %{?epoch:%{epoch}:}:%{version}-%{release}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 BuildRequires:	gnome-doc-utils
-BuildRequires:	gtk3-devel
+BuildRequires:	gtk2-devel
 BuildRequires:	gtk-doc
 BuildRequires:	intltool
+BuildRequires:	libgnomeui-devel
 BuildRequires:	libtool
 BuildRequires:	libxml2-devel
-BuildRequires:	pygobject3-devel
+BuildRequires:	pygtk2-devel
 BuildRequires:	python2-devel
 BuildRequires:	scrollkeeper
 BuildRequires:	chrpath
@@ -59,8 +58,7 @@ Requires:	devhelp
 This package contains development files for %{name}-libgladeui.
 
 %prep
-%setup -q -n glade-%{version}
-%patch0 -p1 -b .signal_editor_get_widget
+%setup -q
 
 # Suppress rpmlint warning.
 chmod 644 ./plugins/gtk+/glade-attributes.c
@@ -92,7 +90,7 @@ pushd ./po
   mv POTFILES.keep POTFILES.in
   intltool-update --pot
   for p in *.po; do
-    msgmerge $p glade.pot > $p.out
+    msgmerge $p glade3.pot > $p.out
     msgfmt -o `basename $p .po`.gmo $p.out
   done
 popd
@@ -104,15 +102,16 @@ make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name "*.la" -delete
 find $RPM_BUILD_ROOT -type f -name "*.a" -delete
 
-%find_lang glade
+%find_lang glade3
 
 desktop-file-install %{?_remove_encoding} --vendor fedora --delete-original \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  $RPM_BUILD_ROOT%{_datadir}/applications/glade.desktop
+  $RPM_BUILD_ROOT%{_datadir}/applications/glade-3.desktop
 
 # Rpath
-chrpath --delete $RPM_BUILD_ROOT%{_libdir}/glade/modules/libgladepython.so
-chrpath --delete $RPM_BUILD_ROOT%{_libdir}/glade/modules/libgladegtk.so
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/glade3/modules/libgladegnome.so
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/glade3/modules/libgladegtk.so
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/glade3/modules/libgladepython.so
 
 %post
 update-desktop-database &> /dev/null || :
@@ -133,7 +132,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun libgladeui -p /sbin/ldconfig
 
-%files -f glade.lang
+%files -f glade3.lang
 %defattr(-,root,root,-)
 %doc AUTHORS
 %doc ChangeLog
@@ -141,52 +140,53 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %doc NEWS
 %doc README
 %doc TODO
-%{_bindir}/glade
-%{_bindir}/glade-previewer
-%{_datadir}/applications/fedora-glade.desktop
-%{_datadir}/icons/hicolor/16x16/apps/glade.png
-%{_datadir}/icons/hicolor/22x22/apps/glade.png
-%{_datadir}/icons/hicolor/24x24/apps/glade.png
-%{_datadir}/icons/hicolor/32x32/apps/glade.png
-%{_datadir}/icons/hicolor/48x48/apps/glade.png
-%{_datadir}/icons/hicolor/256x256/apps/glade.png
-
-%dir %{_datadir}/gnome/help/glade
-%{_datadir}/gnome/help/glade/*
-
-%dir %{_datadir}/omf/glade
-%{_datadir}/omf/glade/*
+%{_bindir}/glade-3
+%{_datadir}/applications/fedora-glade-3.desktop
+%{_datadir}/icons/hicolor/16x16/apps/glade-3.png
+%{_datadir}/icons/hicolor/22x22/apps/glade-3.png
+%{_datadir}/icons/hicolor/24x24/apps/glade-3.png
+%{_datadir}/icons/hicolor/32x32/apps/glade-3.png
+%{_datadir}/icons/hicolor/48x48/apps/glade-3.png
+%{_datadir}/icons/hicolor/scalable/apps/glade-3.svg
+
+%dir %{_datadir}/gnome/help/glade3
+%{_datadir}/gnome/help/glade3/*
+
+%dir %{_datadir}/omf/glade3
+%{_datadir}/omf/glade3/*
 
 %files libgladeui
 %defattr(-,root,root,-)
 %doc COPYING
 %doc COPYING.GPL
 %doc COPYING.LGPL
-%{_libdir}/libgladeui-2.so.*
+%{_libdir}/libgladeui-1.so.*
 
-%dir %{_datadir}/glade
-%{_datadir}/glade/catalogs
-%{_datadir}/glade/pixmaps
+%dir %{_datadir}/glade3
+%{_datadir}/glade3/catalogs
+%{_datadir}/glade3/pixmaps
 
-%dir %{_libdir}/glade
+%dir %{_libdir}/glade3
 # Contains *.so files that are not symlinked to *.so.* files.
-%{_libdir}/glade/modules
+%{_libdir}/glade3/modules
 
 %files libgladeui-devel
 %defattr(-,root,root,-)
 %doc COPYING.GPL
-%{_libdir}/libgladeui-2.so
-%{_libdir}/pkgconfig/gladeui-2.0.pc
-%{_libdir}/girepository-1.0/Gladeui-2.0.typelib
-%{_datadir}/gir-1.0/Gladeui-2.0.gir
+%{_libdir}/libgladeui-1.so
+%{_libdir}/pkgconfig/gladeui-1.0.pc
 
-%dir %{_datadir}/gtk-doc/html/gladeui-2
-%doc %{_datadir}/gtk-doc/html/gladeui-2/*
+%dir %{_datadir}/gtk-doc/html/gladeui
+%doc %{_datadir}/gtk-doc/html/gladeui/*
 
-%dir %{_includedir}/libgladeui-2.0
-%{_includedir}/libgladeui-2.0/gladeui
+%dir %{_includedir}/libgladeui-1.0
+%{_includedir}/libgladeui-1.0/gladeui
 
 %changelog
+* Fri Apr 13 2012 Kalev Lember <kalevlember at gmail.com> - 2:3.8.2-1
+- Revert back to gtk2-based 3.8.2 -- following upstream, the gtk3
+  version is now in 'glade' package (#731227)
+
 * Sat Mar 17 2012 Kalev Lember <kalevlember at gmail.com> - 1:3.11.0-2
 - Backport patch to add glade_signal_editor_get_widget(), needed for Anjuta
 
diff --git a/sources b/sources
index d51311f..4706ae0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cd8e641c15c6865859ef741b603c1b31  glade-3.11.0.tar.xz
+b5da0ce717b2dc710e93a10b97c0f9ce  glade3-3.8.2.tar.xz
