[syncevolution] Revert "Rebuild against newer evolution-data-server"
Milan Crha
mcrha at fedoraproject.org
Tue Feb 17 08:39:10 UTC 2015
commit 9def1f1cdec607f1696cfd46f8440a7899cae4d4
Author: Milan Crha <mcrha at redhat.com>
Date: Tue Feb 17 09:39:44 2015 +0100
Revert "Rebuild against newer evolution-data-server"
This reverts commit 08bebe9e32b43d19e63b6cff6c49fafa8c57a3b4.
Part of the change was to fix a build break in rawhide (F23),
but the approach was wrong, the problem is with GCC, not with
syncevolution.
syncevolution-1.5-pcrecpp-fix.patch | 12 ------------
syncevolution.spec | 8 +-------
2 files changed, 1 insertions(+), 19 deletions(-)
---
diff --git a/syncevolution.spec b/syncevolution.spec
index 8450aee..32e19fd 100644
--- a/syncevolution.spec
+++ b/syncevolution.spec
@@ -1,7 +1,7 @@
Summary: SyncML client for evolution
Name: syncevolution
Version: 1.5
-Release: 3%{?dist}
+Release: 2%{?dist}
Epoch: 1
License: LGPLv2+
Group: Applications/Productivity
@@ -9,7 +9,6 @@ URL: http://syncevolution.org/
Source: http://downloads.syncevolution.org/%{name}/sources/%{name}-%{version}.tar.gz
Patch0: syncevolution-1.4.1-akonadi.patch
-Patch1: syncevolution-1.5-pcrecpp-fix.patch
BuildRequires: pkgconfig(akonadi)
BuildRequires: bluez-libs-devel
@@ -88,7 +87,6 @@ Akonadi backend for %{name}.
%prep
%setup -q
%patch0 -p1 -b .akonadi
-%patch1 -p1 -b .pcrecpp-fix
# use the ac macros in Makefile.am
sed -i '/^ACLOCAL_AMFLAGS/{ /m4-repo/!s/$/ -I m4-repo/ }' Makefile*.am
@@ -199,10 +197,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/syncevolution/xml/*.pl
%changelog
-* Mon Feb 16 2015 Milan Crha <mcrha at redhat.com> - 1:1.5-3
-- Rebuild against newer evolution-data-server
-- Add patch for a libpcrecpp build break
-
* Tue Jan 27 2015 Petr Machata <pmachata at redhat.com> - 1:1.5-2
- Rebuild for boost 1.57.0
More information about the scm-commits
mailing list