commit c861ef29730452b29d0049cb5edad46484974951
Author: Łukasz Kieś <[email protected]>
Date: Tue Apr 15 16:18:06 2014 +0200
- fix Evolution plugin pkgconfig files detection
- don't link against libbsd-compat
- added Fedora's patch to build with Evolution >= 3.11.2
- rel. 19
gnome-mail-notification.spec | 17 ++++++++++++-----
jb-evolution-plugin-detect.patch | 12 ++++++++++++
jb-glibc-2.19.patch | 11 +++++++++++
3 files changed, 35 insertions(+), 5 deletions(-)
---
diff --git a/gnome-mail-notification.spec b/gnome-mail-notification.spec
index cfc08a5..b97d16f 100644
--- a/gnome-mail-notification.spec
+++ b/gnome-mail-notification.spec
@@ -1,15 +1,18 @@
-%define evo_ver 3.10
+%define evo_ver 3.12
%define rname mail-notification
Summary: GNOME notification area mail monitor
Summary(pl.UTF-8): Monitor poczty widoczny w obszarze powiadamiania GNOME
Name: gnome-mail-notification
Version: 5.4
-Release: 18
+Release: 19
License: GPL v3+
Group: X11/Applications
Source0:
https://github.com/epienbroek/mail-notification/tarball/master/%{rname}-%{version}.tar.gz
# Source0-md5: 1c4aea14dd2f9b89b659eaf39cde05f4
Patch0: mail-notification-jb-gcc-format.patch
+Patch1: jb-glibc-2.19.patch
+Patch2: jb-evolution-plugin-detect.patch
+Patch3: evolution-3.12.patch
URL: http://www.nongnu.org/mailnotify/
BuildRequires: GConf2-devel >= 2.22.0
BuildRequires: autoconf >= 2.59
@@ -19,13 +22,13 @@ BuildRequires: evolution-devel >= 3.0.0
BuildRequires: gettext-devel
BuildRequires: gmime-devel >= 2.1.19
BuildRequires: gmime22-devel
-BuildRequires: gob2 >= 2.0.17
-BuildRequires: libgnome-keyring-devel >= 3.0.0
BuildRequires: gnome-vfs2-devel >= 2.22.0
+BuildRequires: gob2 >= 2.0.17
BuildRequires: gtk+3-devel >= 3.0.0
BuildRequires: intltool >= 0.36.2
BuildRequires: libbonobo-devel >= 2.22.0
BuildRequires: libglade2-devel >= 1:2.6.2
+BuildRequires: libgnome-keyring-devel >= 3.0.0
BuildRequires: libgnomeui-devel >= 2.22.01
BuildRequires: libnotify-devel >= 0.4.1
BuildRequires: libtool
@@ -73,6 +76,9 @@ Wsparcie dla skrzynek pocztowych Evolution w Mail
Notification.
%prep
%setup -q -n epienbroek-%{rname}-45d11d2
%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
%build
./jb configure \
@@ -80,7 +86,8 @@ Wsparcie dla skrzynek pocztowych Evolution w Mail
Notification.
destdir=$RPM_BUILD_ROOT \
sysconfdir=%{_sysconfdir} \
localstatedir=%{_var} \
- install-gconf-schemas=no
+ install-gconf-schemas=no \
+ evolution-plugin-dir=%{_libdir}/evolution/%{evo_ver}/plugins/
./jb build
diff --git a/jb-evolution-plugin-detect.patch b/jb-evolution-plugin-detect.patch
new file mode 100644
index 0000000..07d9a2c
--- /dev/null
+++ b/jb-evolution-plugin-detect.patch
@@ -0,0 +1,12 @@
+diff -uNr gmn.bak/jbsrc/lib/src/extras/jb-evolution-plugin.c
gmn/jbsrc/lib/src/extras/jb-evolution-plugin.c
+--- gmn.bak/jbsrc/lib/src/extras/jb-evolution-plugin.c 2013-02-10
20:57:29.000000000 +0100
++++ gmn/jbsrc/lib/src/extras/jb-evolution-plugin.c 2014-04-15
16:13:39.973888229 +0200
+@@ -41,7 +41,7 @@
+ if (! minversion)
+ minversion = "2.12";
+
+- packages = g_strdup_printf("evolution-plugin-3.0 >= %s evolution-shell-3.0
libemail-engine", minversion);
++ packages = g_strdup_printf("evolution-shell-3.0 >= %s libemail-engine",
minversion);
+ result = jb_check_packages("Evolution", "evolution-plugin", packages);
+ g_free(packages);
+
diff --git a/jb-glibc-2.19.patch b/jb-glibc-2.19.patch
new file mode 100644
index 0000000..00107a3
--- /dev/null
+++ b/jb-glibc-2.19.patch
@@ -0,0 +1,11 @@
+diff -uNr gmn.bak/jbsrc/jb.c gmn/jbsrc/jb.c
+--- gmn.bak/jbsrc/jb.c 2013-02-10 20:57:29.000000000 +0100
++++ gmn/jbsrc/jb.c 2014-04-15 15:09:15.458112448 +0200
+@@ -432,7 +432,6 @@
+ */
+ jb_compile_options_add_cflags(object->compile_options, "-std=c99");
+ jb_compile_options_add_cppflags(object->compile_options, "-D_BSD_SOURCE
-D_POSIX_C_SOURCE=199309L");
+- jb_compile_options_add_libs(object->compile_options, "-lbsd-compat");
+ }
+
+ jb_compile_options_add_string_defines(object->compile_options,
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gnome-mail-notification.git/commitdiff/c861ef29730452b29d0049cb5edad46484974951
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
