[syncevolution] Add patch to build it

Milan Crha mcrha at fedoraproject.org
Thu Dec 22 10:34:25 UTC 2011


commit b4fe144cb4955b349ba8f67863e33baac3cbdaf2
Author: Milan Crha <mcrha at redhat.com>
Date:   Thu Dec 22 11:34:03 2011 +0100

    Add patch to build it

 syncevolution-1.2.1-missing-files.patch |   33 +++++++++++++++++++++++++++++++
 syncevolution.spec                      |    6 ++++-
 2 files changed, 38 insertions(+), 1 deletions(-)
---
diff --git a/syncevolution-1.2.1-missing-files.patch b/syncevolution-1.2.1-missing-files.patch
new file mode 100644
index 0000000..cf59ebd
--- /dev/null
+++ b/syncevolution-1.2.1-missing-files.patch
@@ -0,0 +1,33 @@
+diff -up syncevolution-1.2.1/Makefile.am.missing-files syncevolution-1.2.1/Makefile.am
+--- syncevolution-1.2.1/Makefile.am.missing-files	2011-11-17 14:52:10.000000000 +0100
++++ syncevolution-1.2.1/Makefile.am	2011-12-22 11:08:01.828048234 +0100
+@@ -235,6 +235,7 @@ endif
+ 
+ # patch README.rst properties on-the-fly
+ README.patched.rst: README.rst src/syncevolution
++	LD_LIBRARY_PATH="$(top_builddir)/src/syncevo/.libs:$(top_builddir)/src/build-synthesis/src/.libs:$LD_LIBRARY_PATH" \
+ 	perl -e '$$syncfound=0; $$sourcefound=0; $$res=0;' \
+ 	                -e 'sub run { $$cmd = shift; $$buffer = `$$cmd`; die if $$?; return $$buffer; }' \
+ 	                -e 'while (<>) {' \
+diff -up syncevolution-1.2.1/src/dbus/qt/configure-sub.in.missing-files syncevolution-1.2.1/src/dbus/qt/configure-sub.in
+--- syncevolution-1.2.1/src/dbus/qt/configure-sub.in.missing-files	2011-12-22 11:05:03.573840626 +0100
++++ syncevolution-1.2.1/src/dbus/qt/configure-sub.in	2011-12-22 11:05:03.573840626 +0100
+@@ -0,0 +1,18 @@
++dnl -*- mode: Autoconf; -*-
++dnl Invoke autogen.sh to produce a configure script.
++
++AC_ARG_ENABLE(qt-dbus,
++              AS_HELP_STRING([--enable-qt-dbus],
++                             [build Qt bindings for D-Bus]),
++              enable_qt_dbus="$enableval", enable_qt_dbus="no")
++
++if test "$enable_qt_dbus" = "yes"; then
++        AC_DEFINE(ENABLE_QT_DBUS, 1, [Qt D-Bus bindings available])
++        need_qt_modules="$need_qt_modules +dbus"
++fi
++
++AM_CONDITIONAL([ENABLE_QT_DBUS], [test "$enable_qt_dbus" = "yes"])
++
++AC_SUBST(QT_DBUS_LIBS)
++AC_CONFIG_FILES(src/dbus/qt/syncevolution-qt-dbus.pc)
++
diff --git a/syncevolution.spec b/syncevolution.spec
index 0a61d54..106a00f 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.2.1-missing-files.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 .missing-files
 
 # use the ac macros in Makefile.am
 sed -i '/^ACLOCAL_AMFLAGS/{ /m4-repo/!s/$/ -I m4-repo/ }' Makefile*.am
@@ -96,7 +98,8 @@ sed -i '/^ACLOCAL_AMFLAGS/{ /m4-repo/!s/$/ -I m4-repo/ }' Makefile*.am
 %build
 intltoolize --automake --copy --force
 autoreconf -fiv
-(cd src/synthesis && autoreconf -fi)
+./autogen.sh
+(cd src/synthesis && autoreconf -fi && ./autogen.sh)
 
 %configure --enable-libsoup --enable-dbus-service --enable-shared \
     --with-expat=system --disable-static --enable-gui=all \
@@ -182,6 +185,7 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/sync-moblin.desktop
 %changelog
 * Mon Nov 28 2011 Peter Robinson <pbrobinson at fedoraproject.org> - 1:1.2.1-1
 - 1.2.1 stable release
+- Add patch to build it (help from Patrick Ohly)
 
 * Tue Nov 22 2011 Peter Robinson <pbrobinson at fedoraproject.org> - 1:1.2-3
 - Rebuild against newer evolution-data-server


More information about the scm-commits mailing list