rpms/notification-daemon/FC-6 notification-daemon.spec, 1.9, 1.10 sources, 1.2, 1.3

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/notification-daemon/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv1869

Modified Files:
	notification-daemon.spec sources 
Log Message:
0.3.6



Index: notification-daemon.spec
===================================================================
RCS file: /cvs/dist/rpms/notification-daemon/FC-6/notification-daemon.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- notification-daemon.spec	18 Oct 2006 02:38:17 -0000	1.9
+++ notification-daemon.spec	29 Jan 2007 19:07:44 -0000	1.10
@@ -1,12 +1,12 @@
 %define gtk2_version		2.4.0
 %define dbus_version		0.90
 %define dbus_glib_version       0.70
-%define gconf_version           2.14
+%define gconf_version           2.14 
 
 Summary: Notification Daemon 
 Name: notification-daemon
-Version: 0.3.5
-Release: 7%{?dist}
+Version: 0.3.6
+Release: 1%{?dist}
 URL: http://www.galago-project.org/specs/notification/ 
 License: GPL
 Group: System Environment/Libraries
@@ -22,9 +22,11 @@
 BuildRequires: libwnck-devel
 BuildRequires: libtool
 BuildRequires: intltool
+BuildRequires: gettext
 
-Requires(post): GConf2
-Requires(preun): GConf2
+Requires(preun): GConf2 >= %{gconf_version}
+Requires(pre): GConf2 >= %{gconf_version}
+Requires(post): GConf2 >= %{gconf_version}
 
 Obsoletes: notify-daemon
 
@@ -53,11 +55,20 @@
 
 rm -f $RPM_BUILD_ROOT/%{_libdir}/notification-daemon-1.0/engines/*.*a
 
+%find_lang %{name}
+
 %clean
 rm -rf %{buildroot}
 
+%pre
+if [ "$1" -gt 1 ]; then
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    gconftool-2 --makefile-uninstall-rule \
+      %{_sysconfdir}/gconf/schemas/notification-daemon.schemas >/dev/null || :
+fi
+
 %preun
-if [ "$1" -gt 0 ]; then
+if [ "$1" -eq 0 ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
     gconftool-2 --makefile-uninstall-rule \
       %{_sysconfdir}/gconf/schemas/notification-daemon.schemas >/dev/null || :
@@ -68,7 +79,7 @@
 gconftool-2 --makefile-install-rule \
   %{_sysconfdir}/gconf/schemas/notification-daemon.schemas > /dev/null || :
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root)
 %doc COPYING ChangeLog NEWS
 %dir %{_libdir}/notification-daemon-1.0
@@ -80,6 +91,13 @@
 %config %{_sysconfdir}/gconf/schemas/notification-daemon.schemas
 
 %changelog
+* Mon Jan 29 2007 Matthias Clasen <mclasen at redhat.com> - 0.3.6-1
+- Update to 0.3.6
+- Apply a patch by Thorsten Leemhuis to fix some spec issues
+
+* Wed Oct 18 2006 Matthias Clasen <mclasen at redhat.com> - 0.3.5-8
+- Fix scripts according to packaging guidelines
+
 * Tue Oct 17 2006 Matthias Clasen <mclasen at redhat.com> - 0.3.5-7
 - Tighten up Requires (#203813)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/notification-daemon/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Jun 2006 17:45:11 -0000	1.2
+++ sources	29 Jan 2007 19:07:44 -0000	1.3
@@ -1 +1 @@
-f9a0aa1cba88cd325c968bc508b4a2c9  notification-daemon-0.3.5.tar.bz2
+3ef10532099f42129aa3b6e0381fa5ac  notification-daemon-0.3.6.tar.bz2