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

Matthias Clasen mclasen at fedoraproject.org
Tue Aug 24 02:51:04 UTC 2010


commit 548ee6137c3eaa66b7fb05737611e106af454085
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Mon Aug 23 22:46:53 2010 -0400

    drop gtk-doc dep

 libxklavier.spec |   15 +++++----------
 1 files changed, 5 insertions(+), 10 deletions(-)
---
diff --git a/libxklavier.spec b/libxklavier.spec
index c8b1a0a..becc0fc 100644
--- a/libxklavier.spec
+++ b/libxklavier.spec
@@ -1,7 +1,7 @@
 Summary:	High-level API for X Keyboard Extension
 Name:		libxklavier
 Version:	5.0
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 License:	LGPLv2+
 Group:		Development/Libraries
 URL: http://gswitchit.sourceforge.net/
@@ -13,7 +13,6 @@ BuildRequires: libxml2-devel
 BuildRequires: glib2-devel >= 2.6.0
 BuildRequires: iso-codes-devel
 Source: http://download.gnome.org/sources/libxklavier/5.0/%{name}-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # http://bugs.freedesktop.org/show_bug.cgi?id=22687
 Patch0: flags.patch
 Patch2: catch-more-xerrors.patch
@@ -28,8 +27,6 @@ commercial X servers. It is useful for creating XKB-related software
 Summary: Development files for libxklavier
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: pkgconfig
-Requires: gtk-doc
 Requires: libxml2-devel
 
 %description devel
@@ -52,15 +49,10 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 make install DESTDIR=$RPM_BUILD_ROOT
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la}
 
-%clean
-rm -rf %{buildroot}
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -77,9 +69,12 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/libxklavier.pc
 %{_libdir}/libxklavier.so
 %{_includedir}/libxklavier/
-%{_datadir}/gtk-doc/html/libxklavier/
+%{_datadir}/gtk-doc
 
 %changelog
+* Mon Aug 23 2010 Matthias Clasen <mclasen at redhat.com> 5.0-2
+- Co-own /usr/share/gtk-doc (#604402)
+
 * Sat Jan 16 2010 Matthias Clasen <mclasen at redhat.com> - 5.0-1
 - Update to 5.0
 


More information about the scm-commits mailing list