[libopensync-plugin-evolution2] Add patch to remove -Werror from AM_CFLAGS

Milan Crha mcrha at fedoraproject.org
Tue Nov 20 17:44:35 UTC 2012


commit b7b304a2dfeca927a380fa2b6d94cf514bfa9a4e
Author: Milan Crha <mcrha at redhat.com>
Date:   Tue Nov 20 18:44:17 2012 +0100

    Add patch to remove -Werror from AM_CFLAGS

 libopensync-plugin-evolution2-0.22-werror.patch |   26 +++++++++++++++++++++++
 libopensync-plugin-evolution2.spec              |    3 ++
 2 files changed, 29 insertions(+), 0 deletions(-)
---
diff --git a/libopensync-plugin-evolution2-0.22-werror.patch b/libopensync-plugin-evolution2-0.22-werror.patch
new file mode 100644
index 0000000..3ca3dca
--- /dev/null
+++ b/libopensync-plugin-evolution2-0.22-werror.patch
@@ -0,0 +1,26 @@
+diff -up libopensync-plugin-evolution2-0.22/src/Makefile.am.werror libopensync-plugin-evolution2-0.22/src/Makefile.am
+--- libopensync-plugin-evolution2-0.22/src/Makefile.am.werror	2007-03-27 13:49:55.000000000 +0200
++++ libopensync-plugin-evolution2-0.22/src/Makefile.am	2012-11-20 18:22:12.018182188 +0100
+@@ -4,8 +4,7 @@ opensyncheaderdir=@OPENSYNC_HEADERDIR@
+ 
+ INCLUDES = @PACKAGE_CFLAGS@ @EPACKAGE_CFLAGS@
+ 
+-# Please remove '-Wno-return-type' when Evo fixes the warning in their headers.
+-AM_CFLAGS = -Wall -Werror -Wno-return-type
++AM_CFLAGS = -Wall
+ 
+ config_DATA = evo2-sync
+ 
+diff -up libopensync-plugin-evolution2-0.22/src/Makefile.in.werror libopensync-plugin-evolution2-0.22/src/Makefile.in
+--- libopensync-plugin-evolution2-0.22/src/Makefile.in.werror	2012-11-20 18:30:45.922401659 +0100
++++ libopensync-plugin-evolution2-0.22/src/Makefile.in	2012-11-20 18:31:10.808702389 +0100
+@@ -197,8 +197,7 @@ configdir = @OPENSYNC_CONFIGDIR@
+ opensyncheaderdir = @OPENSYNC_HEADERDIR@
+ INCLUDES = @PACKAGE_CFLAGS@ @EPACKAGE_CFLAGS@
+ 
+-# Please remove '-Wno-return-type' when Evo fixes the warning in their headers.
+-AM_CFLAGS = -Wall -Werror -Wno-return-type
++AM_CFLAGS = -Wall
+ config_DATA = evo2-sync
+ opensyncheader_HEADERS = evo2_sync.h
+ plugin_LTLIBRARIES = evo2_sync.la
diff --git a/libopensync-plugin-evolution2.spec b/libopensync-plugin-evolution2.spec
index 6ab59c6..8796f37 100644
--- a/libopensync-plugin-evolution2.spec
+++ b/libopensync-plugin-evolution2.spec
@@ -9,6 +9,7 @@ License:        LGPLv2+
 URL:            http://www.opensync.org
 Source0:        http://www.opensync.org/download/releases/%{version}/%{name}-%{version}.tar.bz2
 Patch1:         %{name}-0.22-eds.patch
+Patch2:         %{name}-0.22-werror.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libopensync-devel = 1:0.22
@@ -24,6 +25,7 @@ Provides:  libopensync-plugin-evolution2-devel = 0:0.35
 %setup -q
 
 %patch1 -p1 -b .eds
+%patch2 -p1 -b .werror
 
 %build
 %configure
@@ -50,6 +52,7 @@ rm -rf $RPM_BUILD_ROOT
 * Tue Nov 20 2012 Milan Crha <mcrha at redhat.com>
 - 1:0.22-28
 - Rebuild against newer evolution-data-server
+- Add patch to remove -Werror from AM_CFLAGS
 
 * Thu Oct 25 2012 Milan Crha <mcrha at redhat.com>
 - 1:0.22-27


More information about the scm-commits mailing list