rpms/mail-notification/devel .cvsignore, 1.4, 1.5 mail-notification.spec, 1.7, 1.8 sources, 1.4, 1.5

[Thorsten Leemhuis (thl)]

Author: thl

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

Modified Files:
	.cvsignore mail-notification.spec sources 
Log Message:
Update to 2.0 (without evo for now); Use dist; new BR gob2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mail-notification/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 Mar 2005 20:16:31 -0000	1.4
+++ .cvsignore	14 Aug 2005 18:03:09 -0000	1.5
@@ -1 +1,3 @@
-mail-notification-1.1.tar.gz
+mail-notification-2.0.tar.gz
+mail-notification-2.0-buildfix.diff
+mail-notification-2.0-gmail-properties-fix.diff


Index: mail-notification.spec
===================================================================
RCS file: /cvs/extras/rpms/mail-notification/devel/mail-notification.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mail-notification.spec	18 May 2005 02:45:50 -0000	1.7
+++ mail-notification.spec	14 Aug 2005 18:03:09 -0000	1.8
@@ -1,13 +1,15 @@
 Name:           mail-notification
-Version:        1.1
-Release:        3
+Version:        2.0
+Release:        1%{?dist}
 Summary:        Status icon that informs you if you have new mail
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://www.nongnu.org/mailnotify/
-Source0:        http://savannah.nongnu.org/download/mailnotify/mail-notification-1.1.tar.gz
+Source0:        http://savannah.nongnu.org/download/mailnotify/mail-notification-2.0.tar.gz
 Source1:        mail-notification-README.FEDORA
+Patch0:		http://savannah.nongnu.org/download/mailnotify/mail-notification-2.0-buildfix.diff
+Patch1:		http://savannah.nongnu.org/download/mailnotify/mail-notification-2.0-gmail-properties-fix.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gettext >= 0.14.1
@@ -21,6 +23,8 @@
 BuildRequires:  gnutls-devel >= 1.0.20
 BuildRequires:  libgcrypt-devel >= 1.2.0
 BuildRequires:  libicu-devel >= 2.6
+BuildRequires:  gob2
+
 
 Requires(post):   GConf2
 Requires(post):   scrollkeeper
@@ -37,11 +41,12 @@
 %prep
 %setup -q
 cp %{SOURCE1} ./README.FEDORA
-
+%patch0 -b .patch0
+%patch1 -b .patch1
 
 
 %build
-%configure
+%configure --disable-evolution
 make %{?_smp_mflags}
 
 
@@ -61,6 +66,11 @@
   --add-category X-Fedora                              \
   ${RPM_BUILD_ROOT}%{_datadir}/applications/mail-notification.desktop
 
+desktop-file-install --vendor fedora                   \
+  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications      \
+  --delete-original                                    \
+  --add-category X-Fedora                              \
+  ${RPM_BUILD_ROOT}%{_datadir}/applications/mail-notification-properties.desktop
 
 
 %clean
@@ -91,9 +101,10 @@
 %{_sysconfdir}/gconf/schemas/mail-notification.schemas
 %{_sysconfdir}/sound/events/mail-notification.soundlist
 %{_bindir}/*
-%{_libdir}/bonobo/servers/GNOME_MailNotification_Automation.server
+%{_libdir}/bonobo/servers/GNOME_MailNotification.server
 %{_datadir}/%{name}
-%{_datadir}/control-center-2.0/capplets/mail-notification-properties.desktop
+%{_datadir}/applications/fedora-mail-notification.desktop
+%{_datadir}/applications/fedora-mail-notification-properties.desktop
 %{_datadir}/gnome/help/mail-notification/
 %dir %{_datadir}/omf/mail-notification/
 %{_datadir}/omf/mail-notification/mail-notification-C.omf
@@ -102,6 +113,13 @@
 
 
 %changelog
+* Wed Aug 10 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.0-1
+- Update to 2.0 -- build without evolution support for now (seems it
+  needs the whole evo-source)
+- Use dist
+- Add two patches
+- New BR gob2
+
 * Wed May 18 2005 Colin Charles <colin at fedoraproject.org> - 1.1.-3
 - bump release, request build for ppc
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mail-notification/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Mar 2005 20:16:31 -0000	1.4
+++ sources	14 Aug 2005 18:03:09 -0000	1.5
@@ -1 +1,3 @@
-2359fb53128b12cf295bdf8553e5869b  mail-notification-1.1.tar.gz
+56ef7401aba1cb27d881fb0f33a3248d  mail-notification-2.0.tar.gz
+9b632ffa3d886c3829752ea656adf8f1  mail-notification-2.0-buildfix.diff
+7e2243b625802214a46bce8d633b94dc  mail-notification-2.0-gmail-properties-fix.diff