[goldendict] Update to 1.5-RC1
Mosaab Alzoubi
moceap at fedoraproject.org
Wed Jan 15 09:33:43 UTC 2014
commit d6e36a48e0b1045238c12bb758492da3865354b7
Author: Mosaab Alzoubi <moceap at hotmail.com>
Date: Wed Jan 15 11:33:28 2014 +0200
Update to 1.5-RC1
.gitignore | 1 +
goldendict-1.0.1-gcc47.patch | 23 -----------------
goldendict.spec | 57 +++++++++++++++++-------------------------
sources | 2 +-
4 files changed, 25 insertions(+), 58 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d1e5c7e..ce04398 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ goldendict-4fa567e.tar.gz
goldendict-415f35e.tar.gz
/goldendict-ac4be0b.tar.gz
/goldendict-1.0.1-src.tar.bz2
+/goldendict-3bd078debb7ae506e91e5d47f88f34ab847167c3.tar.gz
diff --git a/goldendict.spec b/goldendict.spec
index 2a03b55..9a87b25 100644
--- a/goldendict.spec
+++ b/goldendict.spec
@@ -1,18 +1,14 @@
+%global owner goldendict
+%global commit 3bd078debb7ae506e91e5d47f88f34ab847167c3
+
Name: goldendict
-Version: 1.0.1
-Release: 9%{?dist}
+Version: 1.5
+Release: 0.1.RC1%{?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
-# The source is generated from the git snapshot using the following command
-# git clone git://gitorious.org/goldendict/goldendict.git
-# 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}-%{version}-src.tar.bz2
-Patch0: goldendict-1.0.1-gcc47.patch
-
-# Modify the Icon section in desktop file to comform package guideline.
+URL: http://goldendict.org
+Source0: https://github.com/%{owner}/%{name}/archive/%{commit}/%{name}-%{commit}.tar.gz
BuildRequires: qt-devel
BuildRequires: libXtst-devel
@@ -21,7 +17,7 @@ BuildRequires: libvorbis-devel
BuildRequires: desktop-file-utils
BuildRequires: phonon-devel
BuildRequires: qt-webkit-devel
-
+BuildRequires: desktop-file-utils
%description
Goldendict is a feature-rich dictionary lookup program.
@@ -32,33 +28,16 @@ Support MediaWiki-based sites to perform search;
Scan popup functionality.
%prep
-%setup -q -c -n goldendict-%{version}-src
-%patch0 -p1 -b .gcc47
-
+%setup -q -n %{name}-%{commit}
%build
-# Fix the directory in goldendict.pro by removing apps
-sed -i 's/share\/apps\/goldendict/share\/goldendict/g' goldendict.pro
-# Fix the hunspell directory
-sed -i 's|myspell/dicts|myspell|g' config.cc
-PREFIX=%{_prefix} qmake-qt4
+PREFIX=%{_prefix} qmake-qt4 "DISABLE_INTERNAL_PLAYER=1"
make %{?_smp_mflags}
-
%install
make install INSTALL_ROOT=%{buildroot} INSTALL="install -p"
rm -rf %{buildroot}/%{_datadir}/app-install
-
-# 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="Dictionary" \
---remove-category="Education" \
---remove-category="Applications" \
---delete-original \
---dir=%{buildroot}%{_datadir}/applications \
-%{buildroot}%{_datadir}/applications/goldendict.desktop
+desktop-file-install %{buildroot}%{_datadir}/applications/%{name}.desktop
install -d %{buildroot}/%{_datadir}/goldendict/locale
install -pm 644 locale/*.qm %{buildroot}/%{_datadir}/goldendict/locale
@@ -72,8 +51,17 @@ install -pm 644 locale/*.qm %{buildroot}/%{_datadir}/goldendict/locale
%{_datadir}/pixmaps/goldendict.png
%{_datadir}/goldendict/locale/*.qm
-
%changelog
+* Tue Jan 14 2014 Mosaab Alzoubi <moceap at hotmail.com> - 1.5-0.1.RC1
+- Update to 1.5RC.
+- General clean of spec.
+- Using source from GitHub.
+- New URL.
+- Remove 3 fixes and patches, fixed in upstream.
+- Fix a date in changelog.
+- Use new desktop-files Fedora method.
+- DISABLE_INTERNAL_PLAYER=1 because ffmpeg not found in Fedora repos.
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
@@ -131,9 +119,10 @@ install -pm 644 locale/*.qm %{buildroot}/%{_datadir}/goldendict/locale
* Wed Apr 14 2010 Howard Ning <mrlhwliberty at gmail.com> - 0.9.0-9
- Add kde-filesystem requirement.
-* Fri Apr 11 2010 Howard Ning <mrlhwliberty at gmail.com> - 0.9.0-8
+* Sun Apr 11 2010 Howard Ning <mrlhwliberty at gmail.com> - 0.9.0-8
- Patch the desktop file to conform the guideline.
- Clean up the spec file more.
+
* Fri Apr 09 2010 Howard Ning <mrlhwliberty at gmail.com> - 0.9.0-7
- Clean up the spec file.
- Add ownership of the missing directories.
diff --git a/sources b/sources
index c709e74..d26b439 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d56bb854936015104029d1f0b98b61bb goldendict-1.0.1-src.tar.bz2
+68dea65a98cca751d215e85dafa53006 goldendict-3bd078debb7ae506e91e5d47f88f34ab847167c3.tar.gz
More information about the scm-commits
mailing list