From 2d5770274e4344b5f844d80d6b4e8d8085db35ad Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Oct 13 2011 12:23:19 +0000 Subject: add patch to fix build --- diff --git a/syncevolution-1.99.7-fixbuild.patch b/syncevolution-1.99.7-fixbuild.patch new file mode 100644 index 0000000..35b96f1 --- /dev/null +++ b/syncevolution-1.99.7-fixbuild.patch @@ -0,0 +1,12 @@ +--- syncevolution-1.1.99.7/src/synthesis/Makefile.am.orig 2011-09-15 11:26:32.000000000 +0100 ++++ syncevolution-1.1.99.7/src/synthesis/Makefile.am 2011-10-13 12:38:00.078397914 +0100 +@@ -8,7 +8,8 @@ + # extra files which need to be removed during "make distclean" + MAINTAINERCLEANFILES = Makefile.in config.guess config.sub configure depcomp install-sh ltmain.sh missing mkinstalldirs + +-ACLOCAL_AMFLAGS = -I m4 ++# required for rebuilding autotools files via make ++ACLOCAL_AMFLAGS = -I m4 -I m4-repo ${ACLOCAL_FLAGS} + + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = synthesis.pc synthesis-sdk.pc diff --git a/syncevolution.spec b/syncevolution.spec index 58494dd..66660a5 100644 --- a/syncevolution.spec +++ b/syncevolution.spec @@ -12,6 +12,7 @@ Source: http://downloads.syncevolution.org/%{name}/sources/%{name}-%{vers # which was reverted (prematurely) - AdamW 2011/03 # https://bugzilla.redhat.com/show_bug.cgi?id=640750 Patch1: syncevolution-1.1.1-gdbus_static.patch +Patch2: syncevolution-1.99.7-fixbuild.patch BuildRequires: bluez-libs-devel BuildRequires: boost-devel @@ -89,6 +90,7 @@ Perl utils for use with %{name}. %prep %setup -q %patch1 -p1 -b .gdbus +%patch2 -p1 -b .fixbuild # use the ac macros in Makefile.am sed -i '/^ACLOCAL_AMFLAGS/{ /m4-repo/!s/$/ -I m4-repo/ }' Makefile*.am