[ORBit2/f14/master] drop gtk-doc dep

Matthias Clasen mclasen at fedoraproject.org
Tue Sep 28 11:50:12 UTC 2010


commit aaba7ee2498f94afdae3aba0dce6cba6d2308852
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Mon Aug 23 16:12:05 2010 -0400

    drop gtk-doc dep

 ORBit2.spec |   14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)
---
diff --git a/ORBit2.spec b/ORBit2.spec
index 1b03465..4ec6e5a 100644
--- a/ORBit2.spec
+++ b/ORBit2.spec
@@ -4,7 +4,7 @@
 Summary: A high-performance CORBA Object Request Broker
 Name: ORBit2
 Version: 2.14.18
-Release: 1%{?dist}
+Release: 2%{?dist}
 #VCS: git:git://git.gnome.org/ORBit2
 Source: http://download.gnome.org/sources/ORBit2/2.14/%{name}-%{version}.tar.bz2
 Group: System Environment/Daemons
@@ -45,8 +45,6 @@ Requires: glib2-devel >= %{glib2_version}
 Requires: pkgconfig
 # we install an automake macro
 Requires: automake
-# for /usr/share/gtk-doc/html
-Requires: gtk-doc
 Conflicts: ORBit-devel <= 1:0.5.8
 
 %description devel
@@ -72,7 +70,6 @@ autoconf
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -110,9 +107,6 @@ EOF
 
 %postun -p /sbin/ldconfig
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README TODO
@@ -134,9 +128,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/*
 %{_datadir}/idl/orbit-2.0
 %{_bindir}/linc-cleanup-sockets
-%{_datadir}/gtk-doc/html/*
+%{_datadir}/gtk-doc
 
 %changelog
+* Mon Aug 23 2010 Matthias Clasen <mclasen at redhat.com> - 2.14.18-2
+- Co-own /usr/share/gtk-doc (#604406)
+- Some packaging cleanups
+
 * Tue Mar 30 2010 Matthias Clasen <mclasen at redhat.com> - 2.14.18-1
 - Update to 2.14.18
 


More information about the scm-commits mailing list