From 9d5a5aeb1841d00f7f41cd5e41356cdef90e911f Mon Sep 17 00:00:00 2001 From: Peter Schiffer Date: Fri, 9 May 2014 15:45:18 +0200 Subject: [PATCH] Fixed FTBFS on F21 - resolves: #1058770 --- pilot-link-0.12.5-ftbfs-f21.patch | 22 ++++++++++++++++++++++ pilot-link.spec | 8 +++++++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 pilot-link-0.12.5-ftbfs-f21.patch diff --git a/pilot-link-0.12.5-ftbfs-f21.patch b/pilot-link-0.12.5-ftbfs-f21.patch new file mode 100644 index 0000000..772c68a --- /dev/null +++ b/pilot-link-0.12.5-ftbfs-f21.patch @@ -0,0 +1,22 @@ +diff -ur pilot-link-0.12.5.orig/configure pilot-link-0.12.5/configure +--- pilot-link-0.12.5.orig/configure 2010-02-07 04:42:29.000000000 +0100 ++++ pilot-link-0.12.5/configure 2014-05-09 15:36:30.466127800 +0200 +@@ -2604,12 +2604,12 @@ + + + enable_werror=no +-save_CFLAGS="$CFLAGS" +-CFLAGS=`echo $save_CFLAGS | sed -e s/-Werror//g` +-CXXFLAGS=`echo $save_CXXFLAGS | sed -e s/-Werror//g` +-if test "x$CFLAGS" != "x$save_CFLAGS"; then +- enable_werror="yes" +-fi ++#save_CFLAGS="$CFLAGS" ++#CFLAGS=`echo $save_CFLAGS | sed -e s/-Werror//g` ++#CXXFLAGS=`echo $save_CXXFLAGS | sed -e s/-Werror//g` ++#if test "x$CFLAGS" != "x$save_CFLAGS"; then ++# enable_werror="yes" ++#fi + + + ac_aux_dir= diff --git a/pilot-link.spec b/pilot-link.spec index c5a1ee8..d30547a 100644 --- a/pilot-link.spec +++ b/pilot-link.spec @@ -3,7 +3,7 @@ Summary: File transfer utilities between Linux and PalmPilots Name: pilot-link Version: 0.12.5 -Release: 18%{?dist} +Release: 19%{?dist} Epoch: 2 # libpisock/md5.c Public Domain # libpisock/blob.c LGPLv2+ @@ -26,6 +26,7 @@ Patch4: pilot-link-0.12.5-redefinePerlsymbols.patch Patch5: pilot-link-0.12.5-compiler_warnings.patch Patch6: pilot-link-0.12.5-ftbfs-f19.patch Patch7: pilot-link-0.12.5-aarch64.patch +Patch8: pilot-link-0.12.5-ftbfs-f21.patch ExcludeArch: s390 s390x BuildRequires: perl(ExtUtils::MakeMaker), libpng-devel, readline-devel @@ -87,6 +88,7 @@ Libraries for applications communicating with PalmPilot %patch5 -p1 -b .compiler %patch6 -p1 -b .ftbfs-f19 %patch7 -p1 -b .aarch64 +%patch8 -p1 -b .ftbfs-f21 iconv -f windows-1252 -t UTF8 doc/README.usb > doc/README.usb.aux mv doc/README.usb.aux doc/README.usb iconv -f windows-1252 -t UTF8 ChangeLog > ChangeLog.aux @@ -192,6 +194,10 @@ install -p -m644 %{SOURCE4} %{buildroot}/lib/udev/rules.d/ /lib/udev/rules.d/69-pilot-link.rules %changelog +* Fri May 09 2014 Peter Schiffer - 2:0.12.5-19 +- resolves: #1058770 + fixed FTBFS on F21 + * Sun Aug 04 2013 Fedora Release Engineering - 2:0.12.5-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild