rpms/mail-notification/devel .cvsignore, 1.11, 1.12 mail-notification.spec, 1.44, 1.45 sources, 1.11, 1.12 mail-notification-evo-api-change.patch, 1.1, NONE mail-notification-findevo_212.patch, 1.1, NONE

[Thorsten Leemhuis (thl)]

Author: thl

Update of /cvs/pkgs/rpms/mail-notification/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17128

Modified Files:
	.cvsignore mail-notification.spec sources 
Removed Files:
	mail-notification-evo-api-change.patch 
	mail-notification-findevo_212.patch 
Log Message:
* Wed Nov 28 2007 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.0-0.1.rc1
- Update to 5.0-rc1
- drop patches now upstream
- update gconf scripts



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mail-notification/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	26 Jun 2007 16:52:11 -0000	1.11
+++ .cvsignore	28 Nov 2007 19:08:57 -0000	1.12
@@ -1 +1 @@
-mail-notification-4.1.tar.bz2
+mail-notification-5.0-rc1.tar.bz2


Index: mail-notification.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mail-notification/devel/mail-notification.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- mail-notification.spec	23 Nov 2007 16:21:46 -0000	1.44
+++ mail-notification.spec	28 Nov 2007 19:08:57 -0000	1.45
@@ -1,15 +1,13 @@
 Name:           mail-notification
-Version:        4.1
-Release:        5%{?dist}
+Version:        5.0
+Release:        0.1.rc1%{?dist}
 Summary:        Status icon that informs you if you have new mail
 
 Group:          Applications/Internet
-License:        GPLv2+
+License:        GPLv3+
 URL:            http://www.nongnu.org/mailnotify/
-Source0:        http://download.savannah.gnu.org/releases/mailnotify/mail-notification-4.1.tar.bz2
+Source0:        http://savannah.nongnu.org/download/mailnotify/mail-notification-5.0-rc1.tar.bz2
 Patch0:         mail-notification-fedora-plugin-hint.patch
-Patch1:         mail-notification-findevo_212.patch
-Patch2:         mail-notification-evo-api-change.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gettext >= 0.14.1
@@ -55,10 +53,8 @@
 Evolution support for Mail Notification.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}-rc1
 %patch0 -p1 -b .patch0
-%patch1 -p1 -b .patch1
-%patch2 -p1 -b .patch2
 
 %build
 %configure --disable-schemas-install  --enable-evolution
@@ -92,9 +88,14 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre
+if [ "$1" -gt 1 ]; then
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    gconftool-2 --makefile-uninstall-rule \
+      %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || :
+fi
 
 %post
-# For GConf apps: install schemas as system default
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 /usr/bin/gconftool-2 --makefile-install-rule \
   %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null ||:
@@ -102,19 +103,19 @@
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
-
 %preun
-# For GConf apps: uninstall app's system default schemas
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-/usr/bin/gconftool-2 --makefile-uninstall-rule \
-  %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || :
-
+if [ "$1" -eq 0 ]; then
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    gconftool-2 --makefile-uninstall-rule \
+      %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
+fi
 
 %postun
 /usr/bin/scrollkeeper-update -q ||:
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README TODO
@@ -136,6 +137,11 @@
 
 
 %changelog
+* Wed Nov 28 2007 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.0-0.1.rc1
+- Update to 5.0-rc1
+- drop patches now upstream
+- update gconf scripts
+
 * Fri Nov 23 2007 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 4.1-5
 - Rebuild against evo 2.21
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mail-notification/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	26 Jun 2007 16:52:11 -0000	1.11
+++ sources	28 Nov 2007 19:08:57 -0000	1.12
@@ -1 +1 @@
-4d9617ad0e7eded0953ac6d152f06a46  mail-notification-4.1.tar.bz2
+1bc449437435e88db2a0b0fd7b505aee  mail-notification-5.0-rc1.tar.bz2


--- mail-notification-evo-api-change.patch DELETED ---


--- mail-notification-findevo_212.patch DELETED ---