diff --git a/syncevolution-1.3.99.3-make-error.patch b/syncevolution-1.3.99.3-make-error.patch deleted file mode 100644 index f321682..0000000 --- a/syncevolution-1.3.99.3-make-error.patch +++ /dev/null @@ -1,28 +0,0 @@ -From db5f24e10dcc4737cccaf8f5146f2bb165f8a91e Mon Sep 17 00:00:00 2001 -From: Patrick Ohly -Date: Wed, 23 Oct 2013 08:37:35 +0000 -Subject: autotools: fix make error - -Adding link flags to the libsyncevlution.la dependencies only works -for .la file. This started to break on Debian Testing (?) because -a -L flag became a dependency. - -A proper fix would be to set libs and dependencies separately, -but for now it is easier to rely on GNU make and filter for the -desired .la files. ---- -diff --git a/src/syncevo/syncevo.am b/src/syncevo/syncevo.am -index f5bd6a8..5d25ba4 100644 ---- a/src/syncevo/syncevo.am -+++ b/src/syncevo/syncevo.am -@@ -233,7 +233,7 @@ src_syncevo_libsyncevolution_la_CPPFLAGS = \ - -DXML_CONFIG_DIR=\""$(datadir)/syncevolution/xml"\" \ - -DTEMPLATE_DIR=\""$(datadir)/syncevolution/templates"\" \ - -DLIBDIR=\""$(libdir)"\" --src_syncevo_libsyncevolution_la_DEPENDENCIES = $(SYNTHESIS_DEP) $(src_syncevo_ldadd) -+src_syncevo_libsyncevolution_la_DEPENDENCIES = $(SYNTHESIS_DEP) $(filter %.la, $(src_syncevo_ldadd)) - - # rule which is only relevant when compiling Synthesis in subdirectory - src/build-synthesis/libsynthesissdk.la: $(SYNTHESIS_SUBDIR)/all --- -cgit v0.9.0.2-2-gbebe diff --git a/syncevolution.spec b/syncevolution.spec index 7c16969..225513a 100644 --- a/syncevolution.spec +++ b/syncevolution.spec @@ -7,7 +7,6 @@ License: LGPLv2+ Group: Applications/Productivity URL: http://syncevolution.org/ Source: http://downloads.syncevolution.org/%{name}/sources/%{name}-%{version}.tar.gz -Patch01: syncevolution-1.3.99.3-make-error.patch BuildRequires: bluez-libs-devel BuildRequires: boost-devel @@ -74,7 +73,6 @@ Perl utils for use with %{name}. %prep %setup -q -%patch01 -p1 -b .make-error # use the ac macros in Makefile.am sed -i '/^ACLOCAL_AMFLAGS/{ /m4-repo/!s/$/ -I m4-repo/ }' Makefile*.am