diff --git a/.cvsignore b/.cvsignore index 8f190c0..07634d2 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -bibletime-1.6.5.tar.bz2 -bibletime-i18n-1.6.5.tar.bz2 +bibletime-1.6.5.1.tar.bz2 diff --git a/bibletime-config.patch b/bibletime-config.patch new file mode 100644 index 0000000..e38db43 --- /dev/null +++ b/bibletime-config.patch @@ -0,0 +1,11 @@ +--- 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; + } diff --git a/bibletime-configure.patch b/bibletime-configure.patch deleted file mode 100644 index 9df20b3..0000000 --- a/bibletime-configure.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- configure 2007-11-01 06:59:47.000000000 -0400 -+++ configure.new 2008-02-13 17:46:34.000000000 -0500 -@@ -32782,7 +32782,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; - } diff --git a/bibletime-desktop.patch b/bibletime-desktop.patch index a07f16b..b18b275 100644 --- a/bibletime-desktop.patch +++ b/bibletime-desktop.patch @@ -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 diff --git a/bibletime.spec b/bibletime.spec index bf2648a..de4a549 100644 --- a/bibletime.spec +++ b/bibletime.spec @@ -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 @@ export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include %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 @@ desktop-file-install --vendor="" \ 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 || : 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 @@ touch --no-create %{_datadir}/icons/hicolor || : %doc README LICENSE %changelog +* Mon May 26 2008 Deji Akingunola - 1.6.5.1-1 +- Update to 1.6.5.1 + * Mon Feb 18 2008 Fedora Release Engineering - 1.6.5-4 - Autorebuild for GCC 4.3 diff --git a/sources b/sources index 9be3fa9..50eb68b 100644 --- a/sources +++ b/sources @@ -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