From 1de901ed8b0e0c89b9cd568c32389cbe949fc7cc4be2ebffe499fd7ff9bf6a4b Mon Sep 17 00:00:00 2001 From: Lars Vogdt Date: Sun, 13 Dec 2009 16:02:19 +0000 Subject: [PATCH] - update to 2.4: + many, many bugfixes + Improved search dialog + Added "get list of install sources from server" functionality + BibleTime can now open TEI modules + Added new feature called "Change location". It is a shortcut (Ctrl-L) that changes the focus to the toolbar field for the bible reference or book location. This is like the Ctrl-L feature of FireFox. + Add shortcut page to config settings dialog - fix build for fedora OBS-URL: https://build.opensuse.org/package/show/Education/bibletime?expand=0&rev=12 --- bibletime-2.0.1.tar.bz2 | 3 -- bibletime-2.4.tar.bz2 | 3 ++ bibletime-rpmlintrc | 3 ++ bibletime.changes | 15 +++++++++ bibletime.spec | 69 +++++++++++++++++++++++++++++------------ 5 files changed, 71 insertions(+), 22 deletions(-) delete mode 100644 bibletime-2.0.1.tar.bz2 create mode 100644 bibletime-2.4.tar.bz2 create mode 100644 bibletime-rpmlintrc diff --git a/bibletime-2.0.1.tar.bz2 b/bibletime-2.0.1.tar.bz2 deleted file mode 100644 index b09b225..0000000 --- a/bibletime-2.0.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0d5ddd7bb3a3203d2346a2024964529fc88b6d7204411e13afa7098b64870f65 -size 3029519 diff --git a/bibletime-2.4.tar.bz2 b/bibletime-2.4.tar.bz2 new file mode 100644 index 0000000..1abc0d8 --- /dev/null +++ b/bibletime-2.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b100ee63ae7828fe091bf398dfa13f7a20d90eb5b534ae507520a33fcd83b835 +size 3071527 diff --git a/bibletime-rpmlintrc b/bibletime-rpmlintrc new file mode 100644 index 0000000..2f39282 --- /dev/null +++ b/bibletime-rpmlintrc @@ -0,0 +1,3 @@ +# "Teaching" should become part of our official desktop Categories +# As it is listed on freedesktop.org +addFilter("invalid-desktopfile.*/usr/share/applications/bibletime.desktop") diff --git a/bibletime.changes b/bibletime.changes index 4ccb9b9..7941dd8 100644 --- a/bibletime.changes +++ b/bibletime.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Sun Dec 13 15:47:03 UTC 2009 - lars@linux-schulserver.de + +- update to 2.4: + + many, many bugfixes + + Improved search dialog + + Added "get list of install sources from server" functionality + + BibleTime can now open TEI modules + + Added new feature called "Change location". It is a shortcut + (Ctrl-L) that changes the focus to the toolbar field for the + bible reference or book location. + This is like the Ctrl-L feature of FireFox. + + Add shortcut page to config settings dialog +- fix build for fedora + ------------------------------------------------------------------- Thu Jul 23 15:01:08 CEST 2009 - lars@linux-schulserver.de diff --git a/bibletime.spec b/bibletime.spec index 1415ec9..f391c69 100644 --- a/bibletime.spec +++ b/bibletime.spec @@ -8,43 +8,61 @@ # norootforbuild Name: bibletime -Summary: BibleTime is an easy to use Bible study tool for KDE -Version: 2.0.1 -Release: 7 +Summary: An easy to use Bible study tool +Version: 2.4 +Release: 1 License: GNU General Public License version 2 (GPL v2) Url: http://www.bibletime.info/ Group: Productivity/Scientific/Other Vendor: openSUSE-Education Source0: %name-%version.tar.bz2 Source1: %{name}.xpm +Source2: bibletime-rpmlintrc Provides: %{name}-i18n = %version Obsoletes: %{name}-i18n < 1.7 Obsoletes: %{name}-devel < 1.7 Provides: %{name}-devel = %version Provides: sword-frontend +BuildRequires: boost-devel +BuildRequires: clucene-core-devel +BuildRequires: cmake +BuildRequires: curl-devel +BuildRequires: libqt4-devel +BuildRequires: sword-devel +# +# openSUSE +# +%if 0%{?suse_version} Recommends: sword-bible Recommends: sword-commentary -BuildRequires: sword-devel curl-devel clucene-core-devel libQtWebKit-devel -BuildRequires: libqt4-devel boost-devel cmake pkg-config +BuildRequires: pkg-config +BuildRequires: libQtWebKit-devel BuildRequires: update-desktop-files BuildRequires: fdupes +%endif +# +# Fedora +# +%if 0%{?fedora_version} +Release: 1%{?dist} +BuildRequires: pkgconfig +BuildRequires: desktop-file-utils +BuildRequires: webkitkde-devel +%endif + BuildRoot: %{_tmppath}/%{name}-%{version}-build %define kdeprefix %{_prefix} %description -BibleTime is a free and easy to use bible study tool for UNIX systems. +BibleTime is a completely free Bible study program. + +The software uses the SWORD programming library to work with over 200 free +Bible texts, commentaries, dictionaries and books provided by the Crosswire +Bible Society. BibleTime provides easy handling of digitalized texts (Bibles, commentaries and lexicons) and powerful features to work with these texts (search in texts, -write own notes, save, print etc.). BibleTime is a frontend for the SWORD -Bible Framework. - -The SWORD Project is an effort to create an ever expanding software package for -research and study of God and His Word. The SWORD Bible Framework allows easy -manipulation of Bible texts, commentaries, lexicons, dictionaries, etc. Many -frontends are build using this framework. An installed module set may be -shared between any frontend using the framework. - +write own notes, save, print etc.). %prep %setup -q @@ -60,18 +78,31 @@ popd pushd build %makeinstall popd -%fdupes -s %buildroot -sed -i "s|bibletime/handbook/index.html|bibletime/handbook/en/index.html|" %buildroot/%{_datadir}/applications/%{name}.desktop -install -Dm644 %{SOURCE1} %buildroot/%{_datadir}/pixmaps/%{name}.xpm -%suse_update_desktop_file -r bibletime Education Teaching test -d %buildroot/%kdeprefix/share/locale/pt_br && mv %buildroot/%kdeprefix/share/locale/pt_br %buildroot/%kdeprefix/share/locale/pt_BR test -d %buildroot/%kdeprefix/share/doc/HTML/pt-br && mv %buildroot/%kdeprefix/share/doc/HTML/pt-br %buildroot/%kdeprefix/share/doc/HTML/pt_BR +# install manpages +install -Dm644 docs/manpages/bibletime.1 %buildroot/%_mandir/man1/bibletime.1 +install -Dm644 docs/manpages/bibletime.de.1 %buildroot/%_mandir/de/man1/bibletime.1 +%if 0%{?suse_version} + %fdupes -s %buildroot + sed -i "s|bibletime/handbook/index.html|bibletime/handbook/en/index.html|" %buildroot/%{_datadir}/applications/%{name}.desktop + install -Dm644 %{SOURCE1} %buildroot/%{_datadir}/pixmaps/%{name}.xpm + %suse_update_desktop_file -r bibletime Education Teaching +%endif +# +%if 0%{?fedora_version} +desktop-file-install --vendor="%{vendor}" \ + --dir=%buildroot/%_datadir/applications \ + %name.desktop +%endif %clean rm -rf %buildroot %files %defattr(-,root,root) +%doc %{_mandir}/man1/bibletime.1* +%doc %{_mandir}/de/man1/bibletime.1* %dir %kdeprefix/share/bibletime %kdeprefix/bin/* %kdeprefix/share/icons/*