[glade3] Fix dependencies RHBZ 671592 and 604356
Peter Robinson
pbrobinson at fedoraproject.org
Mon Jan 30 17:20:44 UTC 2012
commit 616804d3e394999064d798925a445b9d9b9fbb85
Author: Peter Robinson <pbrobinson at gmail.com>
Date: Mon Jan 30 17:20:40 2012 +0000
Fix dependencies RHBZ 671592 and 604356
glade3.spec | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
---
diff --git a/glade3.spec b/glade3.spec
index 6ed8b77..78250aa 100644
--- a/glade3.spec
+++ b/glade3.spec
@@ -1,7 +1,7 @@
Summary: User Interface Designer for GTK+ and GNOME
Name: glade3
Version: 3.10.2
-Release: 2%{?dist}
+Release: 3%{?dist}
Epoch: 1
License: GPLv2+
Group: Development/Tools
@@ -9,7 +9,6 @@ URL: http://glade.gnome.org/
Source0: http://ftp.gnome.org/pub/GNOME/sources/glade/3.10/glade-%{version}.tar.xz
Patch0: bump-to-pygobject3.patch
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Requires: hicolor-icon-theme
Requires: %{name}-libgladeui = %{?epoch:%{epoch}:}:%{version}-%{release}
BuildRequires: desktop-file-utils
@@ -43,8 +42,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.
@@ -54,9 +51,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.
@@ -101,7 +97,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
@@ -118,9 +113,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 || :
@@ -194,6 +186,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.2-3
+- Fix dependencies RHBZ 671592 and 604356
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.10.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
More information about the scm-commits
mailing list