mcepl pushed to xiphos (epel7). "New upstream version 4.0.0"

notifications at fedoraproject.org notifications at fedoraproject.org
Sun Apr 19 19:08:43 UTC 2015


>From c04630685163a4fb351c43fb6ae9720db14c704b Mon Sep 17 00:00:00 2001
From: Gregory Hellings <greg.hellings at gmail.com>
Date: Wed, 24 Dec 2014 00:41:58 -0600
Subject: New upstream version 4.0.0


diff --git a/.gitignore b/.gitignore
index b2d62e7..470a13e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ xiphos-3.1.3.tar.gz
 /xiphos-3.2.1.tar.gz
 /xiphos-3.2.2.tar.gz
 /xiphos-3.2.3j.tar.gz
+/xiphos-4.0.0.tar.gz
diff --git a/sources b/sources
index 67d2cde..3a69b7c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cd2a2c944d63d7cd1888e6f11ef20aa3  xiphos-3.2.3j.tar.gz
+91844473efd0fb71c69be18b51585581  xiphos-4.0.0.tar.gz
diff --git a/xiphos.spec b/xiphos.spec
index 7c63a0e..9732ef8 100644
--- a/xiphos.spec
+++ b/xiphos.spec
@@ -6,13 +6,13 @@
 %endif
 
 Name:           xiphos 
-Version:        3.2.3j
-Release:        3%{?dist}
+Version:        4.0.0
+Release:        1%{?dist}
 Summary:        Bible study and research tool
 License:        GPLv2+
 URL:            http://xiphos.org/
 Source0:        http://downloads.sourceforge.net/gnomesword/xiphos-%{version}.tar.gz
-BuildRequires:  biblesync-devel
+BuildRequires:  biblesync-devel >= 1.1.2
 BuildRequires:  desktop-file-utils
 BuildRequires:  dbus-glib-devel
 BuildRequires:  docbook-utils
@@ -32,11 +32,9 @@ BuildRequires:  gtk3-devel
 BuildRequires:  webkitgtk3-devel
 %endif
 Requires:       yelp
-Obsoletes:      gnomesword < 2.4.2-1
-Provides:       gnomesword = %{version}-%{release}
 
 %description
-Xiphos (formerly known as GnomeSword) is a Bible study tool written for Linux,
+Xiphos is a Bible study tool written for Linux,
 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.
@@ -56,7 +54,7 @@ Requires:       %{name}-common = %{version}-%{release}
 Summary:        A version of Xiphos built against the GTK2 toolkit
 
 %description gtk2
-Xiphos (formerly known as GnomeSword) is a Bible study tool written for Linux,
+Xiphos is a Bible study tool written for Linux,
 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.
@@ -67,7 +65,7 @@ Requires:       %{name}-common = %{version}-%{release}
 Summary:        A version of Xiphos built against the GTK3 toolkit
 
 %description gtk3
-Xiphos (formerly known as GnomeSword) is a Bible study tool written for Linux,
+Xiphos is a Bible study tool written for Linux,
 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.
@@ -77,7 +75,7 @@ Project and elsewhere.
 Summary:        Common files for all versions of Xiphos
 
 %description common
-Xiphos (formerly known as GnomeSword) is a Bible study tool written for Linux,
+Xiphos is a Bible study tool written for Linux,
 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.
@@ -92,8 +90,6 @@ mkdir gtk3
 cp -r gtk2/* gtk3
 
 %build
-CFLAGS='%{optflags} -DNO_SWORD_SET_RENDER_NOTE_NUMBERS=1'
-CXXFLAGS='%{optflags} -DNO_SWORD_SET_RENDER_NOTE_NUMBERS=1'
 %ifarch %{power64}
  CFLAGS="$CFLAGS -D__SANE_USERSPACE_TYPES__"
  CXXFLAGS="$CXXFLAGS -D__SANE_USERSPACE_TYPES__"
@@ -215,6 +211,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/appdata/xiphos.appdata.xml
 
 %changelog
+* Tue Dec 23 2014 Greg Hellings <greg.hellings at gmail.com> 4.0.0-1
+- New upstream version
+- Removed obsolete build flags
+- Removed references to GnomeSword (> 6 years old, version 2.x name)
+- Added biblesync-devel minimum version
+
 * Tue Dec 16 2014 Greg Hellings <greg.hellings at gmail.com> 3.2.3j-3
 - Added workaround for waf insufficiently isolating multi-build
 
-- 
cgit v0.10.2


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


More information about the scm-commits mailing list