[xiphos/el6: 7/9] Merge branch 'master' into el6

Christopher Meng cicku at fedoraproject.org
Tue Aug 5 09:28:46 UTC 2014 

commit 7a45ce846c7d772963f239f058d81ac16e374180
Merge: e435a54 77d99c6
Author: Christopher Meng <i at cicku.me>
Date:   Tue Aug 5 17:27:11 2014 +0800

    Merge branch 'master' into el6
    
    Conflicts:
    	xiphos.spec

 xiphos.spec |  145 +++++++++++++++++++++++++----------------------------------
 1 files changed, 61 insertions(+), 84 deletions(-)
---
diff --cc xiphos.spec
index d346a1d,5598515..1769bad
--- a/xiphos.spec
+++ b/xiphos.spec
@@@ -1,36 -1,38 +1,38 @@@
- Name:		xiphos
- Version:	3.2.1
- Release:	2%{?dist}
- Summary:	Bible study and research tool
- 
- Group:		Applications/Text
- License:	GPLv2+
- URL:		http://xiphos.org/
- Source0:	http://downloads.sourceforge.net/gnomesword/xiphos-%{version}.tar.gz
- Patch0:     format-warning.patch
- BuildRequires:	sword-devel >= 1.7.3
- BuildRequires:	gettext
- BuildRequires:	desktop-file-utils
- BuildRequires:	gnome-doc-utils
- BuildRequires:	gtkhtml3-devel GConf2-devel
- BuildRequires:	libgsf-devel
- BuildRequires:	dbus-glib-devel
- BuildRequires:  libuuid-devel
- #BuildRequires:	ImageMagick-c++-devel
- BuildRequires:	perl(XML::Parser) intltool
- BuildRequires:	rarian-compat
- # Needed on GTK+2 builds
+ Name:           xiphos 
+ Version:        3.2.1
 -Release:        2%{?dist}
++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
+ BuildRequires:  docbook-utils
+ BuildRequires:  GConf2-devel
+ BuildRequires:  gettext
+ BuildRequires:  gnome-doc-utils
+ %if 0%{?rhel} > 0 && 0%{?rhel} <= 6
  BuildRequires:  libglade2-devel
- Requires:	yelp
- Obsoletes:	gnomesword < 2.4.2
- Provides:	gnomesword = %{version}-%{release}
- %if 0%{?rhel} > 0 && 0%{?rhel} <= 7
- BuildRequires: libglade2-devel
- BuildRequires:	webkitgtk-devel
- Patch1: gtk_widget_get_realized-compatibility.patch
  %else
- BuildRequires:	webkitgtk3-devel
+ 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
+ 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,
@@@ -40,21 -42,20 +42,20 @@@ Project and elsewhere
  
  %prep
  %setup -q
- 
  %patch0 -p1
  
- %if 0%{?rhel} > 0 && 0%{?rhel} <= 7
- %patch1 -p0 -b .gtk220-compatbility
- %endif
- 
- 
  %build
- CFLAGS='%{optflags} -DNO_SWORD_SET_RENDER_NOTE_NUMBERS=1' CXXFLAGS='%{optflags} -DNO_SWORD_SET_RENDER_NOTE_NUMBERS=1' ./waf configure	\
- 	--prefix %{_prefix} \
- %if 0%{?rhel} > 0 && 0%{?rhel} <= 7
- --gtk=2 \
+ CFLAGS='%{optflags} -DNO_SWORD_SET_RENDER_NOTE_NUMBERS=1'   \
+ CXXFLAGS='%{optflags} -DNO_SWORD_SET_RENDER_NOTE_NUMBERS=1' \
+ LDFLAGS='%{?__global_ldflags}'                              \
+ ./waf configure	                     \
+         --prefix=%{_prefix}          \
 -%if 0%{?rhel} > 0 && 0%{?rhel} <= 7
++%if 0%{?rhel} > 0 && 0%{?rhel} <= 6
+         --gtk=2                      \
+ %else
+         --gtk=3                      \
  %endif
- 
+         --enable-webkit || cat build/config.log
  
  ./waf build -v
  
@@@ -87,41 -88,41 +88,17 @@@ gtk-update-icon-cache %{_datadir}/icons
  
  %files -f %{name}.lang
  %doc AUTHORS COPYING ChangeLog README RELEASE-NOTES TODO Xiphos.ogg
- %_bindir/xiphos
- %_bindir/xiphos-nav
- %_datadir/xiphos/
- %_datadir/icons/hicolor/scalable/apps/xiphos.svg
- %_datadir/omf/xiphos/
- %_datadir/applications/xiphos.desktop
- %_datadir/gnome/help/xiphos
+ %{_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/
  
  %changelog
- * Sat Jul 26 2014 Matěj Cepl <mcepl at redhat.com> - 3.2.1-2
- - Fix build on EPEL-6 (RHBZ# 754449)
- 
- * Tue Jun 10 2014 Greg Hellings <greg.hellings at gmail.com> - 3.2.1-1
- - New upstream release
- 
- * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.0-2
- - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
- 
- * Fri May 16 2014 Greg Hellings <greg.hellings at gmail.com> - 3.2.0-1
- - New upstream release
- 
- * Wed Jan 29 2014 Greg Hellings <greg.hellings at gmail.com> - 3.1.6-2
- - Removed GTK3 in favor of GTK2, as GTK3 is known to be buggy for this release
- 
- * Wed Jan 29 2014 Deji Akingunola <dakingun at gmail.com> - 3.1.6-1
- - Update to version 3.1.6
- 
- * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.5-4
- - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
- 
- * Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.5-3
- - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
- 
- * Sun Jul 22 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.5-2
- - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 -* Sat Aug 02 2014 Christopher Meng <rpm at cicku.me> - 3.2.1-2
 -- Build against GTK+3
 -
 -* Tue Jun 10 2014 Greg Hellings <greg.hellings at gmail.com> - 3.2.1-1
 -- New upstream release
 -
 -* Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.0-2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 -
 -* Fri May 16 2014 Greg Hellings <greg.hellings at gmail.com> - 3.2.0-1
 -- New upstream release
 -
 -* Wed Jan 29 2014 Greg Hellings <greg.hellings at gmail.com> - 3.1.6-2
 -- Removed GTK3 in favor of GTK2, as GTK3 is known to be buggy for this release
 -
 -* Wed Jan 29 2014 Deji Akingunola <dakingun at gmail.com> - 3.1.6-1
 -- Update to version 3.1.6
 -
 -* Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.5-4
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 -
 -* Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.5-3
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 -
 -* Sun Jul 22 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.5-2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
++* Tue Aug 05 2014 Christopher Meng <rpm at cicku.me> - 3.2.1-1
++- Rebase to 3.2.1 with rebuilding against new gtkhtml3.
  
  * Wed Feb 22 2012 Deji Akingunola <dakingun at gmail.com> - 3.1.5-1
  - Update to version 3.1.5

More information about the scm-commits mailing list