packages (DEVEL): xiphos/xiphos.spec - DEVEL branch for upstream webkit bra...

[caleb]

Author: caleb                        Date: Sat Jan  7 16:37:44 2012 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- DEVEL branch for upstream webkit branch (will replace xulrunner in next release)

---- Files affected:
packages/xiphos:
   xiphos.spec (1.15 -> 1.15.2.1) 

---- Diffs:

================================================================
Index: packages/xiphos/xiphos.spec
diff -u packages/xiphos/xiphos.spec:1.15 packages/xiphos/xiphos.spec:1.15.2.1
--- packages/xiphos/xiphos.spec:1.15	Sat Oct 23 10:59:12 2010
+++ packages/xiphos/xiphos.spec	Sat Jan  7 17:37:39 2012
@@ -1,15 +1,20 @@
 # $Revision$, $Date$
 Summary:	GNOME-based Bible research tool
 Name:		xiphos
-Version:	3.1.4
-Release:	2
+Version:	3.1.5svn
+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:	4d6f7805c4c8185f5c4ac3bd95fc705a
+#Source0:	http://downloads.sourceforge.net/gnomesword/Xiphos/%{version}/%{name}-%{version}.tar.gz
+# svn co https://gnomesword.svn.sourceforge.net/svnroot/gnomesword/branches/webkit xiphos-webkit-svn
+# rm -rf xiphos-webkit-svn/.svn
+# tar cvfz xiphos-webkit-svn.tar.gz xiphos-webkit-svn
+Source0:	%{name}-webkit-svn.tar.gz
+# Source0-md5:	6cc860c9e238137245307e4ae0f512f1
 BuildRequires:	clucene-core-devel
 BuildRequires:	gnome-spell
+BuildRequires:	gtk-webkit3-devel
 BuildRequires:	gtkhtml-devel >= 3.91.0
 BuildRequires:	libbonobo-devel >= 2.0
 BuildRequires:	libgnomeui-devel >= 2.2
@@ -18,7 +23,6 @@
 BuildRequires:	rpmbuild(macros) >= 1.198
 BuildRequires:	scrollkeeper >= 0.3.5
 BuildRequires:	sword-devel >= 1.6.2
-BuildRequires:	xulrunner-devel >= 1.9.3.2
 Requires(post,postun):	scrollkeeper
 Requires:	clucene-core
 Requires:	gtkhtml >= 3.91.0
@@ -26,7 +30,6 @@
 Requires:	libgnomeui >= 2.2
 Requires:	libgsf >= 1
 Requires:	sword >= 1.6.2
-Requires:	xulrunner >= 1.9.3.2
 Suggests:	festival
 Obsoletes:	gnomesword
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -41,7 +44,7 @@
 Society through the SWORD Project.
 
 %prep
-%setup -q
+%setup -q -n %{name}-webkit-svn
 
 %build
 ./waf configure \
@@ -57,8 +60,8 @@
 
 rm -r $RPM_BUILD_ROOT%{_docdir}/%{name}
 rm -r $RPM_BUILD_ROOT%{_iconsdir}/hicolor/scalable/apps/xiphos.svg
-rm -r $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}/*.xpm
-rm -r $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}/*.ico
+#rm -r $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}/*.xpm
+#rm -r $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}/*.ico
 
 %find_lang %{name}
 
@@ -80,8 +83,8 @@
 %{_datadir}/xiphos
 %dir %{_datadir}/omf/xiphos
 %{_datadir}/omf/xiphos/*.omf
-%dir %{_pixmapsdir}/%{name}
-%{_pixmapsdir}/%{name}/*.png
+#%dir %{_pixmapsdir}/%{name}
+#%{_pixmapsdir}/%{name}/*.png
 %{_desktopdir}/%{name}.desktop
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -90,6 +93,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15.2.1  2012/01/07 16:37:39  caleb
+- DEVEL branch for upstream webkit branch (will replace xulrunner in next release)
+
 Revision 1.15  2010/10/23 08:59:12  caleb
 - Rel 2, STBR
 
================================================================

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