mcepl pushed to xiphos (epel7). "Merge branch 'master' into epel7 (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Sun Apr 19 19:09:11 UTC 2015
>From 0af938721e8e3ff2b5b8c7f424b89af8d0b82ce2 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson at fedoraproject.org>
Date: Mon, 18 Aug 2014 10:07:28 +0000
Subject: - Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
diff --git a/xiphos.spec b/xiphos.spec
index 2ef4274..7bad15d 100644
--- a/xiphos.spec
+++ b/xiphos.spec
@@ -1,6 +1,6 @@
Name: xiphos
Version: 3.2.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Bible study and research tool
License: GPLv2+
URL: http://xiphos.org/
@@ -97,6 +97,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/xiphos/
%changelog
+* Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
* Sat Aug 02 2014 Christopher Meng <rpm at cicku.me> - 3.2.1-2
- Build against GTK+3
--
cgit v0.10.2
>From 1b091178bf117ab18d412c9fd98d13dec66d24bb Mon Sep 17 00:00:00 2001
From: Greg Hellings <greg.hellings at gmail.com>
Date: Mon, 25 Aug 2014 22:08:24 -0500
Subject: New upstream version 3.2.2
diff --git a/.gitignore b/.gitignore
index d63ca5f..f41c7a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ xiphos-3.1.3.tar.gz
/xiphos-3.1.6.tar.gz
/xiphos-3.2.0.tar.gz
/xiphos-3.2.1.tar.gz
+/xiphos-3.2.2.tar.gz
diff --git a/sources b/sources
index eb86caf..87a4455 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b420231baa72f0307bd73e687a8add27 xiphos-3.2.1.tar.gz
+9aaca7380b1537d2b0e6bcc0ab758663 xiphos-3.2.2.tar.gz
diff --git a/xiphos.spec b/xiphos.spec
index 7bad15d..52d60d9 100644
--- a/xiphos.spec
+++ b/xiphos.spec
@@ -1,11 +1,10 @@
Name: xiphos
-Version: 3.2.1
-Release: 3%{?dist}
+Version: 3.2.2
+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
-Patch0: format-warning.patch
BuildRequires: biblesync-devel
BuildRequires: desktop-file-utils
BuildRequires: dbus-glib-devel
@@ -42,7 +41,7 @@ Project and elsewhere.
%prep
%setup -q
-%patch0 -p1
+rm -rf src/biblesync
%build
CFLAGS='%{optflags} -DNO_SWORD_SET_RENDER_NOTE_NUMBERS=1' \
@@ -97,6 +96,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/xiphos/
%changelog
+* Mon Aug 25 2014 Greg Hellings <greg.hellings at gmail.com> - 3.2.2-1
+- New upstream version
+
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
--
cgit v0.10.2
>From a19222557c355533d55802677aa438470cbbe584 Mon Sep 17 00:00:00 2001
From: Karsten Hopp <karsten at redhat.com>
Date: Thu, 16 Oct 2014 11:21:28 +0200
Subject: fix ppc64* builds
diff --git a/xiphos.spec b/xiphos.spec
index 52d60d9..7313a82 100644
--- a/xiphos.spec
+++ b/xiphos.spec
@@ -1,6 +1,6 @@
Name: xiphos
Version: 3.2.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Bible study and research tool
License: GPLv2+
URL: http://xiphos.org/
@@ -44,8 +44,15 @@ Project and elsewhere.
rm -rf src/biblesync
%build
-CFLAGS='%{optflags} -DNO_SWORD_SET_RENDER_NOTE_NUMBERS=1' \
-CXXFLAGS='%{optflags} -DNO_SWORD_SET_RENDER_NOTE_NUMBERS=1' \
+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__"
+%endif
+export CXXFLAGS
+export CFLAGS
+
LDFLAGS='%{?__global_ldflags}' \
./waf configure \
--prefix=%{_prefix} \
--
cgit v0.10.2
>From a7b07996e5e42c414862451f9320f0cd43aa2f48 Mon Sep 17 00:00:00 2001
From: Karsten Hopp <karsten at redhat.com>
Date: Thu, 16 Oct 2014 14:37:32 +0200
Subject: add changelog: fix ppc64* builds
diff --git a/xiphos.spec b/xiphos.spec
index 7313a82..4f346e8 100644
--- a/xiphos.spec
+++ b/xiphos.spec
@@ -103,6 +103,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/xiphos/
%changelog
+* Thu Oct 16 2014 Karsten Hopp <karsten at redhat.com> 3.2.2-2
+- fix ppc64* builds
+
* Mon Aug 25 2014 Greg Hellings <greg.hellings at gmail.com> - 3.2.2-1
- New upstream version
--
cgit v0.10.2
>From 88a8ddd072cadad409b548e5d42ccdd3a76b0b4e Mon Sep 17 00:00:00 2001
From: Greg Hellings <greg.hellings at gmail.com>
Date: Tue, 9 Dec 2014 23:58:57 -0600
Subject: Updated to new upstream release
diff --git a/.gitignore b/.gitignore
index f41c7a0..b2d62e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ xiphos-3.1.3.tar.gz
/xiphos-3.2.0.tar.gz
/xiphos-3.2.1.tar.gz
/xiphos-3.2.2.tar.gz
+/xiphos-3.2.3j.tar.gz
diff --git a/sources b/sources
index 87a4455..67d2cde 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9aaca7380b1537d2b0e6bcc0ab758663 xiphos-3.2.2.tar.gz
+cd2a2c944d63d7cd1888e6f11ef20aa3 xiphos-3.2.3j.tar.gz
diff --git a/xiphos.spec b/xiphos.spec
index 4f346e8..c563adc 100644
--- a/xiphos.spec
+++ b/xiphos.spec
@@ -1,6 +1,13 @@
+# Define whether or not we are building for GTK3
+%if 0%{?rhel} > 0 && 0%{?rhel} <= 6
+%define build3 0
+%else
+%define build3 1
+%endif
+
Name: xiphos
-Version: 3.2.2
-Release: 2%{?dist}
+Version: 3.2.3j
+Release: 1%{?dist}
Summary: Bible study and research tool
License: GPLv2+
URL: http://xiphos.org/
@@ -12,21 +19,16 @@ BuildRequires: docbook-utils
BuildRequires: GConf2-devel
BuildRequires: gettext
BuildRequires: gnome-doc-utils
-%if 0%{?rhel} > 0 && 0%{?rhel} <= 6
BuildRequires: libglade2-devel
-%else
-BuildRequires: gtk3-devel
-%endif
BuildRequires: gtkhtml3-devel
BuildRequires: intltool
BuildRequires: libgsf-devel
BuildRequires: libuuid-devel
-#BuildRequires: perl(XML::Parser)
BuildRequires: rarian-compat
BuildRequires: sword-devel >= 1.7.3
-%if 0%{?rhel} > 0 && 0%{?rhel} <= 6
BuildRequires: webkitgtk-devel
-%else
+%if 0%{build3} > 0
+BuildRequires: gtk3-devel
BuildRequires: webkitgtk3-devel
%endif
Requires: yelp
@@ -39,6 +41,37 @@ 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 gtk2
+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,
+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.
+
+%if 0%{build3} > 0
+%package gtk3
+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,
+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.
+%endif
+
+%package common
+Summary: Common files for all versions of Xiphos
+
+%description common
+Xiphos (formerly known as GnomeSword) 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.
+
%prep
%setup -q
rm -rf src/biblesync
@@ -53,20 +86,42 @@ CXXFLAGS='%{optflags} -DNO_SWORD_SET_RENDER_NOTE_NUMBERS=1'
export CXXFLAGS
export CFLAGS
+# Build GTK2 version
LDFLAGS='%{?__global_ldflags}' \
./waf configure \
--prefix=%{_prefix} \
-%if 0%{?rhel} > 0 && 0%{?rhel} <= 6
--gtk=2 \
-%else
- --gtk=3 \
-%endif
+ -b build-gtk2 \
+ --enable-webkit || cat build/config.log
+
+./waf build -v -b build-gtk2
+
+# Build GTK3 version
+%if 0%{build3} > 0
+LDFLAGS='%{?__global_ldflags}' \
+./waf configure \
+ --prefix=%{_prefix} \
+ --gtk=3 \
+ -b build-gtk3 \
--enable-webkit || cat build/config.log
-./waf build -v
+./waf build -v -b build-gtk3
+%endif
%install
-./waf install --destdir %{buildroot}
+# Install GTK2 version
+./waf install -b build-gtk2 --destdir %{buildroot}
+mv %{buildroot}%{_bindir}/xiphos %{buildroot}%{_bindir}/xiphos-gtk2
+mv %{buildroot}%{_bindir}/xiphos-nav %{buildroot}%{_bindir}/xiphos-nav-gtk2
+touch %{buildroot}%{_bindir}/xiphos
+
+# Install GTK3 version
+%if 0%{build3} > 0
+./waf install -b build-gtk3 --destdir %{buildroot}
+mv %{buildroot}%{_bindir}/xiphos %{buildroot}%{_bindir}/xiphos-gtk3
+mv %{buildroot}%{_bindir}/xiphos-nav %{buildroot}%{_bindir}/xiphos-nav-gtk3
+touch %{buildroot}%{_bindir}/xiphos
+%endif
desktop-file-install --delete-original \
--add-category=X-Bible \
@@ -80,29 +135,68 @@ rm -frv %{buildroot}%{_docdir}/%{name}
%find_lang %{name}
-%post
+# Post-install options
+%post common
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-%postun
+%if 0%{build3} > 0
+%post gtk3
+%{_sbindir}/update-alternatives --install %{_bindir}/xiphos xiphos %{_bindir}/xiphos-gtk3 10 \
+ --slave %{_bindir}/xiphos-nav xiphos-nav %{_bindir}/xiphos-nav-gtk3
+%endif
+
+%post gtk2
+%{_sbindir}/update-alternatives --install %{_bindir}/xiphos xiphos %{_bindir}/xiphos-gtk2 10 \
+ --slave %{_bindir}/xiphos-nav xiphos-nav %{_bindir}/xiphos-nav-gtk2
+
+# Post-uninstall options
+%postun common
if [ $1 -eq 0 ] ; then
touch --no-create %{_datadir}/icons/hicolor &>/dev/null
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
+%if 0%{build3} > 0
+# Pre-uninstall options
+%preun gtk3
+if [ $1 -eq 0 ]; then
+ %{_sbindir}/update-alternatives --remove xiphos %{_bindir}/xiphos-gtk3
+fi
+%endif
+
+%preun gtk2
+if [ $1 -eq 0 ]; then
+ %{_sbindir}/update-alternatives --remove xiphos %{_bindir}/xiphos-gtk2
+fi
+
%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-%files -f %{name}.lang
+%files gtk2
+%{_bindir}/xiphos-gtk2
+%{_bindir}/xiphos-nav-gtk2
+%ghost %{_bindir}/xiphos
+
+%if 0%{build3} > 0
+%files gtk3
+%{_bindir}/xiphos-gtk3
+%{_bindir}/xiphos-nav-gtk3
+%ghost %{_bindir}/xiphos
+%endif
+
+%files -f %{name}.lang common
%doc AUTHORS COPYING ChangeLog README RELEASE-NOTES TODO Xiphos.ogg
-%{_bindir}/xiphos
-%{_bindir}/xiphos-nav
%{_datadir}/applications/xiphos.desktop
%{_datadir}/gnome/help/xiphos
%{_datadir}/icons/hicolor/scalable/apps/xiphos.svg
%{_datadir}/omf/xiphos/
%{_datadir}/xiphos/
+%{_datadir}/appdata/xiphos.appdata.xml
%changelog
+* Tue Dec 09 2014 Greg Hellings <greg.hellings at gmail.com> 3.2.3j-1
+- Add installation of GTK2 and GTK3 versions in parallel
+
* Thu Oct 16 2014 Karsten Hopp <karsten at redhat.com> 3.2.2-2
- fix ppc64* builds
--
cgit v0.10.2
>From 0c6a2a22b5dc8beceab0a021c2b4308659cfd1b2 Mon Sep 17 00:00:00 2001
From: Greg Hellings <greg.hellings at gmail.com>
Date: Wed, 10 Dec 2014 23:57:50 -0600
Subject: Added compat package
diff --git a/xiphos.spec b/xiphos.spec
index c563adc..a2f477f 100644
--- a/xiphos.spec
+++ b/xiphos.spec
@@ -7,7 +7,7 @@
Name: xiphos
Version: 3.2.3j
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Bible study and research tool
License: GPLv2+
URL: http://xiphos.org/
@@ -41,6 +41,16 @@ 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 < 3.2.2-3
+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
Requires: %{name}-common = %{version}-%{release}
Summary: A version of Xiphos built against the GTK2 toolkit
@@ -194,6 +204,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/appdata/xiphos.appdata.xml
%changelog
+* Wed Dec 10 2014 Greg Hellings <greg.hellings at gmail.com> 3.2.3j-2
+- Obsoleted old Xiphos unary package
+
* Tue Dec 09 2014 Greg Hellings <greg.hellings at gmail.com> 3.2.3j-1
- Add installation of GTK2 and GTK3 versions in parallel
--
cgit v0.10.2
>From e1ffea7bb0aede857496be329dc47cdfef292835 Mon Sep 17 00:00:00 2001
From: Gregory Hellings <greg.hellings at gmail.com>
Date: Tue, 16 Dec 2014 22:42:28 -0600
Subject: Fixed duplication of gtk2 and 3 in same package
diff --git a/xiphos.spec b/xiphos.spec
index a2f477f..7c63a0e 100644
--- a/xiphos.spec
+++ b/xiphos.spec
@@ -7,7 +7,7 @@
Name: xiphos
Version: 3.2.3j
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Bible study and research tool
License: GPLv2+
URL: http://xiphos.org/
@@ -85,6 +85,11 @@ Project and elsewhere.
%prep
%setup -q
rm -rf src/biblesync
+# Ugly hack because of bugs in this version of waf
+mkdir gtk2
+cp -r * gtk2 || true
+mkdir gtk3
+cp -r gtk2/* gtk3
%build
CFLAGS='%{optflags} -DNO_SWORD_SET_RENDER_NOTE_NUMBERS=1'
@@ -97,40 +102,46 @@ export CXXFLAGS
export CFLAGS
# Build GTK2 version
+pushd gtk2
LDFLAGS='%{?__global_ldflags}' \
./waf configure \
--prefix=%{_prefix} \
--gtk=2 \
- -b build-gtk2 \
--enable-webkit || cat build/config.log
-./waf build -v -b build-gtk2
+./waf build -v
+popd
# Build GTK3 version
%if 0%{build3} > 0
+pushd gtk3
LDFLAGS='%{?__global_ldflags}' \
./waf configure \
--prefix=%{_prefix} \
--gtk=3 \
- -b build-gtk3 \
--enable-webkit || cat build/config.log
-./waf build -v -b build-gtk3
+./waf build -v
+popd
%endif
%install
# Install GTK2 version
-./waf install -b build-gtk2 --destdir %{buildroot}
+pushd gtk2
+./waf install -b . --destdir %{buildroot}
mv %{buildroot}%{_bindir}/xiphos %{buildroot}%{_bindir}/xiphos-gtk2
mv %{buildroot}%{_bindir}/xiphos-nav %{buildroot}%{_bindir}/xiphos-nav-gtk2
touch %{buildroot}%{_bindir}/xiphos
+popd
# Install GTK3 version
%if 0%{build3} > 0
-./waf install -b build-gtk3 --destdir %{buildroot}
+pushd gtk3
+./waf install --destdir %{buildroot}
mv %{buildroot}%{_bindir}/xiphos %{buildroot}%{_bindir}/xiphos-gtk3
mv %{buildroot}%{_bindir}/xiphos-nav %{buildroot}%{_bindir}/xiphos-nav-gtk3
touch %{buildroot}%{_bindir}/xiphos
+popd
%endif
desktop-file-install --delete-original \
@@ -204,6 +215,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/appdata/xiphos.appdata.xml
%changelog
+* Tue Dec 16 2014 Greg Hellings <greg.hellings at gmail.com> 3.2.3j-3
+- Added workaround for waf insufficiently isolating multi-build
+
* Wed Dec 10 2014 Greg Hellings <greg.hellings at gmail.com> 3.2.3j-2
- Obsoleted old Xiphos unary package
--
cgit v0.10.2
>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
>From 456148413dd2cd7c2db85d04ca743f4841faaa7f Mon Sep 17 00:00:00 2001
From: Gregory Hellings <greg.hellings at gmail.com>
Date: Wed, 24 Dec 2014 10:02:16 -0600
Subject: Updated Obsoletes version
diff --git a/xiphos.spec b/xiphos.spec
index 9732ef8..98b6dc4 100644
--- a/xiphos.spec
+++ b/xiphos.spec
@@ -7,7 +7,7 @@
Name: xiphos
Version: 4.0.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Bible study and research tool
License: GPLv2+
URL: http://xiphos.org/
@@ -40,7 +40,7 @@ environment for reading, study, and research using modules from The SWORD
Project and elsewhere.
%package compat
-Obsoletes: xiphos < 3.2.2-3
+Obsoletes: xiphos < 4.0.0
Requires: xiphos-gtk2 = %{version}-%{release}
Summary: Compatibility package for xiphos => xiphos-gtk2
@@ -211,6 +211,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/appdata/xiphos.appdata.xml
%changelog
+* Wed Dec 24 2014 Greg Hellings <greg.hellings at gmail.com> 4.0.0-2
+- Updated xiphos-compat obsoletes
+
* Tue Dec 23 2014 Greg Hellings <greg.hellings at gmail.com> 4.0.0-1
- New upstream version
- Removed obsolete build flags
--
cgit v0.10.2
>From b7cd092d338b5ee665ef38b73d33e350e6ad04f1 Mon Sep 17 00:00:00 2001
From: Gregory Hellings <greg.hellings at gmail.com>
Date: Wed, 24 Dec 2014 14:23:34 -0600
Subject: New upstream tarball with updated translation
diff --git a/sources b/sources
index 3a69b7c..4e488b1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-91844473efd0fb71c69be18b51585581 xiphos-4.0.0.tar.gz
+7305c368510574bd64d873daeb5354ee xiphos-4.0.0.tar.gz
diff --git a/xiphos.spec b/xiphos.spec
index 98b6dc4..af5ef62 100644
--- a/xiphos.spec
+++ b/xiphos.spec
@@ -7,7 +7,7 @@
Name: xiphos
Version: 4.0.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Bible study and research tool
License: GPLv2+
URL: http://xiphos.org/
@@ -211,6 +211,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/appdata/xiphos.appdata.xml
%changelog
+* Wed Dec 24 2014 Greg Hellings <greg.hellings at gmail.com> 4.0.0-3
+- New upstream tarball (same version)
+
* Wed Dec 24 2014 Greg Hellings <greg.hellings at gmail.com> 4.0.0-2
- Updated xiphos-compat obsoletes
--
cgit v0.10.2
>From 1c91101bd855229ca54ba80b3d2c66b00749674b Mon Sep 17 00:00:00 2001
From: Gregory Hellings <greg.hellings at gmail.com>
Date: Fri, 16 Jan 2015 14:23:49 -0600
Subject: Ignore temporary build files
diff --git a/.gitignore b/.gitignore
index 470a13e..f7cf92b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+*.swp
+*.rpm
+results_xiphos
xiphos-3.1.3.tar.gz
/xiphos-3.1.4.tar.gz
/xiphos-20110614svn4172.tar.bz2
--
cgit v0.10.2
>From ed6078c383cc4bb169450ffad4e77f1824b06464 Mon Sep 17 00:00:00 2001
From: Gregory Hellings <greg.hellings at gmail.com>
Date: Fri, 16 Jan 2015 14:24:06 -0600
Subject: Added gtkhtml compat
WebKit based editor has breakages in non-English,
so reverting to build against GTKHtml only
diff --git a/xiphos.spec b/xiphos.spec
index af5ef62..2a60104 100644
--- a/xiphos.spec
+++ b/xiphos.spec
@@ -7,7 +7,7 @@
Name: xiphos
Version: 4.0.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Bible study and research tool
License: GPLv2+
URL: http://xiphos.org/
@@ -21,6 +21,7 @@ BuildRequires: gettext
BuildRequires: gnome-doc-utils
BuildRequires: libglade2-devel
BuildRequires: gtkhtml3-devel
+BuildRequires: compat-gtkhtml314-devel
BuildRequires: intltool
BuildRequires: libgsf-devel
BuildRequires: libuuid-devel
@@ -102,8 +103,7 @@ pushd gtk2
LDFLAGS='%{?__global_ldflags}' \
./waf configure \
--prefix=%{_prefix} \
- --gtk=2 \
- --enable-webkit || cat build/config.log
+ --gtk=2 || cat build/config.log
./waf build -v
popd
@@ -114,8 +114,7 @@ pushd gtk3
LDFLAGS='%{?__global_ldflags}' \
./waf configure \
--prefix=%{_prefix} \
- --gtk=3 \
- --enable-webkit || cat build/config.log
+ --gtk=3 || cat build/config.log
./waf build -v
popd
@@ -211,6 +210,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/appdata/xiphos.appdata.xml
%changelog
+* 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
+
* Wed Dec 24 2014 Greg Hellings <greg.hellings at gmail.com> 4.0.0-3
- New upstream tarball (same version)
--
cgit v0.10.2
>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
>From afc9a7b1e175b9733bc1829f010b8031fe149468 Mon Sep 17 00:00:00 2001
From: Gregory Hellings <greg.hellings at gmail.com>
Date: Wed, 15 Apr 2015 20:30:48 -0500
Subject: Update to 4.0.2
diff --git a/.gitignore b/.gitignore
index f7cf92b..1938871 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ xiphos-3.1.3.tar.gz
/xiphos-3.2.2.tar.gz
/xiphos-3.2.3j.tar.gz
/xiphos-4.0.0.tar.gz
+/xiphos-4.0.2.tar.gz
diff --git a/sources b/sources
index 4e488b1..922396a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7305c368510574bd64d873daeb5354ee xiphos-4.0.0.tar.gz
+d5151d06bc701c82f9a1fa7f81214fe1 xiphos-4.0.2.tar.gz
diff --git a/xiphos.spec b/xiphos.spec
index 94d48e2..f8c26b7 100644
--- a/xiphos.spec
+++ b/xiphos.spec
@@ -6,7 +6,7 @@
%endif
Name: xiphos
-Version: 4.0.1
+Version: 4.0.2
Release: 1%{?dist}
Summary: Bible study and research tool
License: GPLv2+
@@ -203,6 +203,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/appdata/xiphos.appdata.xml
%changelog
+* Wed Apr 15 2015 Greg Hellings <greg.hellings at gmail.com> 4.0.2-1
+- Version bump - major upstream memory bugs
+
* Wed Apr 08 2015 Greg Hellings <greg.hellings at gmail.com> 4.0.1-1
- Version bump
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/xiphos.git/commit/?h=epel7&id=6eed20c2d0599d228454c1fc1bfcd43cb8df746f
More information about the scm-commits
mailing list