From 0e850b40a15624f5116d7716fb0df3c72653bdc0 Mon Sep 17 00:00:00 2001 From: helloworld1 Date: May 11 2010 18:48:44 +0000 Subject: new upstream --- diff --git a/.cvsignore b/.cvsignore index 6dfc2a5..492e91c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -goldendict-83115ad.tar.gz +goldendict-ceab951.tar.gz diff --git a/goldendict-desktopicon.patch b/goldendict-desktopicon.patch deleted file mode 100644 index 3d3571d..0000000 --- a/goldendict-desktopicon.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- src/redist/goldendict.desktop.orig 2010-04-11 12:57:05.081844813 -0400 -+++ src/redist/goldendict.desktop 2010-04-11 12:58:03.998845830 -0400 -@@ -6,5 +6,5 @@ - GenericName=Multiformat Dictionary - Comment=GoldenDict - Encoding=UTF-8 --Icon=/usr/share/pixmaps/goldendict.png -+Icon=goldendict - Exec=goldendict diff --git a/goldendict.spec b/goldendict.spec index 0fae79a..004be09 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -1,35 +1,31 @@ -%define githash 83115ad -%define gitdate 20100307 +%define githash ceab951 +%define gitdate 20100510 Name: goldendict Version: 0.9.0 -Release: 9.%{gitdate}git%{githash}%{?dist} +Release: 11.%{gitdate}git%{githash}%{?dist} Summary: A feature-rich dictionary lookup program Group: Applications/System License: GPLv3+ -URL: http://goldendict.berlios.de/ -#Source0: http://prdownload.berlios.de/goldendict/goldendict-0.9.0-src-x11.tar.bz2 +URL: http://goldendict.berlios.de/ +#Source0: http://prdownload.berlios.de/goldendict/goldendict-0.9.0-src-x11.tar.bz2 # The source is generated from the git snapshot using the following command # git clone git://git.berlios.de/goldendict # git archive master --prefix=goldendict-`git log --pretty=format:"%h"| head -n1`/ |gzip > goldendict-`git log --pretty=format:"%h"|head -n1`.tar.gz Source0: %{name}-%{githash}.tar.gz # Modify the Icon section in desktop file to comform package guideline. -Patch0: goldendict-desktopicon.patch BuildRequires: qt-devel BuildRequires: libXtst-devel -BuildRequires: libzip-devel BuildRequires: hunspell-devel BuildRequires: libvorbis-devel BuildRequires: desktop-file-utils BuildRequires: phonon-devel -Requires: kde-filesystem - %description -Goldendict is a feature-rich dictionary lookup program. +Goldendict is a feature-rich dictionary lookup program. The latest release has the following features: Use of WebKit for an accurate articles' representation; Support of multiple dictionary file formats; @@ -38,11 +34,13 @@ Scan popup functionality. %prep %setup -q -n goldendict-%{githash} -%patch0 -p0 +#%patch0 -p1 %build cd src +# Fix the directory in goldendict.pro by removing apps +sed -i 's/share\/apps\/goldendict/share\/goldendict/g' goldendict.pro PREFIX=%{_prefix} qmake-qt4 make %{?_smp_mflags} @@ -50,20 +48,22 @@ make %{?_smp_mflags} %install rm -rf %{buildroot} cd src -make install INSTALL_ROOT=%{buildroot} +make install INSTALL_ROOT=%{buildroot} INSTALL="install -p" rm -rf %{buildroot}/%{_datadir}/app-install -desktop-file-install \ - --add-category="Utility" \ - --remove-category="Office" \ - --remove-category="Dictionary" \ - --remove-category="Education" \ - --remove-category="Qt" \ - --remove-category="Applications" \ - --delete-original \ - --dir=%{buildroot}/%{_datadir}/applications \ -%{buildroot}/%{_datadir}/applications/goldendict.desktop -install -d %{buildroot}/%{_datadir}/apps/goldendict/locale -install -m 644 locale/*.qm %{buildroot}/%{_datadir}/apps/goldendict/locale + +# Fix the icon name in desktop file +sed -i 's/\/usr\/share\/pixmaps\/goldendict\.png/goldendict/g' %{buildroot}/%{_datadir}/applications/goldendict.desktop +# Fix the categories in desktop file +desktop-file-install \ +--add-category="Utility" \ +--remove-category="Office" \ +--remove-category="Education" \ +--remove-category="Applications" \ +--delete-original \ +--dir=%{buildroot}%{_datadir}/applications \ +%{buildroot}%{_datadir}/applications/goldendict.desktop +install -d %{buildroot}/%{_datadir}/goldendict/locale +install -pm 644 locale/*.qm %{buildroot}/%{_datadir}/goldendict/locale %clean @@ -73,23 +73,34 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc src/LICENSE.txt -%dir %{_datadir}/apps/goldendict/ -%dir %{_datadir}/apps/goldendict/locale/ +%dir %{_datadir}/goldendict/ +%dir %{_datadir}/goldendict/locale/ %{_bindir}/goldendict %{_datadir}/applications/goldendict.desktop %{_datadir}/pixmaps/goldendict.png -%{_datadir}/apps/goldendict/locale/*.qm +%{_datadir}/goldendict/locale/*.qm %changelog +* Tue May 11 2010 Howard Ning - 0.9.0-11 +- Drop the patch files in favor of sed. +- Change to a more standard directory by removing app directory. +- Remove libzip-devel and kde-filesystem requirement. + +* Tue May 11 2010 Howard Ning - 0.9.0-10 +- Clean up the spec file. +- Update to the latest upstream. +- Enhance dictiionary groups editing. +- Fix the scan popup issues more. +- Update the Chinese translation. + * Wed Apr 14 2010 Howard Ning - 0.9.0-9 - Add kde-filesystem requirement. * Fri Apr 11 2010 Howard Ning - 0.9.0-8 - Patch the desktop file to conform the guideline. - Clean up the spec file more. - * Fri Apr 09 2010 Howard Ning - 0.9.0-7 - Clean up the spec file. - Add ownership of the missing directories. @@ -113,4 +124,3 @@ rm -rf %{buildroot} * Wed Dec 9 2009 Howard Ning - 0.9.0-1 - Initial Release - diff --git a/sources b/sources index 44b172b..ff1783a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -737016234a98c9c45911329cf258cda5 goldendict-83115ad.tar.gz +f1285668ec58c3fe36eefc1d62f0123c goldendict-ceab951.tar.gz