rpms/xiphos/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 xiphos.spec, 1.9, 1.10 xiphos-xul-1.9.2.patch, 1.1, NONE

[Deji Akingunola]

Author: deji

Update of /cvs/pkgs/rpms/xiphos/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv17727

Modified Files:
	.cvsignore sources xiphos.spec 
Removed Files:
	xiphos-xul-1.9.2.patch 
Log Message:
* Tue Mar 23 2010 Deji Akingunola <dakingun at gmail.com> - 3.1.3-1
- New upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xiphos/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	29 Dec 2009 13:33:27 -0000	1.4
+++ .cvsignore	25 Mar 2010 14:55:38 -0000	1.5
@@ -1 +1 @@
-xiphos-3.1.2.tar.gz
+xiphos-3.1.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xiphos/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	29 Dec 2009 13:33:28 -0000	1.4
+++ sources	25 Mar 2010 14:55:38 -0000	1.5
@@ -1 +1 @@
-0de807c49db6e6f696ffd1cee8ec4b22  xiphos-3.1.2.tar.gz
+aaded6bc81b29935edd989d204928ba3  xiphos-3.1.3.tar.gz


Index: xiphos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xiphos/devel/xiphos.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- xiphos.spec	14 Mar 2010 05:08:29 -0000	1.9
+++ xiphos.spec	25 Mar 2010 14:55:38 -0000	1.10
@@ -1,13 +1,12 @@
 Name:		xiphos 
-Version:	3.1.2
-Release:	3%{?dist}
+Version:	3.1.3
+Release:	1%{?dist}
 Summary:	Bible study and research tool
 
 Group:		Applications/Text
 License:	GPLv2+
 URL:		http://xiphos.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/gnomesword/xiphos-%{version}.tar.gz
-Patch0:		xiphos-xul-1.9.2.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	sword-devel >= 1.5.11
@@ -34,7 +33,6 @@ Project and elsewhere.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %configure
@@ -45,11 +43,9 @@ rm -rf %buildroot
 make install DESTDIR=%buildroot
 
 desktop-file-install --delete-original \
-	--remove-category=X-Red-Hat-Extra \
 	--remove-category=Application	\
 	--add-category=X-Bible		\
 	--add-category=X-Religion	\
-	--remove-key=MultipleArgs	\
 	--dir=%buildroot%_datadir/applications \
 	--copy-name-to-generic-name \
 	%buildroot%_datadir/applications/xiphos.desktop
@@ -76,9 +72,8 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING COPYING-DOCS ChangeLog NEWS README RELEASE-NOTES TODO
+%doc AUTHORS COPYING ChangeLog NEWS README RELEASE-NOTES TODO Xiphos.ogg
 %_bindir/xiphos
-%_bindir/gnomesword2
 %_datadir/xiphos/
 %_datadir/pixmaps/xiphos
 %_datadir/icons/hicolor/scalable/apps/xiphos.svg
@@ -87,6 +82,12 @@ gtk-update-icon-cache %{_datadir}/icons/
 %_datadir/gnome/help/xiphos
 
 %changelog
+* Tue Mar 23 2010 Deji Akingunola <dakingun at gmail.com> - 3.1.3-1
+- New upstream version
+
+* Mon Mar 15 2010 Deji Akingunola <dakingun at gmail.com> - 3.1.2-4
+- Backport upstream patch to fix bugs detected by ABRT caused by empty settings.xml file.
+
 * Sat Mar 13 2010 Deji Akingunola <dakingun at gmail.com> - 3.1.2-3
 - Backport upstream patch to fix bug with xulrunner-1.9.2.
 


--- xiphos-xul-1.9.2.patch DELETED ---