rpms/mail-notification/devel mail-notification-5.2-fedora-plugin-hint.patch, NONE, 1.1 .cvsignore, 1.13, 1.14 mail-notification.spec, 1.49, 1.50 sources, 1.13, 1.14 mail-notification-5.0-eelfix.diff, 1.1, NONE mail-notification-fedora-plugin-hint.patch, 1.3, NONE

Dmitry Butskoy (buc) fedora-extras-commits at redhat.com
Mon Mar 24 15:14:38 UTC 2008


Author: buc

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

Modified Files:
	.cvsignore mail-notification.spec sources 
Added Files:
	mail-notification-5.2-fedora-plugin-hint.patch 
Removed Files:
	mail-notification-5.0-eelfix.diff 
	mail-notification-fedora-plugin-hint.patch 
Log Message:


mail-notification-5.2-fedora-plugin-hint.patch:

--- NEW FILE mail-notification-5.2-fedora-plugin-hint.patch ---
diff -Nrbu mail-notification-5.2/src/mn-evolution-folder-tree-client.gob mail-notification-5.2-OK/src/mn-evolution-folder-tree-client.gob
--- mail-notification-5.2/src/mn-evolution-folder-tree-client.gob	2008-03-20 02:52:16.000000000 +0300
+++ mail-notification-5.2-OK/src/mn-evolution-folder-tree-client.gob	2008-03-24 16:11:24.000000000 +0300
@@ -266,7 +266,8 @@
 	g_object_notify(G_OBJECT(self), "connected");
       }
 
-    label = gtk_label_new(_("Mail Notification can not contact Evolution. Make sure that Evolution is running and that the Evolution Jean-Yves Lefort's Mail Notification plugin is loaded."));
+    label = gtk_label_new(_("Mail Notification can not contact Evolution. Make
+sure that Evolution is running and that the Evolution Jean-Yves Lefort's Mail Notification plugin is installed and loaded. Fedora ships the plugin in a separate package called mail-notification-evolution-plugin; you might need to install it manually."));
 
     gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
     gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mail-notification/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	4 Jan 2008 18:31:42 -0000	1.13
+++ .cvsignore	24 Mar 2008 15:13:47 -0000	1.14
@@ -1 +1 @@
-mail-notification-5.0.tar.bz2
+mail-notification-5.2.tar.bz2


Index: mail-notification.spec
===================================================================
RCS file: /cvs/extras/rpms/mail-notification/devel/mail-notification.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- mail-notification.spec	14 Feb 2008 15:58:03 -0000	1.49
+++ mail-notification.spec	24 Mar 2008 15:13:47 -0000	1.50
@@ -1,34 +1,33 @@
 Name:           mail-notification
-Version:        5.0
-Release:        3%{?dist}
+Version:        5.2
+Release:        1%{?dist}
 Summary:        Status icon that informs you if you have new mail
 
 Group:          Applications/Internet
 License:        GPLv3+
 URL:            http://www.nongnu.org/mailnotify/
-Source0:        http://savannah.nongnu.org/download/mailnotify/mail-notification-5.0.tar.bz2
-Patch0:         mail-notification-fedora-plugin-hint.patch
-Patch1:         http://launchpadlibrarian.net/11684452/mail-notification-5.0-eelfix.diff
+Source0:        http://savannah.nongnu.org/download/mailnotify/mail-notification-%{version}.tar.bz2
+Patch0:         mail-notification-5.2-fedora-plugin-hint.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gettext >= 0.14.1
-BuildRequires:  eel2-devel >= 2.0
-BuildRequires:  desktop-file-utils
-BuildRequires:  scrollkeeper
-BuildRequires:  openssl-devel  >= 0.9.5b
+BuildRequires:  gettext
+BuildRequires:  desktop-file-utils, scrollkeeper
+BuildRequires:  openssl-devel >= 0.9.6
 BuildRequires:  cyrus-sasl-devel >= 2.0
-BuildRequires:  gmime-devel >= 2.1
-BuildRequires:  libsoup-devel >= 2.2.1
-BuildRequires:  gnutls-devel >= 1.0.20
-BuildRequires:  libgcrypt-devel >= 1.2.0
-BuildRequires:  libicu-devel >= 2.6
+BuildRequires:  glib2-devel >= 2.14
+BuildRequires:  gtk2-devel >= 2.12
+BuildRequires:  GConf2-devel, libgnomeui-devel
+BuildRequires:  libglade2-devel, dbus-glib-devel
+BuildRequires:  libnotify-devel >= 0.4.1
+BuildRequires:  gmime-devel >= 2.2.7
+BuildRequires:  gnome-keyring-devel
 BuildRequires:  perl-XML-Parser
 BuildRequires:  gob2
 BuildRequires:  evolution-devel 
 BuildRequires:  evolution-data-server-devel >= 1.5
-BuildRequires:  libnotify-devel
 
 Requires:         hicolor-icon-theme
+
 Requires(post):   GConf2
 Requires(post):   scrollkeeper
 Requires(preun):  GConf2
@@ -45,9 +44,6 @@
 %package        evolution-plugin
 Summary:        Evolution plugin for Mail Notification
 Group:          Applications/Internet
-#
-# make sure the evo plugin get's installed for all users that had the 
-# non-split variant of mail-notification (FC5 and earlier) installed before:
 Requires:       %{name} = %{version}-%{release}
 Obsoletes:	mail-notification < 3.0-4
 
@@ -56,27 +52,40 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
 %patch0 -p1 -b .patch0
-%patch1 -p0 -b .patch1
 
 
 %build
 
-export CPPFLAGS=-D_GNU_SOURCE
-%configure --disable-schemas-install  --enable-evolution
+./jb configure \
+	cc=%{__cc} \
+	cflags="$RPM_OPT_FLAGS" \
+	cppflags="-D_GNU_SOURCE" \
+	destdir=$RPM_BUILD_ROOT \
+	prefix=%{_prefix} \
+	bindir=%{_bindir} \
+	libdir=%{_libdir} \
+	libexecdir=%{_libexecdir} \
+	datadir=%{_datadir} \
+	sysconfdir=%{_sysconfdir} \
+	localstatedir=%{_localstatedir} \
+	install-gconf-schemas=no
 
-make %{?_smp_mflags}
+./jb build
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 # For GConf apps: prevent schemas from being installed at this stage
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-make install DESTDIR=$RPM_BUILD_ROOT
-%find_lang %{name}
 
-rm -f $RPM_BUILD_ROOT%{_infodir}/dir
+./jb install
+
+#  clear /var/lib/scrollkeeper stuff here
+rm -rf $RPM_BUILD_ROOT%{_localstatedir}
+
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
 desktop-file-install --vendor fedora                   \
@@ -92,6 +101,8 @@
   --add-category X-GNOME-PersonalSettings              \
   ${RPM_BUILD_ROOT}%{_datadir}/applications/mail-notification-properties.desktop
 
+%find_lang %{name}
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -108,9 +119,9 @@
 %post
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 /usr/bin/gconftool-2 --makefile-install-rule \
-  %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null ||:
+  %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || :
 
-/usr/bin/scrollkeeper-update -q ||:
+/usr/bin/scrollkeeper-update -q || :
 
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
@@ -136,7 +147,6 @@
 %doc AUTHORS COPYING NEWS README TODO
 %{_sysconfdir}/gconf/schemas/mail-notification.schemas
 %{_bindir}/*
-%{_libdir}/bonobo/servers/GNOME_MailNotification.server
 %{_datadir}/%{name}
 %{_datadir}/gnome/autostart/fedora-mail-notification.desktop
 %{_datadir}/applications/fedora-mail-notification-properties.desktop
@@ -148,10 +158,12 @@
 %files evolution-plugin
 %defattr(-,root,root,-)
 %{_libdir}/evolution/2.*/plugins/*
-%{_libdir}/bonobo/servers/GNOME_MailNotification_Evolution.server
 
 
 %changelog
+* Mon Mar 24 2008 Dmitry Butskoy <Dmitry at Butskoy.name> - 5.2-1
+- Upgrade to 5.2
+
 * Thu Feb 14 2008 Dmitry Butskoy <Dmitry at Butskoy.name> - 5.0-3
 - rebuild for Fedora 9
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mail-notification/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	4 Jan 2008 18:31:42 -0000	1.13
+++ sources	24 Mar 2008 15:13:47 -0000	1.14
@@ -1 +1 @@
-66bc819ef62a050627627b3496e4dfe8  mail-notification-5.0.tar.bz2
+e014318ccfaaa1c0033c511746a06a9b  mail-notification-5.2.tar.bz2


--- mail-notification-5.0-eelfix.diff DELETED ---


--- mail-notification-fedora-plugin-hint.patch DELETED ---




More information about the fedora-extras-commits mailing list