devel/drivel drivel.spec,1.1,1.2

[Jeremy Katz (katzj)]

Author: katzj

Update of /cvs/extras/devel/drivel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17546

Modified Files:
	drivel.spec 
Log Message:
* Sun Jun 12 2005 Jeremy Katz <katzj at redhat.com> 2.0.0-3
- gconf schema removal, BR gettext, add Fedora category to the desktop file 
  (noticed by mschwendt)



Index: drivel.spec
===================================================================
RCS file: /cvs/extras/devel/drivel/drivel.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- drivel.spec	12 Jun 2005 21:07:57 -0000	1.1
+++ drivel.spec	13 Jun 2005 00:09:29 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: A journal or "blog" client
 Name: drivel
 Version: 2.0.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: Applications/Internet
 Url: http://www.dropline.net/drivel
@@ -19,8 +19,13 @@
 BuildRequires: libgnomeui-devel
 BuildRequires: gtksourceview-devel
 BuildRequires: curl-devel
+BuildRequires: gettext
+BuildRequires: desktop-file-utils
 Requires: glib2 >= 2.4.0
 Requires: gtk2 >= 2.4.0
+Requires(pre): GConf2
+Requires(post): GConf2
+Requires(preun): GConf2
 
 %description
 Drivel is an advanced journal client for the GNOME desktop.  It had been 
@@ -39,6 +44,8 @@
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
 
+desktop-file-install --vendor gnome --add-category X-Fedora --dir $RPM_BUILD_ROOT/%{_datadir}/applications $RPM_BUILD_ROOT/%{_datadir}/applications/gnome-drivel.desktop
+
 %find_lang %{name}
 
 rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
@@ -59,6 +66,20 @@
   update-desktop-database -q > /dev/null
 fi
 
+%pre
+if [ "$1" -gt 1 ]; then
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/drivel.schemas >/dev/null
+fi
+exit 0
+
+%preun
+if [ "$1" -eq 0 ]; then
+	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+	gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/drivel.schemas > /dev/null
+fi
+exit 0
+
 %postun
 if (update-mime-database -v &> /dev/null); then
   update-mime-database "%{_datadir}/mime" > /dev/null
@@ -77,25 +98,23 @@
 %{_bindir}/drivel
 %{_datadir}/applications/gnome-drivel.desktop
 %{_datadir}/application-registry/drivel.applications
-%dir %{_datadir}/drivel
-%{_datadir}/drivel/glade/drivel.glade
-%{_datadir}/drivel/languages/livejournal.lang
-%dir %{_datadir}/gnome/help/drivel
-%{_datadir}/gnome/help/drivel/*
+%{_datadir}/drivel/
+%{_datadir}/gnome/help/drivel/
 %{_datadir}/icons/gnome/48x48/mimetypes/gnome-mime-application-x-drivel.png
 %{_datadir}/mime/packages/drivel.xml
 %{_datadir}/mime-info/drivel.keys
 %{_datadir}/mime-info/drivel.mime
-%dir %{_datadir}/omf/drivel
-%{_datadir}/omf/drivel/drivel-C.omf
+%{_datadir}/omf/drivel/
 %{_datadir}/pixmaps/drivel-48.png
-%dir %{_datadir}/pixmaps/drivel
-%{_datadir}/pixmaps/drivel/*.png
-%{_datadir}/pixmaps/drivel/*.xpm
+%{_datadir}/pixmaps/drivel/
 %config %{_sysconfdir}/gconf/schemas/*
 
 %changelog
-* Fri Jun 10 2005 Jeremy Katz <katzj at redhat.com> - 2.0.0-2
+* Sun Jun 12 2005 Jeremy Katz <katzj at redhat.com> 2.0.0-3
+- gconf schema removal, BR gettext, add Fedora category to the desktop file 
+  (noticed by mschwendt)
+
+* Fri Jun 10 2005 Jeremy Katz <katzj at redhat.com>
 - fix up for fedora guidelines
 - lots of buildrequires
 - pass curl library dir as %%{_libdir} to workaround silly configure check