mcepl pushed to xiphos (epel7). "Added -fPIC and bumped upstram bug fix version"

notifications at fedoraproject.org notifications at fedoraproject.org
Sun Apr 19 19:09:03 UTC 2015


>From 96a7c0a2d3b95f546f792216b4c80444b523fee5 Mon Sep 17 00:00:00 2001
From: Gregory Hellings <greg.hellings at gmail.com>
Date: Fri, 10 Apr 2015 12:19:38 -0500
Subject: Added -fPIC and bumped upstram bug fix version


diff --git a/xiphos.spec b/xiphos.spec
index 2a60104..94d48e2 100644
--- a/xiphos.spec
+++ b/xiphos.spec
@@ -6,8 +6,8 @@
 %endif
 
 Name:           xiphos 
-Version:        4.0.0
-Release:        4%{?dist}
+Version:        4.0.1
+Release:        1%{?dist}
 Summary:        Bible study and research tool
 License:        GPLv2+
 URL:            http://xiphos.org/
@@ -40,17 +40,8 @@ UNIX, and Windows under the GNOME toolkit, offering a rich and featureful
 environment for reading, study, and research using modules from The SWORD
 Project and elsewhere.
 
-%package compat
-Obsoletes:      xiphos < 4.0.0
-Requires:       xiphos-gtk2 = %{version}-%{release}
-Summary:        Compatibility package for xiphos => xiphos-gtk2
-
-%description compat
-This package only exists to help transition Xiphos users to the new package
-split. It will be removed after the next Fedora release. Please do not depend
-on or reference this package in any way.
-
 %package gtk2
+Obsoletes:      xiphos < 4.0.0
 Requires:       %{name}-common = %{version}-%{release}
 Summary:        A version of Xiphos built against the GTK2 toolkit
 
@@ -91,6 +82,8 @@ mkdir gtk3
 cp -r gtk2/* gtk3
 
 %build
+export CC="gcc -fPIC"
+export CXX="g++ -fPIC"
 %ifarch %{power64}
  CFLAGS="$CFLAGS -D__SANE_USERSPACE_TYPES__"
  CXXFLAGS="$CXXFLAGS -D__SANE_USERSPACE_TYPES__"
@@ -210,6 +203,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/appdata/xiphos.appdata.xml
 
 %changelog
+* Wed Apr 08 2015 Greg Hellings <greg.hellings at gmail.com> 4.0.1-1
+- Version bump
+
 * Fri Jan 16 2015 Greg Hellings <greg.hellings at gmail.com> 4.0.0-4
 - Added GTK compat so that we can link against GTK2 all the way
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/xiphos.git/commit/?h=epel7&id=96a7c0a2d3b95f546f792216b4c80444b523fee5


More information about the scm-commits mailing list