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

Matthias Clasen mclasen at fedoraproject.org
Tue Aug 24 02:15:39 UTC 2010


commit 68f8bbc579cdfcb6aa817678527dfbaacf474062
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Mon Aug 23 22:13:46 2010 -0400

    drop gtk-doc dep

 gok.spec |   27 ++++++++-------------------
 1 files changed, 8 insertions(+), 19 deletions(-)
---
diff --git a/gok.spec b/gok.spec
index 2221b8c..ce31c5d 100644
--- a/gok.spec
+++ b/gok.spec
@@ -3,7 +3,7 @@
 Summary: GNOME Onscreen Keyboard
 Name: gok
 Version: 2.30.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: User Interface/Desktops
 URL: http://www.gok.ca/
@@ -48,8 +48,6 @@ Requires: gtk2-devel
 Requires: gail-devel
 Requires: libwnck-devel
 Requires: at-spi-devel
-Requires: pkgconfig
-Requires: gtk-doc
 
 %description devel
 The gok project aims to enable users to control their computer without
@@ -88,8 +86,6 @@ done
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
@@ -97,24 +93,14 @@ unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 %find_lang %{po_package} --with-gnome
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gok.schemas > /dev/null || :
+%gconf_schema_upgrade gok
 
 %pre
-if [ "$1" -gt 1 ]; then
-  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/gok.schemas > /dev/null || :
-fi
+%gconf_schema_prepare gok
 
 %preun
-if [ "$1" -eq 0 ]; then
-  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/gok.schemas > /dev/null || :
-fi
+%gconf_schema_remove gok
 
 %files -f %{po_package}.lang
 %defattr(-,root,root,-)
@@ -134,9 +120,12 @@ fi
 %files devel
 %defattr(-, root, root)
 %{_libdir}/pkgconfig/*pc
-%{_datadir}/gtk-doc/html/gok
+%{_datadir}/gtk-doc
 
 %changelog
+* Mon Aug 23 2010 Matthias Clasen <mclasen at redhat.com> 2.30.0-2
+- Co-own /usr/share-gtk-doc (#604361)
+
 * Mon Mar 29 2010 Matthias Clasen <mclasen at redhat.com> 2.30.0-1
 - Update to 2.30.0
 


More information about the scm-commits mailing list