[glade3/f15] Fix dependencies RHBZ 671592 and 604356

Peter Robinson pbrobinson at fedoraproject.org
Tue Jan 31 00:16:39 UTC 2012


commit 029256d8a7d21d19a3e266135e59c6b075c58c15
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Tue Jan 31 00:16:27 2012 +0000

    Fix dependencies RHBZ 671592 and 604356

 glade3.spec |   16 ++++++----------
 1 files changed, 6 insertions(+), 10 deletions(-)
---
diff --git a/glade3.spec b/glade3.spec
index 9086533..fc50205 100644
--- a/glade3.spec
+++ b/glade3.spec
@@ -1,13 +1,13 @@
 Summary:	User Interface Designer for GTK+ and GNOME
 Name:		glade3
 Version:	3.10.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 Epoch:		1
 License:	GPLv2+
 Group:		Development/Tools
 URL:		http://glade.gnome.org/
 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 = %{?epoch:%{epoch}:}:%{version}-%{release}
 BuildRequires:	desktop-file-utils
@@ -40,8 +40,6 @@ Summary:	Widget library for Glade UI designer
 License:	GPLv2+ and (GPLv2+ and LGPLv2+) and LGPLv2
 Group:		Development/Libraries
 
-Requires:	devhelp
-
 %description libgladeui
 Libgladeui consists of the widgets that compose the Glade GUI as a separate
 library to ease the integration of Glade into other applications.
@@ -51,9 +49,8 @@ Summary:	Development files for %{name}-libgladeui
 # The glade-parser.h header is under LGPLv2+, and the rest is GPLv2+.
 License:	GPLv2+ and LGPLv2+
 Group:		Development/Libraries
-
-Requires:	gtk-doc
 Requires:	%{name}-libgladeui = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	devhelp
 
 %description libgladeui-devel
 This package contains development files for %{name}-libgladeui.
@@ -95,7 +92,6 @@ pushd ./po
 popd
 
 %install
-rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d
 
 make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT
@@ -112,9 +108,6 @@ desktop-file-install %{?_remove_encoding} --vendor fedora --delete-original \
 chrpath --delete $RPM_BUILD_ROOT%{_libdir}/glade/modules/libgladepython.so
 chrpath --delete $RPM_BUILD_ROOT%{_libdir}/glade/modules/libgladegtk.so
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post
 update-desktop-database &> /dev/null || :
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -188,6 +181,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_includedir}/libgladeui-2.0/gladeui
 
 %changelog
+* Mon Jan 30 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 1:3.10.0-3
+- Fix dependencies RHBZ 671592 and 604356
+
 * Sat May 07 2011 Christopher Aillon <caillon at redhat.com> - 1:3.10.0-2
 - Update scriptlets
 


More information about the scm-commits mailing list