[bibletime/f20] Fix FTBFS on s390 error.

Greg Hellings greghellings at fedoraproject.org
Thu Jul 10 14:26:40 UTC 2014


commit 1d3ac86071aa32c03d01db986ce39ec9a1b3b5ab
Author: Greg Hellings <greg.hellings at gmail.com>
Date:   Thu Jul 10 08:33:07 2014 -0500

    Fix FTBFS on s390 error.

 bibletime.spec |   10 +++++++++-
 flags.patch    |   12 ++++++++++++
 2 files changed, 21 insertions(+), 1 deletions(-)
---
diff --git a/bibletime.spec b/bibletime.spec
index f52d1ff..69e455f 100644
--- a/bibletime.spec
+++ b/bibletime.spec
@@ -1,11 +1,14 @@
 Summary:	An easy to use Bible study tool
 Name:		bibletime
 Version:	2.10.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2
 Url:		http://www.bibletime.info/
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
 
+# Replaces -fpie with -fPIE to fix build on s390
+Patch0: flags.patch
+
 BuildRequires:	cmake
 BuildRequires:	pkgconfig(QtGui) >= 4.5.0
 BuildRequires:	pkgconfig(QtDBus) pkgconfig(QtXml)
@@ -27,6 +30,8 @@ BibleTime is a frontend for the SWORD Bible Framework.
 %prep
 %setup -q
 
+%patch0 -p1 -b .flags
+
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
@@ -74,6 +79,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/bibletime.desktop
 %doc ChangeLog README LICENSE
 
 %changelog
+* Wed Jul 09 2014 Jakub Čajka <jcajka at redhat.com> - 2.10.1-2
+- Replaced -fpie with -fPIE to fix build on s390
+
 * Mon Jul 07 2014 Greg Hellings <greg.hellings at gmail.com> - 2.10.1-1
 - New upstream release
 - Should address bug #1113320
diff --git a/flags.patch b/flags.patch
new file mode 100644
index 0000000..77489ec
--- /dev/null
+++ b/flags.patch
@@ -0,0 +1,12 @@
+diff -up bibletime-2.10.1/CMakeLists.txt.flags bibletime-2.10.1/CMakeLists.txt
+--- bibletime-2.10.1/CMakeLists.txt.flags	2014-07-09 22:22:44.941677076 +0200
++++ bibletime-2.10.1/CMakeLists.txt	2014-07-09 22:41:14.648563023 +0200
+@@ -205,7 +205,7 @@ IF(MSVC)
+   SET(CMAKE_CXX_FLAGS_DEBUG   "-DNO_DBUS -DSWUSINGDLL /MDd /Zc:wchar_t- /W1 /D_UNICODE /DUNICODE /Zc:wchar_t /Od")
+   SET(BibleTime_LDFLAGS "${BibleTime_LDFLAGS} /SUBSYSTEM:WINDOWS")
+ ELSE()
+-  SET(BibleTime_CFLAGS "${BibleTime_CFLAGS} -Wextra -fpie -fexceptions")
++  SET(BibleTime_CFLAGS "${BibleTime_CFLAGS} -Wextra -fPIE -fexceptions")
+   SET(CMAKE_CXX_FLAGS_RELEASE "-O2")
+   SET(CMAKE_CXX_FLAGS_DEBUG "-ggdb")
+   IF(APPLE)


More information about the scm-commits mailing list