[postler] Add patch to fix FTBFS on ARM. Modernise spec

Peter Robinson pbrobinson at fedoraproject.org
Mon Dec 10 11:08:24 UTC 2012


commit 176d3af613cb5c740b2d4bf3763dba6389630676
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Mon Dec 10 11:08:09 2012 +0000

    Add patch to fix FTBFS on ARM. Modernise spec

 postler-valist.patch |   11 +++++++++++
 postler.spec         |   15 +++++++--------
 2 files changed, 18 insertions(+), 8 deletions(-)
---
diff --git a/postler-valist.patch b/postler-valist.patch
new file mode 100644
index 0000000..6fc1cd7
--- /dev/null
+++ b/postler-valist.patch
@@ -0,0 +1,11 @@
+--- postler-0.1.1/wscript.orig	2012-12-10 10:11:32.599959372 +0000
++++ postler-0.1.1/wscript	2012-12-10 10:12:15.438193228 +0000
+@@ -132,7 +132,7 @@
+     conf.check (header_name='sys/filio.h')
+     conf.check (fragment='#define _GNU_SOURCE\n#include <stdio.h>\n' \
+         'int main(char** argv, int argc)\n' \
+-        '{ char* a;\nvasprintf(&a, "%s", ""); return 0; }', \
++        '{ char* a;\nva_list ap;\nvasprintf(&a, "%s", ap); return 0; }', \
+         define_name='HAVE_VASPRINTF', msg='Checking for function vasprintf', \
+         mandatory=True)
+     check_function ('socket', 'sys/socket.h')
diff --git a/postler.spec b/postler.spec
index 038cf17..13d4517 100644
--- a/postler.spec
+++ b/postler.spec
@@ -5,6 +5,7 @@ Summary:        An ultra simple desktop mail client
 Group:          Applications/Internet
 License:        LGPLv2+
 URL:            http://launchpad.net/postler
+
 Source0:        http://git.xfce.org/apps/%{name}/snapshot/%{name}-%{version}.tar.bz2
 Patch0:         postler-0.1.1-rename_icon.patch
 # cherry-picked commit 9caec846
@@ -12,7 +13,8 @@ Patch1:         postler-0.1.1-vala-0.12.1.patch
 # cherry-picked commit be2acb8a
 Patch2:         postler-0.1.1-soup.patch
 Patch3:         postler-0.1.1-vala-0.17.2.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch4:         postler-valist.patch
+
 BuildRequires:  vala >= 0.10.0
 BuildRequires:  intltool
 BuildRequires:  pkgconfig(gio-2.0)
@@ -47,6 +49,7 @@ defaults.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 
 %build
@@ -58,7 +61,6 @@ export CFLAGS="%{optflags}"
 
 
 %install
-rm -rf %{buildroot}
 ./waf install --destdir=%{buildroot} -d none %{?_smp_mflags}
 
 # reports two bogus warnings
@@ -67,11 +69,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/postler.desktop
 %find_lang %{name}
 
 
-%clean
-rm -rf %{buildroot}
-./waf clean
-
-
 %post
 update-desktop-database &>/dev/null || :
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -90,7 +87,6 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %files -f %{name}.lang
-%defattr(-,root,root,-)
 %doc COPYING README
 %{_bindir}/postler
 %{_bindir}/postler-mbsync
@@ -99,6 +95,9 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Mon Dec  8 2012 Peter Robinson <pbrobinson at fedoraproject.org> 0.1.1-11
+- Add patch to fix FTBFS on ARM. Modernise spec
+
 * Wed Jul 25 2012 Thomas Moschny <thomas.moschny at gmx.de> - 0.1.1-10
 - Add patch to build with vala 0.17.2.
 


More information about the scm-commits mailing list