[glade3] Update to 3.10.0

Fri Apr 22 13:46:47 UTC 2011

commit d0954a1dedc02cb52bc6d87aafebee1d322cd063
Author: Tomas Bzatek <tbzatek at redhat.com>
Date:   Fri Apr 22 15:46:19 2011 +0200

    Update to 3.10.0

 .gitignore                   |    3 +-
 glade3-3.6.5-desktop.patch   |   11 ---
 glade3-3.6.5-pkgconfig.patch |   11 ---
 glade3.spec                  |  140 +++++++++++++++++++++++++++++-------------
 sources                      |    2 +-
 5 files changed, 99 insertions(+), 68 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index f0f3cd2..a16ab47 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-glade3-3.7.1.tar.bz2
-/glade3-3.7.3.tar.bz2
+glade-3.10.0.tar.bz2
diff --git a/glade3.spec b/glade3.spec
index 2f0c2cc..4847262 100644
--- a/glade3.spec
+++ b/glade3.spec
@@ -1,30 +1,29 @@
 Summary:	User Interface Designer for GTK+ and GNOME
 Name:		glade3
-Version:	3.7.3
+Version:	3.10.0
 Release:	1%{?dist}
+Epoch:		1
 License:	GPLv2+
 Group:		Development/Tools
 URL:		http://glade.gnome.org/
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/glade3/3.7/%{name}-%{version}.tar.bz2
-
-#Patch0:		%{name}-3.6.5-pkgconfig.patch
-
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/glade/3.10/glade-%{version}.tar.bz2
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-
 Requires:	hicolor-icon-theme
-Requires:	%{name}-libgladeui = %{version}-%{release}
+Requires:	%{name}-libgladeui = %{?epoch:%{epoch}:}:%{version}-%{release}
 Requires(post):	scrollkeeper
 Requires(postun): scrollkeeper
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 BuildRequires:	gnome-doc-utils
-BuildRequires:	gtk2-devel >= 2.14.0
+BuildRequires:	gtk3-devel
+BuildRequires:	gtk-doc
 BuildRequires:	intltool
-BuildRequires:	libgnomeui-devel
 BuildRequires:	libtool
-BuildRequires:	pygtk2-devel
+BuildRequires:	libxml2-devel
+BuildRequires:	pygobject2-devel
+BuildRequires:	python2-devel
 BuildRequires:	scrollkeeper
-BuildRequires:  chrpath
+BuildRequires:	chrpath
 
 %description
 Glade is a RAD tool to enable quick and easy development of user interfaces for
@@ -56,22 +55,23 @@ License:	GPLv2+ and LGPLv2+
 Group:		Development/Libraries
 
 Requires:	gtk-doc
-Requires:	%{name}-libgladeui = %{version}-%{release}
+Requires:	%{name}-libgladeui = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description libgladeui-devel
 This package contains development files for %{name}-libgladeui.
 
 %prep
-%setup -q
-#%patch0 -p1
+%setup -q -n glade-%{version}
 
 # Suppress rpmlint warning.
 chmod 644 ./plugins/gtk+/glade-attributes.c
 chmod 644 ./plugins/gtk+/glade-attributes.h
 
 %build
-%configure --disable-static --enable-gnome --enable-gtk-doc --enable-python \
-  --enable-scrollkeeper --disable-rpath
+%configure --disable-static \
+  --enable-gtk-doc \
+  --enable-python \
+  --enable-scrollkeeper
 
 # Remove rpaths.
 rm -f ./libtool
@@ -91,7 +91,7 @@ pushd ./po
   mv POTFILES.keep POTFILES.in
   intltool-update --pot
   for p in *.po; do
-    msgmerge $p %{name}.pot > $p.out
+    msgmerge $p glade.pot > $p.out
     msgfmt -o `basename $p .po`.gmo $p.out
   done
 popd
@@ -104,16 +104,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 %{name}
+%find_lang glade
 
 desktop-file-install %{?_remove_encoding} --vendor fedora --delete-original \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  $RPM_BUILD_ROOT%{_datadir}/applications/glade-3.desktop
+  $RPM_BUILD_ROOT%{_datadir}/applications/glade.desktop
+
+# Rpath
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/glade/modules/libgladepython.so
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/glade/modules/libgladegtk.so
 
-#remove rpaths
-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
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -145,7 +145,7 @@ fi
 
 %postun libgladeui -p /sbin/ldconfig
 
-%files -f %{name}.lang
+%files -f glade.lang
 %defattr(-,root,root,-)
 %doc AUTHORS
 %doc ChangeLog
@@ -153,15 +153,15 @@ fi
 %doc NEWS
 %doc README
 %doc TODO
-%{_bindir}/glade-3
-%{_bindir}/glade-3-previewer
-%{_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
+%{_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/*
@@ -174,29 +174,83 @@ fi
 %doc COPYING
 %doc COPYING.GPL
 %doc COPYING.LGPL
-%{_libdir}/libgladeui-1.so.*
+%{_libdir}/libgladeui-2.so.*
 
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/catalogs
-%{_datadir}/%{name}/pixmaps
+%dir %{_datadir}/glade
+%{_datadir}/glade/catalogs
+%{_datadir}/glade/pixmaps
 
-%dir %{_libdir}/%{name}
+%dir %{_libdir}/glade
 # Contains *.so files that are not symlinked to *.so.* files.
-%{_libdir}/%{name}/modules
+%{_libdir}/glade/modules
 
 %files libgladeui-devel
 %defattr(-,root,root,-)
 %doc COPYING.GPL
-%{_libdir}/libgladeui-1.so
-%{_libdir}/pkgconfig/gladeui-1.0.pc
+%{_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
 
 %dir %{_datadir}/gtk-doc/html/gladeui
 %doc %{_datadir}/gtk-doc/html/gladeui/*
 
-%dir %{_includedir}/libgladeui-1.0
-%{_includedir}/libgladeui-1.0/gladeui
+%dir %{_includedir}/libgladeui-2.0
+%{_includedir}/libgladeui-2.0/gladeui
 
 %changelog
+* Thu Apr 14 2011 Kalev Lember <kalev at smartlink.ee> - 1:3.10.0-1
+- Update to 3.10.0
+- Build with gtk3 (#678078)
+- Enabled introspection
+- Use pygobject instead of pygtk2 for glade-python
+- Dropped upstreamed glade-3.9.2-doc.patch
+
+* Thu Mar 31 2011 Dan Horák <dan[at]danny.cz> - 1:3.9.2-3
+- better build fix
+
+* Fri Mar 18 2011 Dan Horák <dan[at]danny.cz> - 1:3.9.2-2
+- fix build on s390(x)
+
+* Tue Feb 22 2011 Rakesh Pandit <rakesh at fedoraproject.org> - 1:3.9.2-1
+- Added epoch to keep update path working
+- Removed old patches
+- Updated to 3.9.2 (GNOME 3)
+ * Added signal for IDEs to track created signal editors, 
+   Johannes Schmid.
+ * Stop installing catalog .xml.in files, Emilio Pozuelo Monfort.
+   Fixed various memory leaks.
+ * Removed GtkTreeSelection from the palette, it's only available as 
+   the internal child of a GtkTreeView
+ * Fixed Drag'n'Drop image drawing with cairo for signal editor, 
+   Johannes Schmid with help from Benjamin Otte.
+ * Fixed crashes and memory leaks in the GladeBaseEditor (the editor 
+   used for menu editing and treeview editing and the like).
+ * Edit->Preferences is now File->Properties
+ * Removed option for project naming policies, object ids in 
+   GtkBuilder are always unique across the whole file.
+ * Render project widgets in the workspace offscreen, this gives us 
+   more power over the widgets (combo boxes can now be selected, 
+   selection drawing is now enhanced), Juan Pablo Ugarte.
+ * Added support for GtkComboBoxText with a customized editor to 
+   edit the combo box items.
+ * Added GtkRecentFilter and GtkRecentManager to the palette,
+   GtkRecentFilter can specify patterns, mime-types and applications 
+   for the filtering.
+ * Added support to edit patterns and mime-types for GtkFileFilter
+ * Added <add-child-verify-function> to the plugin backend, 
+   we now use this to better police user activities in Glade 
+   (notably, you cannot paste a widget that is not a GtkToolItem
+   to a GtkToolBar or the like).
+ * Renamed various things from glade-3/glade3 to 'glade' 
+   (the Glade icon, the bugzilla database, the git repository etc, 
+   help from Javier Jardón).
+ * Glade now uses GtkApplication and is a single instance application.
+ * Added support for editing a GtkOffscreenWindow
+ * Changed the workspace to now include all toplevel project objects,
+   selecting an object from the inspector causes the workspace to scroll
+   to the selected widget, Juan Pablo Ugarte.
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.7.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 8d5fcc2..4e67b79 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-71386fe0296a4044fa77a3dfaff4f5b1  glade3-3.7.3.tar.bz2
+70c61582bdc6e9a852b29f3d172ddd4e  glade-3.10.0.tar.bz2
