- update to 1.7:

+ tons of bugfixes
  + Port to KDE4/QT4, reduced KDE dependency to a minimum
  + Command line options have changed (--help is out of date)
  + Configuration files have been moved to ~/.bibletime/
  + i18n of UI strings is now handled by QT
  + Massive code cleanups and internal refactoring
  + New bookshelf manager
  + New external communications interface DBUS (instead of DCOP)
  + many Bookshelf improvements
  + Corrections and enhancements to session management
  + Search dialog now has a history for the modules to search in

OBS-URL: https://build.opensuse.org/package/show/Education/bibletime?expand=0&rev=9
This commit is contained in:
Lars Vogdt 2009-07-23 10:18:53 +00:00 committed by Git OBS Bridge
parent 5709dea274
commit 1fe4ecd789
7 changed files with 45 additions and 85 deletions

2
.gitattributes vendored
View File

@ -21,3 +21,5 @@
*.xz filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text
*.zst filter=lfs diff=lfs merge=lfs -text
## Specific LFS patterns
bibletime.xpm filter=lfs diff=lfs merge=lfs -text

View File

@ -1,26 +0,0 @@
Index: bibletime/backend/cswordbackend.cpp
===================================================================
--- bibletime/backend/cswordbackend.cpp.orig
+++ bibletime/backend/cswordbackend.cpp
@@ -251,7 +251,7 @@ const bool CSwordBackend::shutdownModule
/** Returns true if the given option is enabled. */
const bool CSwordBackend::isOptionEnabled( const CSwordModuleInfo::FilterTypes type) {
- return (getGlobalOption( optionName(type).latin1() ) == "On");
+ return (strcmp(getGlobalOption( optionName(type).latin1() ),"On") == 0);
}
/** Sets the given options enabled or disabled depending on the second parameter. */
Index: bibletime/frontend/cdragdropmgr.cpp
===================================================================
--- bibletime/frontend/cdragdropmgr.cpp.orig
+++ bibletime/frontend/cdragdropmgr.cpp
@@ -36,7 +36,7 @@ bool CDragDropMgr::BTDrag::canDecode( co
};
bool CDragDropMgr::BTDrag::provides( const char* type ) const {
- return (type == "BibleTime/DND"); //return only true if the type is BibleTime/DND
+ return (strcmp(type,"BibleTime/DND") == 0); //return only true if the type is BibleTime/DND
};
const char* CDragDropMgr::BTDrag::format( int i ) const {

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:dd4af417534d306245e73b5c9fadb2186038a5407cdf1a83434d7f082fb5faa9
size 1231060

3
bibletime-1.7.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:babc32c67c5f7cc72d7f7d54ea27fd2681fd65450d5249264789e12140ff9234
size 2895927

View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Thu Jul 23 12:13:43 CEST 2009 - lars@linux-schulserver.de
- update to 1.7:
+ tons of bugfixes
+ Port to KDE4/QT4, reduced KDE dependency to a minimum
+ Command line options have changed (--help is out of date)
+ Configuration files have been moved to ~/.bibletime/
+ i18n of UI strings is now handled by QT
+ Massive code cleanups and internal refactoring
+ New bookshelf manager
+ New external communications interface DBUS (instead of DCOP)
+ many Bookshelf improvements
+ Corrections and enhancements to session management
+ Search dialog now has a history for the modules to search in
-------------------------------------------------------------------
Thu Jul 23 10:36:01 CEST 2009 - lars@linux-schulserver.de

View File

@ -7,29 +7,26 @@
# norootforbuild
%define i18nversion 1.6.5
%define kdeprefix /opt/kde3
Name: bibletime
Summary: BibleTime is an easy to use Bible study tool for KDE
Version: 1.6.5.1
Version: 1.7
Release: 7
License: GPL
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-i18n-%i18nversion.tar.bz2
Patch1: bibletime-1.6.5.1-stringcompare.patch
Requires: %name-i18n = %version
Source1: %{name}.xpm
Provides: %{name}-i18n = %version
Obsoletes: %{name}-i18n < 1.7
Provides: sword-frontend
Recommends: sword-bible
Recommends: sword-commentary
BuildRequires: sword-devel kdelibs3-devel gcc-c++ curl-devel libjpeg-devel clucene-core-devel update-desktop-files
%if 0%{?suse_version} > 1020
BuildRequires: sword-devel gcc-c++ curl-devel libjpeg-devel clucene-core-devel update-desktop-files
BuildRequires: libkde4-devel libQtWebKit-devel boost-devel cmake
BuildRequires: fdupes
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define kdeprefix %{_prefix}
%description
BibleTime is a free and easy to use bible study tool for UNIX systems.
@ -50,80 +47,48 @@ shared between any frontend using the framework.
%package devel
Summary: Development files for %name
Group: Development/Libraries/C and C++
Requires: %name = %version
%description devel
Development files for %name useful if you want to develop applications
based on %name.
%package i18n
Summary: Translations for bibletime
Group: Productivity/Scientific/Other
Requires: %name = %version
%description i18n
Translations for bibletime, the free and easy to use bible study
tool for UNIX systems.
%prep
%setup -q -a1
%patch1 -p0
%setup -q
%build
. /etc/opt/kde3/common_options
./configure $configkde --disable-final \
--enable-shared=yes \
%ifarch x86_64 amd64 ia32e
--enable-libsuffix=64 \
%endif
--enable-static=no
make %{?jobs:-j%jobs}
pushd %name-i18n-%i18nversion
./configure $configkde
mkdir build
pushd build
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="%{_prefix}" ../
%__make %{?jobs:-j %jobs}
popd
%install
. /etc/opt/kde3/common_options
%makeinstall
pushd %name-i18n-%i18nversion
pushd build
%makeinstall
popd
%if 0%{?suse_version} > 1020
%fdupes -s %buildroot
%endif
test -f %buildroot/%kdeprefix/share/applications/bibletime.desktop && rm %buildroot/%kdeprefix/share/applications/bibletime.desktop
%suse_update_desktop_file -n bibletime Education Teaching
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
%find_lang %name
%clean
rm -rf %buildroot
%files i18n -f %name.lang
%defattr(-,root,root)
%dir %kdeprefix/share/locale/ua
%dir %kdeprefix/share/locale/ua/LC_MESSAGES
%files
%defattr(-,root,root)
%dir %kdeprefix/share/bibletime
%kdeprefix/bin/*
#%kdeprefix/share/applications/bibletime.desktop
%kdeprefix/share/apps/bibletime/
%kdeprefix/share/icons/*
%kdeprefix/share/bibletime/*
%kdeprefix/share/pixmaps/%{name}.xpm
%files devel
%defattr(-,root,root)
%kdeprefix/include/bibletimeinterface.h
%changelog

3
bibletime.xpm Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5f7ca03313511381472c4e3857a76e7c66e893e32efb0897d20c61df1b119990
size 11522