packages: xiphos/xiphos.spec, xiphos/xiphos-xulrunner.patch (REMOVED) - Up ...

[caleb]

Author: caleb                        Date: Sat Oct 16 07:50:02 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- Up to 3.1.4
- Removed patches applied upstream
- Switched to new build system using ./waf

---- Files affected:
packages/xiphos:
   xiphos.spec (1.11 -> 1.12) , xiphos-xulrunner.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/xiphos/xiphos.spec
diff -u packages/xiphos/xiphos.spec:1.11 packages/xiphos/xiphos.spec:1.12
--- packages/xiphos/xiphos.spec:1.11	Wed Jun  9 11:48:59 2010
+++ packages/xiphos/xiphos.spec	Sat Oct 16 09:49:57 2010
@@ -1,20 +1,20 @@
 # $Revision$, $Date$
 Summary:	GNOME-based Bible research tool
 Name:		xiphos
-Version:	3.1.3
-Release:	0.4
+Version:	3.1.4
+Release:	0.1
 License:	GPL
 Group:		X11/Applications
 URL:		http://www.xiphos.org/
 Source0:	http://downloads.sourceforge.net/gnomesword/Xiphos/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	aaded6bc81b29935edd989d204928ba3
-Patch0:		%{name}-xulrunner.patch
+# Source0-md5:	4d6f7805c4c8185f5c4ac3bd95fc705a
 BuildRequires:	clucene-core-devel
 BuildRequires:	gnome-spell
 BuildRequires:	gtkhtml-devel >= 3.0
 BuildRequires:	libbonobo-devel >= 2.0
 BuildRequires:	libgnomeui-devel >= 2.2
 BuildRequires:	libgsf-devel >= 1
+BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.198
 BuildRequires:	scrollkeeper >= 0.3.5
 BuildRequires:	sword-devel >= 1.6.1
@@ -41,16 +41,18 @@
 
 %prep
 %setup -q
-%patch0 -p0
 
 %build
-%configure
-%{__make}
+./waf configure \
+	--prefix %{_prefix} \
+	--debug-level optimized \
+	--enable-delint
+./waf build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
+./waf install \
+	--destdir $RPM_BUILD_ROOT
 
 rm -r $RPM_BUILD_ROOT%{_docdir}/%{name}
 rm -r $RPM_BUILD_ROOT%{_iconsdir}/hicolor/scalable/apps/xiphos.svg
@@ -70,9 +72,10 @@
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc ABOUT-NLS AUTHORS INSTALL NEWS README TODO
+%doc COPYING AUTHORS INSTALL NEWS README TODO TRANSLATION-HOWTO RELEASE-NOTES ChangeLog
 %doc %{_datadir}/gnome/help/*
 %attr(755,root,root) %{_bindir}/xiphos
+%attr(755,root,root) %{_bindir}/xiphos-nav
 %{_datadir}/xiphos
 %dir %{_datadir}/omf/xiphos
 %{_datadir}/omf/xiphos/*.omf
@@ -86,6 +89,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2010/10/16 07:49:57  caleb
+- Up to 3.1.4
+- Removed patches applied upstream
+- Switched to new build system using ./waf
+
 Revision 1.11  2010/06/09 09:48:59  caleb
 - Require latest xulrunner, has sporadic display issues when built with older versions.
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xiphos/xiphos.spec?r1=1.11&r2=1.12&f=u