rpms/bibletime/F-9 bibletime-config.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 bibletime-desktop.patch, 1.1, 1.2 bibletime.spec, 1.9, 1.10 sources, 1.6, 1.7 bibletime-configure.patch, 1.1, NONE

Tue May 27 02:23:18 UTC 2008

Author: deji

Update of /cvs/pkgs/rpms/bibletime/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1724

Modified Files:
	.cvsignore bibletime-desktop.patch bibletime.spec sources 
Added Files:
	bibletime-config.patch 
Removed Files:
	bibletime-configure.patch 
Log Message:
* Mon May 26 2008 Deji Akingunola <dakingun at gmail.com> - 1.6.5.1-1
- Update to 1.6.5.1


bibletime-config.patch:

--- NEW FILE bibletime-config.patch ---
--- configure	2008-05-10 07:51:48.000000000 -0400
+++ configure.new	2008-05-26 21:21:29.000000000 -0400
@@ -32790,7 +32790,7 @@
 using namespace sword;
 #endif
 
-int main(int argc, char** argv) {
+int main(int argc, char* argv[]) {
 	std::cout << SWVersion::currentVersion << std::endl;
 	return 0;
 }


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bibletime/F-9/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	8 Nov 2007 00:21:36 -0000	1.6
+++ .cvsignore	27 May 2008 02:22:27 -0000	1.7
@@ -1,2 +1 @@
-bibletime-1.6.5.tar.bz2
-bibletime-i18n-1.6.5.tar.bz2
+bibletime-1.6.5.1.tar.bz2

bibletime-desktop.patch:

Index: bibletime-desktop.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bibletime/F-9/bibletime-desktop.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bibletime-desktop.patch	13 Jan 2007 17:32:23 -0000	1.1
+++ bibletime-desktop.patch	27 May 2008 02:22:27 -0000	1.2
@@ -1,12 +1,6 @@
---- bibletime.desktop.in	2006-12-13 10:05:28.000000000 -0500
-+++ bibletime.desktop.in.new	2006-12-13 10:00:18.000000000 -0500
-@@ -1,4 +1,5 @@
- [Desktop Entry]
-+Encoding=UTF-8
- Comment=An easy to use bible study tool
- Comment[C]=An easy to use bible study tool
- Comment[cs]=Snadno pouiteln nï¿½troj pro studium Bible
-@@ -18,9 +19,8 @@
+--- bibletime.desktop.in	2008-05-26 21:13:09.000000000 -0400
++++ bibletime.desktop.in.new	2008-05-26 21:16:53.000000000 -0400
+@@ -19,9 +19,8 @@
  SwallowExec=
  SwallowTitle=
  Terminal=false
@@ -14,7 +8,7 @@
  Type=Application
  X-KDE-SubstituteUID=false
  X-KDE-Username=
--Categories=Religion;Bible;Application;KDE;Utility;
+-Categories=X-Bible;X-Religion;Literature;Art;Education;Utility;KDE;QT
 -DocPath=bibletime/handbook/index.html
-+Categories=KDE;Utility;
++Categories=Utility;KDE;
 +X-KDE-DocPath=bibletime/handbook/index.html


Index: bibletime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bibletime/F-9/bibletime.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- bibletime.spec	18 Feb 2008 19:21:06 -0000	1.9
+++ bibletime.spec	27 May 2008 02:22:27 -0000	1.10
@@ -1,16 +1,16 @@
 Summary:	BibleTime is an easy to use Bible study tool for KDE
 Name:		bibletime
-Version:	1.6.5
-Release:	4%{?dist}
+Version:	1.6.5.1
+Release:	1%{?dist}
 License:	GPLv2
 Url:		http://www.bibletime.info/
 Group:		Applications/Productivity
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
-Source1:	http://downloads.sourceforge.net/%{name}/%{name}-i18n-%{version}.tar.bz2
+Source1:	http://downloads.sourceforge.net/%{name}/%{name}-i18n-1.6.5.tar.bz2
 Patch0:		%{name}-desktop.patch
-Patch1:		%{name}-configure.patch
+Patch1:		%{name}-config.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	sword-devel >= 1.5.9 clucene-core-devel >= 0.9.16a kdelibs3-devel
+BuildRequires:	sword-devel >= 1.5.10 clucene-core-devel >= 0.9.16a kdelibs3-devel
 BuildRequires:	desktop-file-utils gettext
 
 %description
@@ -35,7 +35,7 @@
 %configure --disable-rpath
 make %{?_smp_mflags}
 
-cd %{name}-i18n-%{version}
+cd %{name}-i18n-1.6.5
 %configure --disable-rpath
 make %{?_smp_mflags}
 
@@ -52,7 +52,7 @@
 chmod 0644 %{buildroot}%{_datadir}/apps/%{name}/bibletimeui.rc
 chmod 0644 %{buildroot}%{_datadir}/apps/%{name}/tips
 
-cd %{name}-i18n-%{version}
+cd %{name}-i18n-1.6.5
 make DESTDIR=%{buildroot} install
 
 # remove empty file
@@ -82,7 +82,7 @@
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
-%files -f %{name}-i18n-%{version}/%{name}.lang
+%files -f %{name}-i18n-1.6.5/%{name}.lang
 %defattr(-,root,root,-)
 %{_bindir}/*
 %{_datadir}/applications/*.desktop
@@ -92,6 +92,9 @@
 %doc README LICENSE
 
 %changelog
+* Mon May 26 2008 Deji Akingunola <dakingun at gmail.com> - 1.6.5.1-1
+- Update to 1.6.5.1
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.6.5-4
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bibletime/F-9/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	8 Nov 2007 00:21:36 -0000	1.6
+++ sources	27 May 2008 02:22:27 -0000	1.7
@@ -1,2 +1 @@
-c6815d2076e454150c3b9fb88c1dd1e8  bibletime-1.6.5.tar.bz2
-afe5c92f212951c3949ac010ae20ef7b  bibletime-i18n-1.6.5.tar.bz2
+c54f2d298d7568ca41b0815097abff37  bibletime-1.6.5.1.tar.bz2


--- bibletime-configure.patch DELETED ---


