From e80caa2eacdee60ffaeffb53b07442020fa29941 Mon Sep 17 00:00:00 2001 From: Deji Akingunola Date: Mar 17 2009 17:12:09 +0000 Subject: - Update to 1.7 --- diff --git a/.cvsignore b/.cvsignore index 115182b..bfd61eb 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -bibletime-1.6.5.1.tar.bz2 -bibletime-i18n-1.6.5.tar.bz2 +bibletime-1.7.tar.gz diff --git a/bibletime-config.patch b/bibletime-config.patch deleted file mode 100644 index e38db43..0000000 --- a/bibletime-config.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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-desktop.patch b/bibletime-desktop.patch deleted file mode 100644 index b18b275..0000000 --- a/bibletime-desktop.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- 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 --TerminalOptions= - Type=Application - X-KDE-SubstituteUID=false - X-KDE-Username= --Categories=X-Bible;X-Religion;Literature;Art;Education;Utility;KDE;QT --DocPath=bibletime/handbook/index.html -+Categories=Utility;KDE; -+X-KDE-DocPath=bibletime/handbook/index.html diff --git a/bibletime.spec b/bibletime.spec index b0b036b..b1f6e1d 100644 --- a/bibletime.spec +++ b/bibletime.spec @@ -1,16 +1,14 @@ Summary: BibleTime is an easy to use Bible study tool for KDE Name: bibletime -Version: 1.6.5.1 -Release: 2%{?dist} +Version: 1.7 +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-1.6.5.tar.bz2 -Patch0: %{name}-desktop.patch -Patch1: %{name}-config.patch +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: sword-devel >= 1.5.10 clucene-core-devel >= 0.9.16a kdelibs3-devel +BuildRequires: sword-devel >= 1.5.10 clucene-core-devel >= 0.9.16a +BuildRequires: kdelibs-devel boost-devel pcre-devel BuildRequires: desktop-file-utils gettext %description @@ -24,76 +22,67 @@ BibleTime is a frontend for the SWORD Bible Framework. %prep %setup -q -%patch0 -p0 -b .desk -%patch1 -p0 -b .conf -%setup -q -D -T -a 1 %build - -unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh -export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include -%configure --disable-rpath -make -#make %{?_smp_mflags} :Causing spuring build errors - -cd %{name}-i18n-1.6.5 -%configure --disable-rpath -make -#make %{?_smp_mflags} :Causing spuring build errors +mkdir fedora +cd fedora +export CFLAGS="%{optflags}" +export CXXFLAGS="%{optflags}" +export FFLAGS="%{optflags}" +%ifarch x86_64 ppc64 +%define lib_suffix 64 +%else +%define lib_suffix %{nil} +%endif +cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%{_prefix} \ + -DCMAKE_SKIP_RPATH:BOOL=ON -DLIB_SUFFIX=%{lib_suffix} .. +make VERBOSE=1 %{?_smp_mflags} %install %{__rm} -rf %{buildroot} - +cd fedora make DESTDIR=%{buildroot} install -desktop-file-install --vendor="" \ - --dir=%{buildroot}%{_datadir}/applications \ - --delete-original \ +desktop-file-install \ + --dir=%{buildroot}%{_datadir}/applications \ + --remove-category=QT \ + --delete-original \ %{buildroot}%{_datadir}/applications/%{name}.desktop -chmod 0644 %{buildroot}%{_datadir}/apps/%{name}/bibletimeui.rc -chmod 0644 %{buildroot}%{_datadir}/apps/%{name}/tips - -cd %{name}-i18n-1.6.5 -make DESTDIR=%{buildroot} install - -# remove empty file -[[ -s %{buildroot}%{_datadir}/doc/HTML/cs/%{name}/howto/how2-importance.docbook ]] || rm -f %{buildroot}%{_datadir}/doc/HTML/cs/%{name}/howto/how2-importance.docbook - # rename wrongly-named locale -mv %{buildroot}%{_datadir}/locale/pt_br %{buildroot}%{_datadir}/locale/pt_BR || : -mv %{buildroot}%{_datadir}/doc/HTML/pt_br %{buildroot}%{_datadir}/doc/HTML/pt_BR || : +mv %{buildroot}%{_datadir}/%{name}/locale/bibletime_ui_pt_{br,BR}.qm || : +mv %{buildroot}%{_datadir}/%{name}/docs/howto/pt-{br,BR} || : +# locale's %find_lang %{name} || touch %{name}.lang -HTML_DIR=$(kde-config --expandvars --install html) -if [ -d %{buildroot}$HTML_DIR ]; then - for lang_dir in %{buildroot}$HTML_DIR/* ; do +BT_DOC_DIR=%{_datadir}/%{name}/docs +for doctype in handbook howto ; do + for lang_dir in %{buildroot}/$BT_DOC_DIR/$doctype/* ; do lang=$(basename $lang_dir) - echo "%lang($lang) %doc $HTML_DIR/$lang/*" >> %{name}.lang + echo "%lang($lang) $BT_DOC_DIR/$doctype/$lang/*" >> %{name}.lang done -fi +done %clean %{__rm} -rf %{buildroot} -%post -touch --no-create %{_datadir}/icons/hicolor || : -%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : - -%postun -touch --no-create %{_datadir}/icons/hicolor || : -%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : - -%files -f %{name}-i18n-1.6.5/%{name}.lang +%files -f fedora/%{name}.lang %defattr(-,root,root,-) -%{_bindir}/* +%{_bindir}/bibletime %{_datadir}/applications/*.desktop -%{_datadir}/apps/%{name}/ -%{_datadir}/icons/hicolor/*/* -%{_includedir}/bibletimeinterface.h -%doc README LICENSE +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/display-templates/ +%{_datadir}/%{name}/javascript/ +%{_datadir}/%{name}/icons +%{_datadir}/%{name}/locale +%{_datadir}/%{name}/pics +%{_datadir}/icons/bibletime.svg +%doc ChangeLog README LICENSE %changelog +* Tue Mar 17 2009 Deji Akingunola - 1.7-1 +- Update to 1.7 + * Mon Feb 23 2009 Fedora Release Engineering - 1.6.5.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild @@ -131,4 +120,3 @@ touch --no-create %{_datadir}/icons/hicolor || : - First attempt for Fedora Extras - (Credits to Joachim Ansorg and Brook Humphrey for previous - version from bibletime tarball) - diff --git a/sources b/sources index 255e89e..9915012 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -c54f2d298d7568ca41b0815097abff37 bibletime-1.6.5.1.tar.bz2 -afe5c92f212951c3949ac010ae20ef7b bibletime-i18n-1.6.5.tar.bz2 +39b8de15c6e90a9fdf5bb5730933f658 bibletime-1.7.tar.gz