diff --git a/.cvsignore b/.cvsignore index cf20ff6..e8b10d6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -bibletime-1.6.2.tar.bz2 -bibletime-i18n-1.6.2.tar.bz2 +bibletime-1.6.3b.tar.bz2 +bibletime-i18n-1.6.3b.tar.bz2 diff --git a/bibletime.spec b/bibletime.spec index 5edfe9a..ecf91ae 100644 --- a/bibletime.spec +++ b/bibletime.spec @@ -1,13 +1,13 @@ Summary: BibleTime is an easy to use Bible study tool for KDE Name: bibletime -Version: 1.6.2 -Release: 4%{?dist} +Version: 1.6.3b +Release: 2%{?dist} License: GPL 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 -Patch0: bibletime-desktop.patch +Patch0: %{name}-desktop.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: sword-devel >= 1.5.9 clucene-core-devel >= 0.9.16a kdelibs-devel BuildRequires: desktop-file-utils gettext @@ -45,24 +45,25 @@ desktop-file-install --vendor="" \ --delete-original \ %{buildroot}%{_datadir}/applications/%{name}.desktop -chmod 0644 %{buildroot}%{_datadir}/apps/bibletime/bibletimeui.rc -chmod 0644 %{buildroot}%{_datadir}/apps/bibletime/tips +chmod 0644 %{buildroot}%{_datadir}/apps/%{name}/bibletimeui.rc +chmod 0644 %{buildroot}%{_datadir}/apps/%{name}/tips cd %{name}-i18n-%{version} make DESTDIR=%{buildroot} install # remove empty file -[[ -s %{buildroot}/usr/share/doc/HTML/cs/bibletime/howto/how2-importance.docbook ]] || rm -f %{buildroot}/usr/share/doc/HTML/cs/bibletime/howto/how2-importance.docbook +[[ -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}/usr/share/locale/pt_br %{buildroot}/usr/share/locale/pt_BR || : +mv %{buildroot}%{_datadir}/locale/pt_br %{buildroot}%{_datadir}/locale/pt_BR || : +mv %{buildroot}%{_datadir}/doc/HTML/pt_br %{buildroot}%{_datadir}/doc/HTML/pt_BR || : -%find_lang bibletime || touch bibletime.lang +%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 lang=$(basename $lang_dir) - echo "%lang($lang) %doc $HTML_DIR/$lang/*" >> bibletime.lang + echo "%lang($lang) %doc $HTML_DIR/$lang/*" >> %{name}.lang done fi @@ -77,7 +78,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}/bibletime.lang +%files -f %{name}-i18n-%{version}/%{name}.lang %defattr(-,root,root,-) %{_bindir}/* %{_datadir}/applications/*.desktop @@ -87,6 +88,12 @@ touch --no-create %{_datadir}/icons/hicolor || : %doc README LICENSE %changelog +* Mon Feb 05 2007 David Anderson 1.6.3b-2 +- 1.6.3b + +* Sat Jan 27 2007 David Anderson 1.6.2-5 +- Correct wrong location of pt_BR files + * Mon Jan 15 2007 David Anderson 1.6.2-4 - Added internationalisation diff --git a/sources b/sources index b5c559c..a9ead94 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -b2b8b624d21d397201aec742d43501e5 bibletime-1.6.2.tar.bz2 -a2d4dc8220253e39d8abf720c3ae8aff bibletime-i18n-1.6.2.tar.bz2 +50463409277994cf5da946cc12aefdd1 bibletime-1.6.3b.tar.bz2 +5ae7aeb18607971c80c68cf5a9c5ca4e bibletime-i18n-1.6.3b.tar.bz2