From 2c552ee036028e16357883c5101f34f5b3c7023b Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 21 Apr 2010 04:14:04 +0000 Subject: [PATCH 01/94] Setup of module goldendict --- .cvsignore | 0 Makefile | 21 +++++++++++++++++++++ sources | 0 3 files changed, 21 insertions(+) create mode 100644 .cvsignore create mode 100644 Makefile create mode 100644 sources diff --git a/.cvsignore b/.cvsignore new file mode 100644 index 0000000..e69de29 diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..6070cc7 --- /dev/null +++ b/Makefile @@ -0,0 +1,21 @@ +# Makefile for source rpm: goldendict +# $Id$ +NAME := goldendict +SPECFILE = $(firstword $(wildcard *.spec)) + +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attept a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) diff --git a/sources b/sources new file mode 100644 index 0000000..e69de29 From 1c5f858df855b6274366f5705d33e4bd37d2e28f Mon Sep 17 00:00:00 2001 From: helloworld1 Date: Wed, 21 Apr 2010 11:57:32 +0000 Subject: [PATCH 02/94] initial commit Modified Files: devel/.cvsignore devel/sources Added Files: devel/goldendict-desktopicon.patch devel/goldendict.spec devel/import.log --- .cvsignore | 1 + goldendict-desktopicon.patch | 9 +++ goldendict.spec | 116 +++++++++++++++++++++++++++++++++++ import.log | 1 + sources | 1 + 5 files changed, 128 insertions(+) create mode 100644 goldendict-desktopicon.patch create mode 100644 goldendict.spec create mode 100644 import.log diff --git a/.cvsignore b/.cvsignore index e69de29..6dfc2a5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +goldendict-83115ad.tar.gz diff --git a/goldendict-desktopicon.patch b/goldendict-desktopicon.patch new file mode 100644 index 0000000..3d3571d --- /dev/null +++ b/goldendict-desktopicon.patch @@ -0,0 +1,9 @@ +--- 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 new file mode 100644 index 0000000..0fae79a --- /dev/null +++ b/goldendict.spec @@ -0,0 +1,116 @@ +%define githash 83115ad +%define gitdate 20100307 + +Name: goldendict +Version: 0.9.0 +Release: 9.%{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 +# 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. +The latest release has the following features: +Use of WebKit for an accurate articles' representation; +Support of multiple dictionary file formats; +Support MediaWiki-based sites to perform search; +Scan popup functionality. + +%prep +%setup -q -n goldendict-%{githash} +%patch0 -p0 + + +%build +cd src +PREFIX=%{_prefix} qmake-qt4 +make %{?_smp_mflags} + + +%install +rm -rf %{buildroot} +cd src +make install INSTALL_ROOT=%{buildroot} +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 + + +%clean +rm -rf %{buildroot} + + +%files +%defattr(-,root,root,-) +%doc src/LICENSE.txt +%dir %{_datadir}/apps/goldendict/ +%dir %{_datadir}/apps/goldendict/locale/ +%{_bindir}/goldendict +%{_datadir}/applications/goldendict.desktop +%{_datadir}/pixmaps/goldendict.png +%{_datadir}/apps/goldendict/locale/*.qm + + + +%changelog +* 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. + +* Mon Mar 15 2010 Howard Ning - 0.9.0-6 +- Add missing translations. + +* Sun Mar 07 2010 Howard Ning - 0.9.0-5 +- New upstream git. +- Add phonon-devel as build requirement. + +* Sat Feb 06 2010 Howard Ning - 0.9.0-4 +- New upstream git. Fix some sound problem and scan popup problem. + +* Sat Dec 26 2009 Howard Ning - 0.9.0-3 +- New upstream git. Fix punctuation indexing problem and audio problems. + +* Thu Dec 10 2009 Howard Ning - 0.9.0-2 +- Add LICENSE.txt +- Change the group to Applications/System + +* Wed Dec 9 2009 Howard Ning - 0.9.0-1 +- Initial Release + diff --git a/import.log b/import.log new file mode 100644 index 0000000..b93d1c6 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +goldendict-0_9_0-9_20100307git83115ad_fc13:HEAD:goldendict-0.9.0-9.20100307git83115ad.fc13.src.rpm:1271850946 diff --git a/sources b/sources index e69de29..44b172b 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +737016234a98c9c45911329cf258cda5 goldendict-83115ad.tar.gz From bf9a6912d8864a51c131395282beb341df9ae2b9 Mon Sep 17 00:00:00 2001 From: helloworld1 Date: Tue, 11 May 2010 12:05:56 +0000 Subject: [PATCH 03/94] *** empty log message *** --- .cvsignore | 2 +- goldendict-desktopicon.patch | 12 ++++++++--- goldendict.spec | 40 ++++++++++++++++-------------------- sources | 2 +- 4 files changed, 29 insertions(+), 27 deletions(-) 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 index 3d3571d..ca14d00 100644 --- a/goldendict-desktopicon.patch +++ b/goldendict-desktopicon.patch @@ -1,6 +1,12 @@ ---- 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 @@ +--- goldendict-ceab951/src/redist/goldendict.desktop.orig 2010-05-10 23:12:52.684289402 -0400 ++++ goldendict-ceab951/src/redist/goldendict.desktop 2010-05-10 23:14:00.876259920 -0400 +@@ -1,10 +1,10 @@ + [Desktop Entry] + Type=Application + Terminal=false +-Categories=Office;Dictionary;Education;Qt;Applications ++Categories=Utility + Name=GoldenDict GenericName=Multiformat Dictionary Comment=GoldenDict Encoding=UTF-8 diff --git a/goldendict.spec b/goldendict.spec index 0fae79a..b9d8f9b 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -1,14 +1,14 @@ -%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: 10.%{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 @@ -25,11 +25,11 @@ BuildRequires: libvorbis-devel BuildRequires: desktop-file-utils BuildRequires: phonon-devel -Requires: kde-filesystem +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,7 +38,7 @@ Scan popup functionality. %prep %setup -q -n goldendict-%{githash} -%patch0 -p0 +%patch0 -p1 %build @@ -50,20 +50,14 @@ 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 +desktop-file-install \ + --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 +install -pm 644 locale/*.qm %{buildroot}/%{_datadir}/apps/goldendict/locale %clean @@ -83,13 +77,16 @@ rm -rf %{buildroot} %changelog +* Wed May 15 2010 Howard Ning - 0.9.0-10 +- Update to latest upstream. +- Clean up the spec file more. + * 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 +110,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 From 29fef255acf652d614962785514f731aa4ef1a0f Mon Sep 17 00:00:00 2001 From: helloworld1 Date: Tue, 11 May 2010 13:22:10 +0000 Subject: [PATCH 04/94] Add build require qt4-webkit-devel for rawhide --- goldendict.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/goldendict.spec b/goldendict.spec index b9d8f9b..bc1d0a9 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -24,6 +24,7 @@ BuildRequires: hunspell-devel BuildRequires: libvorbis-devel BuildRequires: desktop-file-utils BuildRequires: phonon-devel +BuildRequires: qt-webkit-devel Requires: kde-filesystem From abd8b7f7601e63fda2e57646e3f9f911330254e2 Mon Sep 17 00:00:00 2001 From: helloworld1 Date: Tue, 11 May 2010 13:38:19 +0000 Subject: [PATCH 05/94] Fix up the spec with changelog --- goldendict.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/goldendict.spec b/goldendict.spec index bc1d0a9..852a169 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -78,9 +78,12 @@ rm -rf %{buildroot} %changelog -* Wed May 15 2010 Howard Ning - 0.9.0-10 -- Update to latest upstream. -- Clean up the spec file more. +* Wed Tue 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. From b91e7a96f691c92164448df55c45fa891e506ac0 Mon Sep 17 00:00:00 2001 From: helloworld1 Date: Tue, 11 May 2010 13:39:05 +0000 Subject: [PATCH 06/94] date fixed --- goldendict.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/goldendict.spec b/goldendict.spec index 852a169..872f5c7 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -78,7 +78,7 @@ rm -rf %{buildroot} %changelog -* Wed Tue 11 2010 Howard Ning - 0.9.0-10 +* Wed May 11 2010 Howard Ning - 0.9.0-10 - Clean up the spec file. - Update to the latest upstream. - Enhance dictiionary groups editing. From 886422f1bec3600c582a4529be0b43e270a33012 Mon Sep 17 00:00:00 2001 From: helloworld1 Date: Tue, 11 May 2010 15:56:26 +0000 Subject: [PATCH 07/94] *** empty log message *** --- goldendict.spec | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/goldendict.spec b/goldendict.spec index 872f5c7..c1e3d6c 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -15,18 +15,14 @@ URL: http://goldendict.berlios.de/ 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 -BuildRequires: qt-webkit-devel - -Requires: kde-filesystem +BuildRequires: qt-webkit-devel %description @@ -39,11 +35,13 @@ Scan popup functionality. %prep %setup -q -n goldendict-%{githash} -%patch0 -p1 +#%patch0 -p1 %build cd src +# Fix the directory in goldendict.pro +sed -i 's/share\/apps\/goldendict/share\/goldendict/g' goldendict.pro PREFIX=%{_prefix} qmake-qt4 make %{?_smp_mflags} @@ -53,12 +51,20 @@ rm -rf %{buildroot} cd src 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="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}/apps/goldendict/locale -install -pm 644 locale/*.qm %{buildroot}/%{_datadir}/apps/goldendict/locale +install -d %{buildroot}/%{_datadir}/goldendict/locale +install -pm 644 locale/*.qm %{buildroot}/%{_datadir}/goldendict/locale %clean @@ -68,12 +74,12 @@ 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 From c6ebdc9df16b740c7353a9c854d643f650a6107f Mon Sep 17 00:00:00 2001 From: helloworld1 Date: Tue, 11 May 2010 16:10:26 +0000 Subject: [PATCH 08/94] remove desktopicon patch --- goldendict-desktopicon.patch | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 goldendict-desktopicon.patch diff --git a/goldendict-desktopicon.patch b/goldendict-desktopicon.patch deleted file mode 100644 index ca14d00..0000000 --- a/goldendict-desktopicon.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- goldendict-ceab951/src/redist/goldendict.desktop.orig 2010-05-10 23:12:52.684289402 -0400 -+++ goldendict-ceab951/src/redist/goldendict.desktop 2010-05-10 23:14:00.876259920 -0400 -@@ -1,10 +1,10 @@ - [Desktop Entry] - Type=Application - Terminal=false --Categories=Office;Dictionary;Education;Qt;Applications -+Categories=Utility - Name=GoldenDict - GenericName=Multiformat Dictionary - Comment=GoldenDict - Encoding=UTF-8 --Icon=/usr/share/pixmaps/goldendict.png -+Icon=goldendict - Exec=goldendict From 5b8e06722da3537ecde3badfc8e89f0439d356df Mon Sep 17 00:00:00 2001 From: helloworld1 Date: Tue, 11 May 2010 16:21:55 +0000 Subject: [PATCH 09/94] bump release to 11 --- goldendict.spec | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/goldendict.spec b/goldendict.spec index c1e3d6c..8865960 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -3,7 +3,7 @@ Name: goldendict Version: 0.9.0 -Release: 10.%{gitdate}git%{githash}%{?dist} +Release: 11.%{gitdate}git%{githash}%{?dist} Summary: A feature-rich dictionary lookup program Group: Applications/System License: GPLv3+ @@ -40,7 +40,7 @@ Scan popup functionality. %build cd src -# Fix the directory in goldendict.pro +# 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} @@ -59,7 +59,7 @@ desktop-file-install \ --add-category="Utility" \ --remove-category="Office" \ --remove-category="Education" \ - --remove-category="Applications" \ + --remove-category="Applications" \ --delete-original \ --dir=%{buildroot}/%{_datadir}/applications \ %{buildroot}/%{_datadir}/applications/goldendict.desktop @@ -84,7 +84,12 @@ rm -rf %{buildroot} %changelog -* Wed May 11 2010 Howard Ning - 0.9.0-10 +* 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. From 4644b995842c61d5299962a7649b87b14477fefe Mon Sep 17 00:00:00 2001 From: helloworld1 Date: Tue, 11 May 2010 17:08:58 +0000 Subject: [PATCH 10/94] fix desktop install problem --- goldendict.spec | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/goldendict.spec b/goldendict.spec index 8865960..ce6a591 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -55,14 +55,7 @@ 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="Utility" \ - --remove-category="Office" \ - --remove-category="Education" \ - --remove-category="Applications" \ - --delete-original \ - --dir=%{buildroot}/%{_datadir}/applications \ - %{buildroot}/%{_datadir}/applications/goldendict.desktop +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 From 22842bc1ddb23a36e36542621355e49d88bf3f93 Mon Sep 17 00:00:00 2001 From: helloworld1 Date: Tue, 11 May 2010 18:10:19 +0000 Subject: [PATCH 11/94] fixed? --- goldendict.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/goldendict.spec b/goldendict.spec index ce6a591..603126f 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -55,7 +55,14 @@ 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="Utility" --remove-category="Office" --remove-category="Education" --remove-category="Applications" --delete-original --dir=%{buildroot}/%{_datadir}/applications %{buildroot}/%{_datadir}/applications/goldendict.desktop +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 From d7146a649d342d67836cfb1dfe2c21caba4ddacf Mon Sep 17 00:00:00 2001 From: helloworld1 Date: Mon, 14 Jun 2010 13:06:59 +0000 Subject: [PATCH 12/94] new upstream --- .cvsignore | 2 +- goldendict.spec | 18 +++++++++++------- sources | 2 +- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.cvsignore b/.cvsignore index 492e91c..276ffa3 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -goldendict-ceab951.tar.gz +goldendict-c33fa2c.tar.gz diff --git a/goldendict.spec b/goldendict.spec index 603126f..cd7921d 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -1,9 +1,9 @@ -%define githash ceab951 -%define gitdate 20100510 +%define githash c33fa2c +%define gitdate 20100610 Name: goldendict Version: 0.9.0 -Release: 11.%{gitdate}git%{githash}%{?dist} +Release: 12.%{gitdate}git%{githash}%{?dist} Summary: A feature-rich dictionary lookup program Group: Applications/System License: GPLv3+ @@ -22,7 +22,7 @@ BuildRequires: hunspell-devel BuildRequires: libvorbis-devel BuildRequires: desktop-file-utils BuildRequires: phonon-devel -BuildRequires: qt-webkit-devel +BuildRequires: qt-webkit-devel %description @@ -39,7 +39,6 @@ Scan popup functionality. %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 @@ -48,7 +47,6 @@ make %{?_smp_mflags} %install rm -rf %{buildroot} -cd src make install INSTALL_ROOT=%{buildroot} INSTALL="install -p" rm -rf %{buildroot}/%{_datadir}/app-install @@ -73,7 +71,7 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc src/LICENSE.txt +%doc LICENSE.txt %dir %{_datadir}/goldendict/ %dir %{_datadir}/goldendict/locale/ %{_bindir}/goldendict @@ -84,6 +82,12 @@ rm -rf %{buildroot} %changelog +* Thu Jun 10 2010 Howard Ning - 0.9.0-12 +- New upstream version +- Better BGL support +- Updated translations +- Play audio from website + * 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. diff --git a/sources b/sources index ff1783a..6be517b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f1285668ec58c3fe36eefc1d62f0123c goldendict-ceab951.tar.gz +baa66278f6eeda5eea966bda7d5ec58d goldendict-c33fa2c.tar.gz From aa152eb17735f5b2b63b83259e60a521b8e616c8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 16:51:10 +0000 Subject: [PATCH 13/94] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- import.log | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 6070cc7..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: goldendict -# $Id$ -NAME := goldendict -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/import.log b/import.log deleted file mode 100644 index b93d1c6..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -goldendict-0_9_0-9_20100307git83115ad_fc13:HEAD:goldendict-0.9.0-9.20100307git83115ad.fc13.src.rpm:1271850946 From 048857bdb13b733737feaf375273958aa5269341 Mon Sep 17 00:00:00 2001 From: Liberty Date: Wed, 4 Aug 2010 08:44:04 -0400 Subject: [PATCH 14/94] new version --- .gitignore | 1 + goldendict.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 276ffa3..1a06ce3 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ goldendict-c33fa2c.tar.gz +goldendict-4fa567e.tar.gz diff --git a/goldendict.spec b/goldendict.spec index cd7921d..4bcf1b2 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -1,9 +1,9 @@ -%define githash c33fa2c -%define gitdate 20100610 +%define githash 4fa567e +%define gitdate 20100804 Name: goldendict Version: 0.9.0 -Release: 12.%{gitdate}git%{githash}%{?dist} +Release: 13.%{gitdate}git%{githash}%{?dist} Summary: A feature-rich dictionary lookup program Group: Applications/System License: GPLv3+ @@ -82,6 +82,9 @@ rm -rf %{buildroot} %changelog +* Wed Aug 04 2010 Howard Ning - 0.9.0-13 +- New upstream version + * Thu Jun 10 2010 Howard Ning - 0.9.0-12 - New upstream version - Better BGL support diff --git a/sources b/sources index 6be517b..92231c3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -baa66278f6eeda5eea966bda7d5ec58d goldendict-c33fa2c.tar.gz +ede41794ccc1153beac9c923b9e9df8a goldendict-4fa567e.tar.gz From 9e4cae927e70cce4cbabdce1ec2f44d6d9753abf Mon Sep 17 00:00:00 2001 From: Liberty Date: Wed, 4 Aug 2010 08:55:39 -0400 Subject: [PATCH 15/94] Fix the git version --- .gitignore | 1 + goldendict.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 1a06ce3..20968e8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ goldendict-c33fa2c.tar.gz goldendict-4fa567e.tar.gz +goldendict-415f35e.tar.gz diff --git a/goldendict.spec b/goldendict.spec index 4bcf1b2..58d1012 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -1,16 +1,16 @@ -%define githash 4fa567e +%define githash 415f35e %define gitdate 20100804 Name: goldendict Version: 0.9.0 -Release: 13.%{gitdate}git%{githash}%{?dist} +Release: 14.%{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 # The source is generated from the git snapshot using the following command -# git clone git://git.berlios.de/goldendict +# 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}-%{githash}.tar.gz @@ -82,6 +82,9 @@ rm -rf %{buildroot} %changelog +* Wed Aug 04 2010 Howard Ning - 0.9.0-14 +- Fix the git repo + * Wed Aug 04 2010 Howard Ning - 0.9.0-13 - New upstream version diff --git a/sources b/sources index 92231c3..ebfca07 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ede41794ccc1153beac9c923b9e9df8a goldendict-4fa567e.tar.gz +97bd28e39279ff55d4244356d43a10e4 goldendict-415f35e.tar.gz From 0dba7b46f7e89a1700ccf9786d55c47f4bbe25ae Mon Sep 17 00:00:00 2001 From: Liberty Date: Tue, 12 Oct 2010 20:43:32 -0400 Subject: [PATCH 16/94] modified: .gitignore modified: goldendict.spec modified: sources New git snapshot --- .gitignore | 1 + goldendict.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 20968e8..c0544e4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ goldendict-c33fa2c.tar.gz goldendict-4fa567e.tar.gz goldendict-415f35e.tar.gz +/goldendict-ac4be0b.tar.gz diff --git a/goldendict.spec b/goldendict.spec index 58d1012..9cad2b8 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -1,9 +1,9 @@ -%define githash 415f35e -%define gitdate 20100804 +%define githash ac4be0b +%define gitdate 20101012 Name: goldendict Version: 0.9.0 -Release: 14.%{gitdate}git%{githash}%{?dist} +Release: 15.%{gitdate}git%{githash}%{?dist} Summary: A feature-rich dictionary lookup program Group: Applications/System License: GPLv3+ @@ -82,6 +82,9 @@ rm -rf %{buildroot} %changelog +* Tue Oct 12 2010 Howard Ning - 0.9.0-15 +- New upstream + * Wed Aug 04 2010 Howard Ning - 0.9.0-14 - Fix the git repo diff --git a/sources b/sources index ebfca07..ce1781f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -97bd28e39279ff55d4244356d43a10e4 goldendict-415f35e.tar.gz +10f8b583fb9b710443ba6eb88f4f5358 goldendict-ac4be0b.tar.gz From 871e7104a8d94328c9c8c8495f2d60a9f443960e Mon Sep 17 00:00:00 2001 From: Howard Liberty Date: Fri, 10 Dec 2010 20:25:55 -0500 Subject: [PATCH 17/94] modified: .gitignore modified: goldendict.spec modified: sources * 1.0.1 --- .gitignore | 1 + goldendict.spec | 17 +++++++++-------- sources | 2 +- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index c0544e4..d1e5c7e 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ goldendict-c33fa2c.tar.gz goldendict-4fa567e.tar.gz goldendict-415f35e.tar.gz /goldendict-ac4be0b.tar.gz +/goldendict-1.0.1-src.tar.bz2 diff --git a/goldendict.spec b/goldendict.spec index 9cad2b8..0fb7a05 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -1,9 +1,6 @@ -%define githash ac4be0b -%define gitdate 20101012 - Name: goldendict -Version: 0.9.0 -Release: 15.%{gitdate}git%{githash}%{?dist} +Version: 1.0.1 +Release: 1%{?dist} Summary: A feature-rich dictionary lookup program Group: Applications/System License: GPLv3+ @@ -12,7 +9,7 @@ URL: http://goldendict.berlios.de/ # 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}-%{githash}.tar.gz +Source0: %{name}-%{version}-src.tar.gz # Modify the Icon section in desktop file to comform package guideline. @@ -34,7 +31,7 @@ Support MediaWiki-based sites to perform search; Scan popup functionality. %prep -%setup -q -n goldendict-%{githash} +%setup -q -n goldendict-%{version} #%patch0 -p1 @@ -54,7 +51,7 @@ rm -rf %{buildroot}/%{_datadir}/app-install 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" \ +--add-category="Dictionary" \ --remove-category="Office" \ --remove-category="Education" \ --remove-category="Applications" \ @@ -82,6 +79,10 @@ rm -rf %{buildroot} %changelog +* Tue Dec 10 2010 Howard Ning - 1.0.1-1 +- New upstream +- Change the categories to fix 592954 + * Tue Oct 12 2010 Howard Ning - 0.9.0-15 - New upstream diff --git a/sources b/sources index ce1781f..c709e74 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -10f8b583fb9b710443ba6eb88f4f5358 goldendict-ac4be0b.tar.gz +d56bb854936015104029d1f0b98b61bb goldendict-1.0.1-src.tar.bz2 From cdda21b18542f5a9c8543cad3991c1cc943e9a40 Mon Sep 17 00:00:00 2001 From: Howard Liberty Date: Fri, 10 Dec 2010 20:34:33 -0500 Subject: [PATCH 18/94] modified: goldendict.spec --- goldendict.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/goldendict.spec b/goldendict.spec index 0fb7a05..a6ad7ab 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -9,7 +9,7 @@ URL: http://goldendict.berlios.de/ # 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.gz +Source0: %{name}-%{version}-src.tar.bz2 # Modify the Icon section in desktop file to comform package guideline. From fc3d08fa57fba823b1e1f2a0a8c96d45d307b8b0 Mon Sep 17 00:00:00 2001 From: Howard Liberty Date: Fri, 10 Dec 2010 20:43:11 -0500 Subject: [PATCH 19/94] modified: goldendict.spec --- goldendict.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/goldendict.spec b/goldendict.spec index a6ad7ab..6001713 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -31,7 +31,7 @@ Support MediaWiki-based sites to perform search; Scan popup functionality. %prep -%setup -q -n goldendict-%{version} +%setup -q -n goldendict-%{version}-src #%patch0 -p1 From 709a9639a273b46634d34cb356dd99feb04e74fe Mon Sep 17 00:00:00 2001 From: Howard Liberty Date: Fri, 10 Dec 2010 20:55:32 -0500 Subject: [PATCH 20/94] modified: goldendict.spec --- goldendict.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/goldendict.spec b/goldendict.spec index 6001713..966ce68 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -31,7 +31,7 @@ Support MediaWiki-based sites to perform search; Scan popup functionality. %prep -%setup -q -n goldendict-%{version}-src +%setup -q -c -n goldendict-%{version}-src #%patch0 -p1 From a1b501f49e2a4c6018ebb93b1c9b7b70eb5a2a04 Mon Sep 17 00:00:00 2001 From: Howard Liberty Date: Fri, 10 Dec 2010 21:07:09 -0500 Subject: [PATCH 21/94] modified: goldendict.spec --- goldendict.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/goldendict.spec b/goldendict.spec index 966ce68..ae35af7 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -1,6 +1,6 @@ Name: goldendict Version: 1.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A feature-rich dictionary lookup program Group: Applications/System License: GPLv3+ @@ -52,7 +52,6 @@ sed -i 's/\/usr\/share\/pixmaps\/goldendict\.png/goldendict/g' %{buildroot}/%{_d # Fix the categories in desktop file desktop-file-install \ --add-category="Dictionary" \ ---remove-category="Office" \ --remove-category="Education" \ --remove-category="Applications" \ --delete-original \ @@ -79,10 +78,12 @@ rm -rf %{buildroot} %changelog -* Tue Dec 10 2010 Howard Ning - 1.0.1-1 -- New upstream +* Fri Dec 10 2010 Howard Ning - 1.0.1-2 - Change the categories to fix 592954 +* Fri Dec 10 2010 Howard Ning - 1.0.1-1 +- New upstream + * Tue Oct 12 2010 Howard Ning - 0.9.0-15 - New upstream From 6fa0bd6e896b258f6797bdcbb20e38263ff3f185 Mon Sep 17 00:00:00 2001 From: Howard Liberty Date: Mon, 13 Dec 2010 08:52:52 -0500 Subject: [PATCH 22/94] modified: goldendict.spec Fix the hunspell dir --- goldendict.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/goldendict.spec b/goldendict.spec index ae35af7..9e5904d 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -1,6 +1,6 @@ Name: goldendict Version: 1.0.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A feature-rich dictionary lookup program Group: Applications/System License: GPLv3+ @@ -38,6 +38,8 @@ Scan popup functionality. %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 make %{?_smp_mflags} @@ -78,6 +80,9 @@ rm -rf %{buildroot} %changelog +* Mon Dec 13 2010 Howard Ning - 1.0.1-3 +- Fix the path of hunspell dictionaries + * Fri Dec 10 2010 Howard Ning - 1.0.1-2 - Change the categories to fix 592954 From 19f9ae3eb0c0798a667efc4ed184cf8eef6a6fdc Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 23:29:23 -0600 Subject: [PATCH 23/94] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- goldendict.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/goldendict.spec b/goldendict.spec index 9e5904d..8d53c77 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -1,6 +1,6 @@ Name: goldendict Version: 1.0.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A feature-rich dictionary lookup program Group: Applications/System License: GPLv3+ @@ -80,6 +80,9 @@ rm -rf %{buildroot} %changelog +* Tue Feb 08 2011 Fedora Release Engineering - 1.0.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Mon Dec 13 2010 Howard Ning - 1.0.1-3 - Fix the path of hunspell dictionaries From 4b78f73734ec59805ba4cbcbfdfcfd08513b1795 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 12 Jan 2012 22:09:14 -0600 Subject: [PATCH 24/94] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- goldendict.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/goldendict.spec b/goldendict.spec index 8d53c77..6d2101c 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -1,6 +1,6 @@ Name: goldendict Version: 1.0.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A feature-rich dictionary lookup program Group: Applications/System License: GPLv3+ @@ -80,6 +80,9 @@ rm -rf %{buildroot} %changelog +* Fri Jan 13 2012 Fedora Release Engineering - 1.0.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Tue Feb 08 2011 Fedora Release Engineering - 1.0.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From b4e8a29285d50e0e91492a214426caf93e66853e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 19 Jul 2012 04:01:00 -0500 Subject: [PATCH 25/94] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- goldendict.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/goldendict.spec b/goldendict.spec index 6d2101c..fcb94e0 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -1,6 +1,6 @@ Name: goldendict Version: 1.0.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A feature-rich dictionary lookup program Group: Applications/System License: GPLv3+ @@ -80,6 +80,9 @@ rm -rf %{buildroot} %changelog +* Thu Jul 19 2012 Fedora Release Engineering - 1.0.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Fri Jan 13 2012 Fedora Release Engineering - 1.0.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From a072ee6c2aa1e0c6a9d3197562a465fdd5ffc829 Mon Sep 17 00:00:00 2001 From: Parag Nemade Date: Sat, 4 Aug 2012 21:04:10 +0530 Subject: [PATCH 26/94] Fix FTBFS for gcc-4.7 --- goldendict-1.0.1-gcc47.patch | 23 +++++++++++++++++++++++ goldendict.spec | 15 ++++++--------- 2 files changed, 29 insertions(+), 9 deletions(-) create mode 100644 goldendict-1.0.1-gcc47.patch diff --git a/goldendict-1.0.1-gcc47.patch b/goldendict-1.0.1-gcc47.patch new file mode 100644 index 0000000..6496d42 --- /dev/null +++ b/goldendict-1.0.1-gcc47.patch @@ -0,0 +1,23 @@ +diff -urN goldendict-1.0.1-src.orig/processwrapper.cc goldendict-1.0.1-src/processwrapper.cc +--- goldendict-1.0.1-src.orig/processwrapper.cc 2010-12-04 02:42:46.000000000 +0530 ++++ goldendict-1.0.1-src/processwrapper.cc 2012-08-04 20:51:45.835055609 +0530 +@@ -94,6 +94,8 @@ + + #else + ++#include ++ + unsigned int ProcessWrapper::currentProcessId() + { + return getpid(); +diff -urN goldendict-1.0.1-src.orig/qtsingleapplication/src/qtlocalpeer.cpp goldendict-1.0.1-src/qtsingleapplication/src/qtlocalpeer.cpp +--- goldendict-1.0.1-src.orig/qtsingleapplication/src/qtlocalpeer.cpp 2010-12-04 02:42:46.000000000 +0530 ++++ goldendict-1.0.1-src/qtsingleapplication/src/qtlocalpeer.cpp 2012-08-04 20:48:47.761593825 +0530 +@@ -50,6 +50,7 @@ + #endif + #if defined(Q_OS_UNIX) + #include ++#include + #endif + + namespace QtLP_Private { diff --git a/goldendict.spec b/goldendict.spec index fcb94e0..d71d023 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -1,6 +1,6 @@ Name: goldendict Version: 1.0.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A feature-rich dictionary lookup program Group: Applications/System License: GPLv3+ @@ -10,6 +10,7 @@ URL: http://goldendict.berlios.de/ # 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. @@ -32,7 +33,7 @@ Scan popup functionality. %prep %setup -q -c -n goldendict-%{version}-src -#%patch0 -p1 +%patch0 -p1 -b .gcc47 %build @@ -45,7 +46,6 @@ make %{?_smp_mflags} %install -rm -rf %{buildroot} make install INSTALL_ROOT=%{buildroot} INSTALL="install -p" rm -rf %{buildroot}/%{_datadir}/app-install @@ -63,12 +63,7 @@ install -d %{buildroot}/%{_datadir}/goldendict/locale install -pm 644 locale/*.qm %{buildroot}/%{_datadir}/goldendict/locale -%clean -rm -rf %{buildroot} - - %files -%defattr(-,root,root,-) %doc LICENSE.txt %dir %{_datadir}/goldendict/ %dir %{_datadir}/goldendict/locale/ @@ -78,8 +73,10 @@ rm -rf %{buildroot} %{_datadir}/goldendict/locale/*.qm - %changelog +* Sat Aug 04 2012 Parag Nemade - 1.0.1-7 +- Fix FTBFS for gcc-4.7 + * Thu Jul 19 2012 Fedora Release Engineering - 1.0.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From e3f845d8e53f597445b9057c9c92ee6ca1bb9662 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 18:20:22 -0600 Subject: [PATCH 27/94] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- goldendict.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/goldendict.spec b/goldendict.spec index d71d023..34fc040 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -1,6 +1,6 @@ Name: goldendict Version: 1.0.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A feature-rich dictionary lookup program Group: Applications/System License: GPLv3+ @@ -74,6 +74,9 @@ install -pm 644 locale/*.qm %{buildroot}/%{_datadir}/goldendict/locale %changelog +* Thu Feb 14 2013 Fedora Release Engineering - 1.0.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Sat Aug 04 2012 Parag Nemade - 1.0.1-7 - Fix FTBFS for gcc-4.7 From bbad0c989f41677803394d4386d138c1ad17e552 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 11:11:36 -0500 Subject: [PATCH 28/94] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- goldendict.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/goldendict.spec b/goldendict.spec index 34fc040..2a03b55 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -1,6 +1,6 @@ Name: goldendict Version: 1.0.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A feature-rich dictionary lookup program Group: Applications/System License: GPLv3+ @@ -74,6 +74,9 @@ install -pm 644 locale/*.qm %{buildroot}/%{_datadir}/goldendict/locale %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 1.0.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Thu Feb 14 2013 Fedora Release Engineering - 1.0.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From d6e36a48e0b1045238c12bb758492da3865354b7 Mon Sep 17 00:00:00 2001 From: Mosaab Alzoubi Date: Wed, 15 Jan 2014 11:33:28 +0200 Subject: [PATCH 29/94] 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(-) delete mode 100644 goldendict-1.0.1-gcc47.patch 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-1.0.1-gcc47.patch b/goldendict-1.0.1-gcc47.patch deleted file mode 100644 index 6496d42..0000000 --- a/goldendict-1.0.1-gcc47.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -urN goldendict-1.0.1-src.orig/processwrapper.cc goldendict-1.0.1-src/processwrapper.cc ---- goldendict-1.0.1-src.orig/processwrapper.cc 2010-12-04 02:42:46.000000000 +0530 -+++ goldendict-1.0.1-src/processwrapper.cc 2012-08-04 20:51:45.835055609 +0530 -@@ -94,6 +94,8 @@ - - #else - -+#include -+ - unsigned int ProcessWrapper::currentProcessId() - { - return getpid(); -diff -urN goldendict-1.0.1-src.orig/qtsingleapplication/src/qtlocalpeer.cpp goldendict-1.0.1-src/qtsingleapplication/src/qtlocalpeer.cpp ---- goldendict-1.0.1-src.orig/qtsingleapplication/src/qtlocalpeer.cpp 2010-12-04 02:42:46.000000000 +0530 -+++ goldendict-1.0.1-src/qtsingleapplication/src/qtlocalpeer.cpp 2012-08-04 20:48:47.761593825 +0530 -@@ -50,6 +50,7 @@ - #endif - #if defined(Q_OS_UNIX) - #include -+#include - #endif - - namespace QtLP_Private { 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 - 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 - 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 - 0.9.0-9 - Add kde-filesystem requirement. -* Fri Apr 11 2010 Howard Ning - 0.9.0-8 +* Sun 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. 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 From 35fc68c515716344b98bcb23effc7d23ec8a531e Mon Sep 17 00:00:00 2001 From: Mosaab Alzoubi Date: Wed, 15 Jan 2014 12:42:51 +0200 Subject: [PATCH 30/94] Fix BRs --- goldendict.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/goldendict.spec b/goldendict.spec index 9a87b25..6e1f6a5 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -17,6 +17,7 @@ BuildRequires: libvorbis-devel BuildRequires: desktop-file-utils BuildRequires: phonon-devel BuildRequires: qt-webkit-devel +BuildRequires: bzip2-devel BuildRequires: desktop-file-utils %description @@ -61,6 +62,7 @@ install -pm 644 locale/*.qm %{buildroot}/%{_datadir}/goldendict/locale - Fix a date in changelog. - Use new desktop-files Fedora method. - DISABLE_INTERNAL_PLAYER=1 because ffmpeg not found in Fedora repos. +- Add bzip2-devel to BRs. * Sat Aug 03 2013 Fedora Release Engineering - 1.0.1-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From d81128d6151974817834f606b3e908d17f28b766 Mon Sep 17 00:00:00 2001 From: Mosaab Alzoubi Date: Wed, 15 Jan 2014 16:37:52 +0200 Subject: [PATCH 31/94] Fix BRs 2 --- goldendict.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/goldendict.spec b/goldendict.spec index 6e1f6a5..27773bc 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -18,6 +18,7 @@ BuildRequires: desktop-file-utils BuildRequires: phonon-devel BuildRequires: qt-webkit-devel BuildRequires: bzip2-devel +BuildRequires: lzo-devel BuildRequires: desktop-file-utils %description @@ -62,7 +63,7 @@ install -pm 644 locale/*.qm %{buildroot}/%{_datadir}/goldendict/locale - Fix a date in changelog. - Use new desktop-files Fedora method. - DISABLE_INTERNAL_PLAYER=1 because ffmpeg not found in Fedora repos. -- Add bzip2-devel to BRs. +- Add bzip2-devel,lzo-devel to BRs. * Sat Aug 03 2013 Fedora Release Engineering - 1.0.1-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 22df78f4db3690e533814ae4ff5b7179a07742fb Mon Sep 17 00:00:00 2001 From: Mosaab Alzoubi Date: Fri, 17 Jan 2014 07:27:10 +0200 Subject: [PATCH 32/94] Using Macros. --- goldendict.spec | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/goldendict.spec b/goldendict.spec index 27773bc..ed7198e 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -3,7 +3,7 @@ Name: goldendict Version: 1.5 -Release: 0.1.RC1%{?dist} +Release: 0.2.RC1%{?dist} Summary: A feature-rich dictionary lookup program Group: Applications/System License: GPLv3+ @@ -33,27 +33,27 @@ Scan popup functionality. %setup -q -n %{name}-%{commit} %build -PREFIX=%{_prefix} qmake-qt4 "DISABLE_INTERNAL_PLAYER=1" +%qmake_qt4 "DISABLE_INTERNAL_PLAYER=1" make %{?_smp_mflags} %install make install INSTALL_ROOT=%{buildroot} INSTALL="install -p" rm -rf %{buildroot}/%{_datadir}/app-install desktop-file-install %{buildroot}%{_datadir}/applications/%{name}.desktop -install -d %{buildroot}/%{_datadir}/goldendict/locale -install -pm 644 locale/*.qm %{buildroot}/%{_datadir}/goldendict/locale +%find_lang %{name} - -%files +%files -f %{name}.lang %doc LICENSE.txt %dir %{_datadir}/goldendict/ -%dir %{_datadir}/goldendict/locale/ %{_bindir}/goldendict %{_datadir}/applications/goldendict.desktop %{_datadir}/pixmaps/goldendict.png -%{_datadir}/goldendict/locale/*.qm %changelog +* Fri Jan 17 2014 Mosaab Alzoubi - 1.5-0.2.RC1 +- Use %%qmake_qt4 and %%find_lang as suggestion +- by Christophe​r Meng‎ (‏cickumqt/gmail.com‏) + * Tue Jan 14 2014 Mosaab Alzoubi - 1.5-0.1.RC1 - Update to 1.5RC. - General clean of spec. From 69af62fc39aeec81dfc0748ae6ccee4fb475dbef Mon Sep 17 00:00:00 2001 From: Mosaab Alzoubi Date: Fri, 17 Jan 2014 07:43:55 +0200 Subject: [PATCH 33/94] Fix prefix --- goldendict.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/goldendict.spec b/goldendict.spec index ed7198e..94ee353 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -33,7 +33,7 @@ Scan popup functionality. %setup -q -n %{name}-%{commit} %build -%qmake_qt4 "DISABLE_INTERNAL_PLAYER=1" +%qmake_qt4 PREFIX=%{_prefix} DISABLE_INTERNAL_PLAYER=1 make %{?_smp_mflags} %install From ba4afce6e1f733b98f0282db113049d4e66e1248 Mon Sep 17 00:00:00 2001 From: Mosaab Alzoubi Date: Fri, 17 Jan 2014 08:03:32 +0200 Subject: [PATCH 34/94] Fix find locale --- goldendict.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/goldendict.spec b/goldendict.spec index 94ee353..38f90f7 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -40,7 +40,7 @@ make %{?_smp_mflags} make install INSTALL_ROOT=%{buildroot} INSTALL="install -p" rm -rf %{buildroot}/%{_datadir}/app-install desktop-file-install %{buildroot}%{_datadir}/applications/%{name}.desktop -%find_lang %{name} +%find_lang %{name} --with-qt %files -f %{name}.lang %doc LICENSE.txt From 60ee47bc654477f15c867dc7edf2238afe0c5a2b Mon Sep 17 00:00:00 2001 From: Mosaab Alzoubi Date: Fri, 17 Jan 2014 08:34:11 +0200 Subject: [PATCH 35/94] Fix find locale #2 try --- goldendict.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/goldendict.spec b/goldendict.spec index 38f90f7..cfb3d6d 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -40,7 +40,9 @@ make %{?_smp_mflags} make install INSTALL_ROOT=%{buildroot} INSTALL="install -p" rm -rf %{buildroot}/%{_datadir}/app-install desktop-file-install %{buildroot}%{_datadir}/applications/%{name}.desktop -%find_lang %{name} --with-qt +install -d %{buildroot}/%{_datadir}/goldendict/locale +install -pm 644 locale/*.qm %{buildroot}/%{_datadir}/goldendict/locale +%find_lang %{name} %files -f %{name}.lang %doc LICENSE.txt From 5bb538f125af609a79f1faf3ea137021797608b9 Mon Sep 17 00:00:00 2001 From: Mosaab Alzoubi Date: Fri, 17 Jan 2014 09:11:49 +0200 Subject: [PATCH 36/94] Fix try 3 --- goldendict.spec | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/goldendict.spec b/goldendict.spec index cfb3d6d..1aac528 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -19,7 +19,6 @@ BuildRequires: phonon-devel BuildRequires: qt-webkit-devel BuildRequires: bzip2-devel BuildRequires: lzo-devel -BuildRequires: desktop-file-utils %description Goldendict is a feature-rich dictionary lookup program. @@ -40,9 +39,7 @@ make %{?_smp_mflags} make install INSTALL_ROOT=%{buildroot} INSTALL="install -p" rm -rf %{buildroot}/%{_datadir}/app-install desktop-file-install %{buildroot}%{_datadir}/applications/%{name}.desktop -install -d %{buildroot}/%{_datadir}/goldendict/locale -install -pm 644 locale/*.qm %{buildroot}/%{_datadir}/goldendict/locale -%find_lang %{name} +%find_lang %files -f %{name}.lang %doc LICENSE.txt @@ -55,6 +52,7 @@ install -pm 644 locale/*.qm %{buildroot}/%{_datadir}/goldendict/locale * Fri Jan 17 2014 Mosaab Alzoubi - 1.5-0.2.RC1 - Use %%qmake_qt4 and %%find_lang as suggestion - by Christophe​r Meng‎ (‏cickumqt/gmail.com‏) +- Remove repeated BR. * Tue Jan 14 2014 Mosaab Alzoubi - 1.5-0.1.RC1 - Update to 1.5RC. From 6cbdf69cd50fd66253eda7d4009987cefa71f550 Mon Sep 17 00:00:00 2001 From: Mosaab Alzoubi Date: Fri, 17 Jan 2014 09:28:10 +0200 Subject: [PATCH 37/94] Fix try 4 --- goldendict.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/goldendict.spec b/goldendict.spec index 1aac528..6b6349e 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -39,20 +39,21 @@ make %{?_smp_mflags} make install INSTALL_ROOT=%{buildroot} INSTALL="install -p" rm -rf %{buildroot}/%{_datadir}/app-install desktop-file-install %{buildroot}%{_datadir}/applications/%{name}.desktop -%find_lang -%files -f %{name}.lang +%files %doc LICENSE.txt %dir %{_datadir}/goldendict/ +%dir %{_datadir}/goldendict/locale/ %{_bindir}/goldendict %{_datadir}/applications/goldendict.desktop %{_datadir}/pixmaps/goldendict.png +%{_datadir}/goldendict/locale/*.qm %changelog * Fri Jan 17 2014 Mosaab Alzoubi - 1.5-0.2.RC1 -- Use %%qmake_qt4 and %%find_lang as suggestion -- by Christophe​r Meng‎ (‏cickumqt/gmail.com‏) +- Use %%qmake_qt4 as suggestion by Christophe​r Meng‎ (‏cickumqt/gmail.com‏) - Remove repeated BR. +- Remove locale install lines, included in makeinstall function. * Tue Jan 14 2014 Mosaab Alzoubi - 1.5-0.1.RC1 - Update to 1.5RC. From faf24bda1367a001d3ad82ed5be9e95cf02ec65c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 13:08:39 -0500 Subject: [PATCH 38/94] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- goldendict.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/goldendict.spec b/goldendict.spec index 6b6349e..12c5163 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -3,7 +3,7 @@ Name: goldendict Version: 1.5 -Release: 0.2.RC1%{?dist} +Release: 0.3.RC1%{?dist} Summary: A feature-rich dictionary lookup program Group: Applications/System License: GPLv3+ @@ -50,6 +50,9 @@ desktop-file-install %{buildroot}%{_datadir}/applications/%{name}.desktop %{_datadir}/goldendict/locale/*.qm %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 1.5-0.3.RC1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Fri Jan 17 2014 Mosaab Alzoubi - 1.5-0.2.RC1 - Use %%qmake_qt4 as suggestion by Christophe​r Meng‎ (‏cickumqt/gmail.com‏) - Remove repeated BR. From 655308db26512b6054782c7397f3fcb098ffdaf4 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 16 Aug 2014 18:36:24 +0000 Subject: [PATCH 39/94] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- goldendict.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/goldendict.spec b/goldendict.spec index 12c5163..4c9116f 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -3,7 +3,7 @@ Name: goldendict Version: 1.5 -Release: 0.3.RC1%{?dist} +Release: 0.4.RC1%{?dist} Summary: A feature-rich dictionary lookup program Group: Applications/System License: GPLv3+ @@ -50,6 +50,9 @@ desktop-file-install %{buildroot}%{_datadir}/applications/%{name}.desktop %{_datadir}/goldendict/locale/*.qm %changelog +* Sat Aug 16 2014 Fedora Release Engineering - 1.5-0.4.RC1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sat Jun 07 2014 Fedora Release Engineering - 1.5-0.3.RC1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 83776e86b54d50710560c03d865ad29985d51e7e Mon Sep 17 00:00:00 2001 From: Mosaab Alzoubi Date: Sun, 14 Dec 2014 18:48:58 +0300 Subject: [PATCH 40/94] Update on 20141214 --- .gitignore | 1 + goldendict.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ce04398..535afec 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ goldendict-415f35e.tar.gz /goldendict-ac4be0b.tar.gz /goldendict-1.0.1-src.tar.bz2 /goldendict-3bd078debb7ae506e91e5d47f88f34ab847167c3.tar.gz +/goldendict-eaa8e8f270bee84fbb1f73702d0b65c3f9f89efa.tar.gz diff --git a/goldendict.spec b/goldendict.spec index 4c9116f..f3001ae 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -1,9 +1,9 @@ %global owner goldendict -%global commit 3bd078debb7ae506e91e5d47f88f34ab847167c3 +%global commit eaa8e8f270bee84fbb1f73702d0b65c3f9f89efa Name: goldendict Version: 1.5 -Release: 0.4.RC1%{?dist} +Release: 0.5.RC2%{?dist} Summary: A feature-rich dictionary lookup program Group: Applications/System License: GPLv3+ @@ -50,6 +50,9 @@ desktop-file-install %{buildroot}%{_datadir}/applications/%{name}.desktop %{_datadir}/goldendict/locale/*.qm %changelog +* Sun Dec 14 2014 Mosaab Alzoubi - 1.5-0.5.RC2 +- Update on 20141214 + * Sat Aug 16 2014 Fedora Release Engineering - 1.5-0.4.RC1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/sources b/sources index d26b439..b056dc7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -68dea65a98cca751d215e85dafa53006 goldendict-3bd078debb7ae506e91e5d47f88f34ab847167c3.tar.gz +5e249adfe44594349470e757abf05647 goldendict-eaa8e8f270bee84fbb1f73702d0b65c3f9f89efa.tar.gz From e4ccfbc556284d9e9c00ba56491c8fb8e5da1905 Mon Sep 17 00:00:00 2001 From: Mosaab Alzoubi Date: Sun, 14 Dec 2014 19:58:08 +0300 Subject: [PATCH 41/94] Add libtiff to BRs --- goldendict.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/goldendict.spec b/goldendict.spec index f3001ae..f4c2979 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -19,6 +19,7 @@ BuildRequires: phonon-devel BuildRequires: qt-webkit-devel BuildRequires: bzip2-devel BuildRequires: lzo-devel +BuildRequires: libtiff-devel %description Goldendict is a feature-rich dictionary lookup program. @@ -52,6 +53,7 @@ desktop-file-install %{buildroot}%{_datadir}/applications/%{name}.desktop %changelog * Sun Dec 14 2014 Mosaab Alzoubi - 1.5-0.5.RC2 - Update on 20141214 +- Add libtiff-devel as BR * Sat Aug 16 2014 Fedora Release Engineering - 1.5-0.4.RC1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 7db23cbfb4060d83e2e0a4caf05f53715f577dc4 Mon Sep 17 00:00:00 2001 From: Mosaab Alzoubi Date: Sun, 14 Dec 2014 20:13:22 +0300 Subject: [PATCH 42/94] Add eb to BRs --- goldendict.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/goldendict.spec b/goldendict.spec index f4c2979..639d54a 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -20,6 +20,7 @@ BuildRequires: qt-webkit-devel BuildRequires: bzip2-devel BuildRequires: lzo-devel BuildRequires: libtiff-devel +BuildRequires: eb-devel %description Goldendict is a feature-rich dictionary lookup program. @@ -54,6 +55,7 @@ desktop-file-install %{buildroot}%{_datadir}/applications/%{name}.desktop * Sun Dec 14 2014 Mosaab Alzoubi - 1.5-0.5.RC2 - Update on 20141214 - Add libtiff-devel as BR +- Add eb-devel as BR * Sat Aug 16 2014 Fedora Release Engineering - 1.5-0.4.RC1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From b3555579fd172e65f5ff4e18565b8c1cfd70d2ba Mon Sep 17 00:00:00 2001 From: Mosaab Alzoubi Date: Sun, 14 Dec 2014 20:28:02 +0300 Subject: [PATCH 43/94] Add -docs --- goldendict.spec | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/goldendict.spec b/goldendict.spec index 639d54a..45633dd 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -30,6 +30,13 @@ Support of multiple dictionary file formats; Support MediaWiki-based sites to perform search; Scan popup functionality. +%package docs +Summary: Documentation for %{name} +BuildArch: noarch + +%description docs +Contain doc files of %{name}. + %prep %setup -q -n %{name}-%{commit} @@ -51,11 +58,16 @@ desktop-file-install %{buildroot}%{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/goldendict.png %{_datadir}/goldendict/locale/*.qm +%files docs +%dir %{_datadir}/goldendict/help +%{_datadir}/goldendict/help/* + %changelog * Sun Dec 14 2014 Mosaab Alzoubi - 1.5-0.5.RC2 - Update on 20141214 - Add libtiff-devel as BR - Add eb-devel as BR +- Add -docs subpackage * Sat Aug 16 2014 Fedora Release Engineering - 1.5-0.4.RC1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From df7d8cab135d57749d764bccd7dc81ecc00e2f68 Mon Sep 17 00:00:00 2001 From: Mosaab Alzoubi Date: Sun, 14 Dec 2014 22:47:10 +0300 Subject: [PATCH 44/94] Use system qtsingleapplication --- .gitignore | 1 + goldendict.spec | 9 ++++++++- sources | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 535afec..a7d2a77 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ goldendict-415f35e.tar.gz /goldendict-1.0.1-src.tar.bz2 /goldendict-3bd078debb7ae506e91e5d47f88f34ab847167c3.tar.gz /goldendict-eaa8e8f270bee84fbb1f73702d0b65c3f9f89efa.tar.gz +/goldendict-system-qtsingleapp.patch diff --git a/goldendict.spec b/goldendict.spec index 45633dd..0bcef2f 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -3,12 +3,13 @@ Name: goldendict Version: 1.5 -Release: 0.5.RC2%{?dist} +Release: 0.6.RC2%{?dist} Summary: A feature-rich dictionary lookup program Group: Applications/System License: GPLv3+ URL: http://goldendict.org Source0: https://github.com/%{owner}/%{name}/archive/%{commit}/%{name}-%{commit}.tar.gz +Patch0: goldendict-system-qtsingleapp.patch BuildRequires: qt-devel BuildRequires: libXtst-devel @@ -21,6 +22,7 @@ BuildRequires: bzip2-devel BuildRequires: lzo-devel BuildRequires: libtiff-devel BuildRequires: eb-devel +BuildRequires: qtsingleapplication-devel %description Goldendict is a feature-rich dictionary lookup program. @@ -39,6 +41,8 @@ Contain doc files of %{name}. %prep %setup -q -n %{name}-%{commit} +%patch0 -p1 +rm -r qtsingleapplication %build %qmake_qt4 PREFIX=%{_prefix} DISABLE_INTERNAL_PLAYER=1 @@ -63,6 +67,9 @@ desktop-file-install %{buildroot}%{_datadir}/applications/%{name}.desktop %{_datadir}/goldendict/help/* %changelog +* Sun Dec 14 2014 Ville Skyttä - 1.5-0.6.RC1 +- Use system qtsingleapplication instead of bundled one + * Sun Dec 14 2014 Mosaab Alzoubi - 1.5-0.5.RC2 - Update on 20141214 - Add libtiff-devel as BR diff --git a/sources b/sources index b056dc7..a4be19e 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ +f898bb382099925bdbbb29d9cf7a8f15 goldendict-system-qtsingleapp.patch 5e249adfe44594349470e757abf05647 goldendict-eaa8e8f270bee84fbb1f73702d0b65c3f9f89efa.tar.gz From d7dc432040ba0927b1535eee553259356d788dfe Mon Sep 17 00:00:00 2001 From: Mosaab Alzoubi Date: Mon, 15 Dec 2014 02:25:52 +0300 Subject: [PATCH 45/94] Use system qtsingleapplication --- goldendict.spec | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/goldendict.spec b/goldendict.spec index 0bcef2f..8743f13 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -41,7 +41,7 @@ Contain doc files of %{name}. %prep %setup -q -n %{name}-%{commit} -%patch0 -p1 +%patch0 -p0 rm -r qtsingleapplication %build diff --git a/sources b/sources index a4be19e..a3c8975 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -f898bb382099925bdbbb29d9cf7a8f15 goldendict-system-qtsingleapp.patch 5e249adfe44594349470e757abf05647 goldendict-eaa8e8f270bee84fbb1f73702d0b65c3f9f89efa.tar.gz +19240f002a4d13883e9b75c97a975bf7 goldendict-system-qtsingleapp.patch From 90827836d455fb61bbefce0577d507140a314eed Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Thu, 26 Mar 2015 16:33:48 +0000 Subject: [PATCH 46/94] Add an AppData file for the software center --- goldendict.spec | 43 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/goldendict.spec b/goldendict.spec index 8743f13..aa2c332 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -3,7 +3,7 @@ Name: goldendict Version: 1.5 -Release: 0.6.RC2%{?dist} +Release: 0.7.RC2%{?dist} Summary: A feature-rich dictionary lookup program Group: Applications/System License: GPLv3+ @@ -53,11 +53,49 @@ make install INSTALL_ROOT=%{buildroot} INSTALL="install -p" rm -rf %{buildroot}/%{_datadir}/app-install desktop-file-install %{buildroot}%{_datadir}/applications/%{name}.desktop +# Register as an application to be visible in the software center +# +# NOTE: It would be *awesome* if this file was maintained by the upstream +# project, translated and installed into the right place during `make install`. +# +# See http://www.freedesktop.org/software/appstream/docs/ for more details. +# +mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata +cat > $RPM_BUILD_ROOT%{_datadir}/appdata/%{name}.appdata.xml < + + + + goldendict.desktop + CC0-1.0 + Look up definitions + +

+ Goldendict is an application to look up the definitions of words. It has the ability to + query both dictionaries saved on your local machine, and to query online dictionaries and + encyclopedias such as Wikipedia, Wiktionary and Urban Dictionary. +

+ + http://goldendict.org/ + + http://goldendict.org/screenshots/sprechen-wiktionary.png + http://goldendict.org/screenshots/damselfly-heady.png + + + +EOF + %files %doc LICENSE.txt %dir %{_datadir}/goldendict/ %dir %{_datadir}/goldendict/locale/ %{_bindir}/goldendict +%{_datadir}/appdata/%{name}.appdata.xml %{_datadir}/applications/goldendict.desktop %{_datadir}/pixmaps/goldendict.png %{_datadir}/goldendict/locale/*.qm @@ -67,6 +105,9 @@ desktop-file-install %{buildroot}%{_datadir}/applications/%{name}.desktop %{_datadir}/goldendict/help/* %changelog +* Thu Mar 26 2015 Richard Hughes - 1.5-0.7.RC2 +- Add an AppData file for the software center + * Sun Dec 14 2014 Ville Skyttä - 1.5-0.6.RC1 - Use system qtsingleapplication instead of bundled one From 8773f6317f12c42d11bb909deca634b5565059ef Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sat, 2 May 2015 14:05:04 +0200 Subject: [PATCH 47/94] Rebuilt for GCC 5 C++11 ABI change --- goldendict.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/goldendict.spec b/goldendict.spec index aa2c332..396ca77 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -3,7 +3,7 @@ Name: goldendict Version: 1.5 -Release: 0.7.RC2%{?dist} +Release: 0.8.RC2%{?dist} Summary: A feature-rich dictionary lookup program Group: Applications/System License: GPLv3+ @@ -105,6 +105,9 @@ EOF %{_datadir}/goldendict/help/* %changelog +* Sat May 02 2015 Kalev Lember - 1.5-0.8.RC2 +- Rebuilt for GCC 5 C++11 ABI change + * Thu Mar 26 2015 Richard Hughes - 1.5-0.7.RC2 - Add an AppData file for the software center From c8862e2ee306bed38835b320db3a9d7fb439ffc1 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 09:33:37 +0000 Subject: [PATCH 48/94] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- goldendict.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/goldendict.spec b/goldendict.spec index 396ca77..6e86467 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -3,7 +3,7 @@ Name: goldendict Version: 1.5 -Release: 0.8.RC2%{?dist} +Release: 0.9.RC2%{?dist} Summary: A feature-rich dictionary lookup program Group: Applications/System License: GPLv3+ @@ -105,6 +105,9 @@ EOF %{_datadir}/goldendict/help/* %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 1.5-0.9.RC2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sat May 02 2015 Kalev Lember - 1.5-0.8.RC2 - Rebuilt for GCC 5 C++11 ABI change From b3496de04d5d1a89199b9c4ca7fbe45ec3ba99c1 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 23:08:08 +0000 Subject: [PATCH 49/94] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- goldendict.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/goldendict.spec b/goldendict.spec index 6e86467..e09b258 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -3,7 +3,7 @@ Name: goldendict Version: 1.5 -Release: 0.9.RC2%{?dist} +Release: 0.10.RC2%{?dist} Summary: A feature-rich dictionary lookup program Group: Applications/System License: GPLv3+ @@ -105,6 +105,9 @@ EOF %{_datadir}/goldendict/help/* %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 1.5-0.10.RC2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Wed Jun 17 2015 Fedora Release Engineering - 1.5-0.9.RC2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 5312e0152a446a4d649e6a9ca5b24e8910ccd69a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 12:05:16 +0000 Subject: [PATCH 50/94] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- goldendict.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/goldendict.spec b/goldendict.spec index e09b258..92fc56b 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -3,7 +3,7 @@ Name: goldendict Version: 1.5 -Release: 0.10.RC2%{?dist} +Release: 0.11.RC2%{?dist} Summary: A feature-rich dictionary lookup program Group: Applications/System License: GPLv3+ @@ -105,6 +105,9 @@ EOF %{_datadir}/goldendict/help/* %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 1.5-0.11.RC2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Wed Feb 03 2016 Fedora Release Engineering - 1.5-0.10.RC2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 29bc8c2297b7564d7ee98c43ad9dcd7299e77fd7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 15 May 2017 20:10:23 +0000 Subject: [PATCH 51/94] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild --- goldendict.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/goldendict.spec b/goldendict.spec index 92fc56b..c68b259 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -3,7 +3,7 @@ Name: goldendict Version: 1.5 -Release: 0.11.RC2%{?dist} +Release: 0.12.RC2%{?dist} Summary: A feature-rich dictionary lookup program Group: Applications/System License: GPLv3+ @@ -105,6 +105,9 @@ EOF %{_datadir}/goldendict/help/* %changelog +* Mon May 15 2017 Fedora Release Engineering - 1.5-0.12.RC2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild + * Fri Feb 10 2017 Fedora Release Engineering - 1.5-0.11.RC2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 23720abc855fcea7c900eb4dc305632bde5e5b5d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 11:50:18 +0000 Subject: [PATCH 52/94] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- goldendict.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/goldendict.spec b/goldendict.spec index c68b259..88b2c54 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -3,7 +3,7 @@ Name: goldendict Version: 1.5 -Release: 0.12.RC2%{?dist} +Release: 0.13.RC2%{?dist} Summary: A feature-rich dictionary lookup program Group: Applications/System License: GPLv3+ @@ -105,6 +105,9 @@ EOF %{_datadir}/goldendict/help/* %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 1.5-0.13.RC2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Mon May 15 2017 Fedora Release Engineering - 1.5-0.12.RC2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild From 5140c7a2bf35cd8058eebb1cf2fff29932e50596 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 22:55:06 +0000 Subject: [PATCH 53/94] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- goldendict.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/goldendict.spec b/goldendict.spec index 88b2c54..9344554 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -3,7 +3,7 @@ Name: goldendict Version: 1.5 -Release: 0.13.RC2%{?dist} +Release: 0.14.RC2%{?dist} Summary: A feature-rich dictionary lookup program Group: Applications/System License: GPLv3+ @@ -105,6 +105,9 @@ EOF %{_datadir}/goldendict/help/* %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 1.5-0.14.RC2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 1.5-0.13.RC2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 69feecc312f4a028f3c229d20a2003dbcb8e3cf6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 15:08:42 +0000 Subject: [PATCH 54/94] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- goldendict.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/goldendict.spec b/goldendict.spec index 9344554..5589616 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -3,7 +3,7 @@ Name: goldendict Version: 1.5 -Release: 0.14.RC2%{?dist} +Release: 0.15.RC2%{?dist} Summary: A feature-rich dictionary lookup program Group: Applications/System License: GPLv3+ @@ -105,6 +105,9 @@ EOF %{_datadir}/goldendict/help/* %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 1.5-0.15.RC2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Aug 02 2017 Fedora Release Engineering - 1.5-0.14.RC2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From cd879f985d34f25de34c3b2475f945f2a13759b2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 04:19:49 +0000 Subject: [PATCH 55/94] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- goldendict.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/goldendict.spec b/goldendict.spec index 5589616..d109ad4 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -3,7 +3,7 @@ Name: goldendict Version: 1.5 -Release: 0.15.RC2%{?dist} +Release: 0.16.RC2%{?dist} Summary: A feature-rich dictionary lookup program Group: Applications/System License: GPLv3+ @@ -105,6 +105,9 @@ EOF %{_datadir}/goldendict/help/* %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 1.5-0.16.RC2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 1.5-0.15.RC2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From ba6c54c5513c0092d274b5b238895c6535045b63 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Mon, 24 Sep 2018 20:12:40 +0200 Subject: [PATCH 56/94] - Switched to Qt5 to fix major issues with HiDPI displays. - Moved to latest snapshot to resolve issues with latest GCC compiler versions. - Major SPEC cleanup. Signed-off-by: Vitaly Zaitsev --- .gitignore | 1 + goldendict.spec | 73 ++++++++++++++++++++++++++++++------------------- sources | 3 +- 3 files changed, 47 insertions(+), 30 deletions(-) diff --git a/.gitignore b/.gitignore index a7d2a77..5886991 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ goldendict-415f35e.tar.gz /goldendict-3bd078debb7ae506e91e5d47f88f34ab847167c3.tar.gz /goldendict-eaa8e8f270bee84fbb1f73702d0b65c3f9f89efa.tar.gz /goldendict-system-qtsingleapp.patch +/goldendict-04d9dc43f67b102c7727228326c05eb82d87e4f2.tar.gz diff --git a/goldendict.spec b/goldendict.spec index d109ad4..7768ebb 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -1,28 +1,39 @@ %global owner goldendict -%global commit eaa8e8f270bee84fbb1f73702d0b65c3f9f89efa +%global commit 04d9dc43f67b102c7727228326c05eb82d87e4f2 Name: goldendict Version: 1.5 -Release: 0.16.RC2%{?dist} +Release: 0.17.RC2%{?dist} Summary: A feature-rich dictionary lookup program Group: Applications/System License: GPLv3+ URL: http://goldendict.org Source0: https://github.com/%{owner}/%{name}/archive/%{commit}/%{name}-%{commit}.tar.gz -Patch0: goldendict-system-qtsingleapp.patch -BuildRequires: qt-devel +BuildRequires: cmake(Qt5LinguistTools) +BuildRequires: cmake(Qt5XmlPatterns) +BuildRequires: cmake(Qt5Multimedia) +BuildRequires: cmake(Qt5X11Extras) +BuildRequires: cmake(Qt5Network) +BuildRequires: cmake(Qt5WebKit) +BuildRequires: cmake(Qt5Core) +BuildRequires: cmake(Qt5DBus) +BuildRequires: cmake(Qt5Help) +BuildRequires: cmake(Qt5Gui) +BuildRequires: cmake(Qt5Svg) +BuildRequires: cmake(Qt5Xml) + BuildRequires: libXtst-devel BuildRequires: hunspell-devel BuildRequires: libvorbis-devel BuildRequires: desktop-file-utils BuildRequires: phonon-devel -BuildRequires: qt-webkit-devel -BuildRequires: bzip2-devel -BuildRequires: lzo-devel -BuildRequires: libtiff-devel -BuildRequires: eb-devel -BuildRequires: qtsingleapplication-devel +BuildRequires: bzip2-devel +BuildRequires: lzo-devel +BuildRequires: libtiff-devel +BuildRequires: eb-devel +BuildRequires: qtsingleapplication-qt5-devel +BuildRequires: libappstream-glib %description Goldendict is a feature-rich dictionary lookup program. @@ -40,17 +51,17 @@ BuildArch: noarch Contain doc files of %{name}. %prep -%setup -q -n %{name}-%{commit} -%patch0 -p0 +%autosetup -n %{name}-%{commit} -p1 rm -r qtsingleapplication +sed -e '/qtsingleapplication.pri/d' -i %{name}.pro %build -%qmake_qt4 PREFIX=%{_prefix} DISABLE_INTERNAL_PLAYER=1 -make %{?_smp_mflags} +%qmake_qt5 PREFIX=%{_prefix} CONFIG+=qtsingleapplication CONFIG+=no_ffmpeg_player +%make_build %install -make install INSTALL_ROOT=%{buildroot} INSTALL="install -p" -rm -rf %{buildroot}/%{_datadir}/app-install +%make_install INSTALL_ROOT=%{buildroot} +rm -rf %{buildroot}%{_datadir}/app-install desktop-file-install %{buildroot}%{_datadir}/applications/%{name}.desktop # Register as an application to be visible in the software center @@ -60,8 +71,8 @@ desktop-file-install %{buildroot}%{_datadir}/applications/%{name}.desktop # # See http://www.freedesktop.org/software/appstream/docs/ for more details. # -mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata -cat > $RPM_BUILD_ROOT%{_datadir}/appdata/%{name}.appdata.xml < %{buildroot}%{_datadir}/metainfo/%{name}.appdata.xml < - - - goldendict.desktop - CC0-1.0 - Look up definitions - -

- Goldendict is an application to look up the definitions of words. It has the ability to - query both dictionaries saved on your local machine, and to query online dictionaries and - encyclopedias such as Wikipedia, Wiktionary and Urban Dictionary. -

- - http://goldendict.org/ - - http://goldendict.org/screenshots/sprechen-wiktionary.png - http://goldendict.org/screenshots/damselfly-heady.png - - - -EOF %check -appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/%{name}.appdata.xml +appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdata.xml +desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %files %license LICENSE.txt %doc README.md %{_bindir}/%{name} -%{_datadir}/%{name} -%{_datadir}/metainfo/%{name}.appdata.xml +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/locale +%{_metainfodir}/%{name}.appdata.xml %{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/%{name}.png @@ -116,6 +83,10 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/%{name}.a %{_datadir}/%{name}/help %changelog +* Mon Jul 29 2019 Vitaly Zaitsev - 1.5-0.21.RC2 +- Updated to latest Git snapshot with lots of Qt 5.12 crash fixes. +- SPEC cleanup. + * Thu Jul 25 2019 Fedora Release Engineering - 1.5-0.20.RC2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index d8ff4e1..f39aa25 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (goldendict-04d9dc43f67b102c7727228326c05eb82d87e4f2.tar.gz) = dc55f4160c5e1dc47f77ea76381e82ac6b624c657f1f2d40237d6dfaff48fba95188ca588e0cfe3b0e34229261cd6148801beacba76c8d7da368a937238266a9 +SHA512 (goldendict-0f951b06a55f3a201891cf645a556e773bda5f52.tar.gz) = 5fb41240f767fcde7e6395a9e441560fc8a721d474f817cd804a4c8ad072808510ade8d448e38adc2c55e333f07f38893c65b0cf31878f2d9930d58b368ee470 From 14e5853e28a65334f6b3619b48f53c667bc754bb Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Mon, 26 Aug 2019 09:54:49 +0200 Subject: [PATCH 63/94] Updated to c53fe1c snapshot with additional crash fixes. --- .gitignore | 1 + goldendict.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index eeff0af..37aa964 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ goldendict-415f35e.tar.gz /goldendict-system-qtsingleapp.patch /goldendict-04d9dc43f67b102c7727228326c05eb82d87e4f2.tar.gz /goldendict-0f951b06a55f3a201891cf645a556e773bda5f52.tar.gz +/goldendict-c53fe1c64061c7285b7451ff48089d443721c2a9.tar.gz diff --git a/goldendict.spec b/goldendict.spec index 46e5935..f1a4eba 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -1,9 +1,9 @@ %global owner goldendict -%global commit 0f951b06a55f3a201891cf645a556e773bda5f52 +%global commit c53fe1c64061c7285b7451ff48089d443721c2a9 Name: goldendict Version: 1.5 -Release: 0.21.RC2%{?dist} +Release: 0.22.RC2%{?dist} Summary: A feature-rich dictionary lookup program License: GPLv3+ URL: http://goldendict.org @@ -83,6 +83,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %{_datadir}/%{name}/help %changelog +* Mon Aug 26 2019 Vitaly Zaitsev - 1.5-0.22.RC2 +- Updated to c53fe1c snapshot with additional crash fixes. + * Mon Jul 29 2019 Vitaly Zaitsev - 1.5-0.21.RC2 - Updated to latest Git snapshot with lots of Qt 5.12 crash fixes. - SPEC cleanup. diff --git a/sources b/sources index f39aa25..2e80da5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (goldendict-0f951b06a55f3a201891cf645a556e773bda5f52.tar.gz) = 5fb41240f767fcde7e6395a9e441560fc8a721d474f817cd804a4c8ad072808510ade8d448e38adc2c55e333f07f38893c65b0cf31878f2d9930d58b368ee470 +SHA512 (goldendict-c53fe1c64061c7285b7451ff48089d443721c2a9.tar.gz) = 74d08710c330811e8ef84eede9ef8892d40a88d621642bcf0d2ca9f351d8b1a93035fabbb484c9604901422e327ac2f9530ea4157904d082fd8a9dd6e3eba021 From 3d26383e7f81c879a842f381f18c238850744342 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 03:12:52 +0000 Subject: [PATCH 64/94] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- goldendict.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/goldendict.spec b/goldendict.spec index f1a4eba..dd03ab5 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -3,7 +3,7 @@ Name: goldendict Version: 1.5 -Release: 0.22.RC2%{?dist} +Release: 0.23.RC2%{?dist} Summary: A feature-rich dictionary lookup program License: GPLv3+ URL: http://goldendict.org @@ -83,6 +83,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %{_datadir}/%{name}/help %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 1.5-0.23.RC2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Mon Aug 26 2019 Vitaly Zaitsev - 1.5-0.22.RC2 - Updated to c53fe1c snapshot with additional crash fixes. From fe0d1a9754ad8f17a5f217bca661f053d6661750 Mon Sep 17 00:00:00 2001 From: Mosaab Alzoubi Date: Sat, 14 Mar 2020 19:47:03 +0300 Subject: [PATCH 65/94] Workaround #1766935 --- goldendict.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/goldendict.spec b/goldendict.spec index dd03ab5..2887621 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -56,6 +56,7 @@ Contain doc files of %{name}. %autosetup -n %{name}-%{commit} -p1 rm -r qtsingleapplication sed -e '/qtsingleapplication.pri/d' -i %{name}.pro +sed 's:Exec=goldendict:Exec=QT_QPA_PLATFORM=xcb goldendict:g' -i redist/goldendict.desktop %build %qmake_qt5 PREFIX=%{_prefix} CONFIG+=qtsingleapplication CONFIG+=no_ffmpeg_player %{name}.pro @@ -83,6 +84,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %{_datadir}/%{name}/help %changelog +* Sat Mar 14 2020 Mosaab Alzoubi - 1.5-0.24.RC2 +- Workaround #1766935 + * Wed Jan 29 2020 Fedora Release Engineering - 1.5-0.23.RC2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 2c8c3eef04736fa93b2afc378ca2453b0deb566b Mon Sep 17 00:00:00 2001 From: Mosaab Alzoubi Date: Sat, 14 Mar 2020 20:26:51 +0300 Subject: [PATCH 66/94] Fix rel number --- goldendict.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/goldendict.spec b/goldendict.spec index 2887621..1c54dd9 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -3,7 +3,7 @@ Name: goldendict Version: 1.5 -Release: 0.23.RC2%{?dist} +Release: 0.24.RC2%{?dist} Summary: A feature-rich dictionary lookup program License: GPLv3+ URL: http://goldendict.org From 01d11d45c76cfcf354cac13a406988bf137956f1 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Sun, 15 Mar 2020 09:33:44 +0100 Subject: [PATCH 67/94] Added a separate desktop icon for Gnome users with workaround. --- goldendict.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/goldendict.spec b/goldendict.spec index 1c54dd9..0092551 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -3,7 +3,7 @@ Name: goldendict Version: 1.5 -Release: 0.24.RC2%{?dist} +Release: 0.25.RC2%{?dist} Summary: A feature-rich dictionary lookup program License: GPLv3+ URL: http://goldendict.org @@ -56,7 +56,7 @@ Contain doc files of %{name}. %autosetup -n %{name}-%{commit} -p1 rm -r qtsingleapplication sed -e '/qtsingleapplication.pri/d' -i %{name}.pro -sed 's:Exec=goldendict:Exec=QT_QPA_PLATFORM=xcb goldendict:g' -i redist/goldendict.desktop +cp redist/%{name}.desktop redist/%{name}-x11.desktop %build %qmake_qt5 PREFIX=%{_prefix} CONFIG+=qtsingleapplication CONFIG+=no_ffmpeg_player %{name}.pro @@ -65,10 +65,11 @@ sed 's:Exec=goldendict:Exec=QT_QPA_PLATFORM=xcb goldendict:g' -i redist/goldendi %install %make_install INSTALL_ROOT=%{buildroot} rm -rf %{buildroot}%{_datadir}/app-install +desktop-file-install --set-key=Exec --set-value="env QT_QPA_PLATFORM=xcb %{name}" --set-name="GoldenDict (X11)" --add-only-show-in="GNOME;" --dir=%{buildroot}%{_datadir}/applications redist/%{name}-x11.desktop %check appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdata.xml -desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %files %license LICENSE.txt @@ -77,13 +78,16 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %dir %{_datadir}/%{name} %{_datadir}/%{name}/locale %{_metainfodir}/%{name}.appdata.xml -%{_datadir}/applications/%{name}.desktop +%{_datadir}/applications/*.desktop %{_datadir}/pixmaps/%{name}.png %files docs %{_datadir}/%{name}/help %changelog +* Sun Mar 15 2020 Vitaly Zaitsev - 1.5-0.25.RC2 +- Added a separate desktop icon for Gnome users with workaround. + * Sat Mar 14 2020 Mosaab Alzoubi - 1.5-0.24.RC2 - Workaround #1766935 From 4c95c77e635b4a5a146676e85376e40aa1808d49 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Sun, 15 Mar 2020 09:44:47 +0100 Subject: [PATCH 68/94] Updated to 353ea17 snapshot with crash fixes under Qt 5.13+. --- goldendict.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/goldendict.spec b/goldendict.spec index 0092551..8ae448d 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -1,5 +1,5 @@ %global owner goldendict -%global commit c53fe1c64061c7285b7451ff48089d443721c2a9 +%global commit 353ea1793ed430193ce586e57c560867e4a2a55b Name: goldendict Version: 1.5 @@ -87,6 +87,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %changelog * Sun Mar 15 2020 Vitaly Zaitsev - 1.5-0.25.RC2 - Added a separate desktop icon for Gnome users with workaround. +- Updated to 353ea17 snapshot with crash fixes under Qt 5.13+. * Sat Mar 14 2020 Mosaab Alzoubi - 1.5-0.24.RC2 - Workaround #1766935 From 766926d4dad00fe10d0c370337df4f77d6d70f12 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Sun, 15 Mar 2020 09:48:11 +0100 Subject: [PATCH 69/94] Uploaded sources of 353ea17 snapshot. --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 37aa964..46236d8 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ goldendict-415f35e.tar.gz /goldendict-04d9dc43f67b102c7727228326c05eb82d87e4f2.tar.gz /goldendict-0f951b06a55f3a201891cf645a556e773bda5f52.tar.gz /goldendict-c53fe1c64061c7285b7451ff48089d443721c2a9.tar.gz +/goldendict-353ea1793ed430193ce586e57c560867e4a2a55b.tar.gz diff --git a/sources b/sources index 2e80da5..6e7ce9a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (goldendict-c53fe1c64061c7285b7451ff48089d443721c2a9.tar.gz) = 74d08710c330811e8ef84eede9ef8892d40a88d621642bcf0d2ca9f351d8b1a93035fabbb484c9604901422e327ac2f9530ea4157904d082fd8a9dd6e3eba021 +SHA512 (goldendict-353ea1793ed430193ce586e57c560867e4a2a55b.tar.gz) = 6ee14aeac72796a034ef2d6f345fe7f5d5838759cbad5f59830672206b9eaae2b207c97cdbdde1964fc88e18561e26496741bcecec21e24ad7892e189ea7b025 From 863d90a2e7c067910fc4f0684e4061cc9a383784 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Sun, 15 Mar 2020 10:23:34 +0100 Subject: [PATCH 70/94] Added a special desktop action (Run GoldenDict on X11). Created PR to upstream: https://github.com/goldendict/goldendict/pull/1238. --- goldendict-add-x11-action.patch | 28 ++++++++++++++++++++++++++++ goldendict.spec | 9 +++++---- 2 files changed, 33 insertions(+), 4 deletions(-) create mode 100644 goldendict-add-x11-action.patch diff --git a/goldendict-add-x11-action.patch b/goldendict-add-x11-action.patch new file mode 100644 index 0000000..22a8924 --- /dev/null +++ b/goldendict-add-x11-action.patch @@ -0,0 +1,28 @@ +From a1c7c5b3762c292c2620af41428c3c6c3f758f04 Mon Sep 17 00:00:00 2001 +From: Vitaly Zaitsev +Date: Sun, 15 Mar 2020 10:15:58 +0100 +Subject: [PATCH] Added a desktop action as a workaround to crashes on Wayland. + +Also removed deprecated Encoding directive from desktop file. + +Signed-off-by: Vitaly Zaitsev +--- + redist/goldendict.desktop | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/redist/goldendict.desktop b/redist/goldendict.desktop +index e4cbd42b..13a5fe8f 100755 +--- a/redist/goldendict.desktop ++++ b/redist/goldendict.desktop +@@ -5,6 +5,10 @@ Categories=Office;Dictionary;Education;Qt; + Name=GoldenDict + GenericName=Multiformat Dictionary + Comment=GoldenDict +-Encoding=UTF-8 + Icon=goldendict + Exec=goldendict ++Actions=X11; ++ ++[Desktop Action X11] ++Name=GoldenDict (X11) ++Exec=env QT_QPA_PLATFORM=xcb goldendict diff --git a/goldendict.spec b/goldendict.spec index 8ae448d..d347050 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -9,6 +9,9 @@ License: GPLv3+ URL: http://goldendict.org Source0: https://github.com/%{owner}/%{name}/archive/%{commit}/%{name}-%{commit}.tar.gz +# https://github.com/goldendict/goldendict/pull/1238 +Patch100: %{name}-add-x11-action.patch + BuildRequires: cmake(Qt5LinguistTools) BuildRequires: cmake(Qt5XmlPatterns) BuildRequires: cmake(Qt5Multimedia) @@ -56,7 +59,6 @@ Contain doc files of %{name}. %autosetup -n %{name}-%{commit} -p1 rm -r qtsingleapplication sed -e '/qtsingleapplication.pri/d' -i %{name}.pro -cp redist/%{name}.desktop redist/%{name}-x11.desktop %build %qmake_qt5 PREFIX=%{_prefix} CONFIG+=qtsingleapplication CONFIG+=no_ffmpeg_player %{name}.pro @@ -65,11 +67,10 @@ cp redist/%{name}.desktop redist/%{name}-x11.desktop %install %make_install INSTALL_ROOT=%{buildroot} rm -rf %{buildroot}%{_datadir}/app-install -desktop-file-install --set-key=Exec --set-value="env QT_QPA_PLATFORM=xcb %{name}" --set-name="GoldenDict (X11)" --add-only-show-in="GNOME;" --dir=%{buildroot}%{_datadir}/applications redist/%{name}-x11.desktop %check appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdata.xml -desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %files %license LICENSE.txt @@ -78,7 +79,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %dir %{_datadir}/%{name} %{_datadir}/%{name}/locale %{_metainfodir}/%{name}.appdata.xml -%{_datadir}/applications/*.desktop +%{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/%{name}.png %files docs From 2a8df0eb389ec628125797abada03620cdded74d Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Sun, 15 Mar 2020 12:56:43 +0100 Subject: [PATCH 71/94] Rebased to a1c7c5b snapshot with a separate desktop action for Wayland. --- .gitignore | 1 + goldendict-add-x11-action.patch | 28 ---------------------------- goldendict.spec | 10 +++++----- sources | 2 +- 4 files changed, 7 insertions(+), 34 deletions(-) delete mode 100644 goldendict-add-x11-action.patch diff --git a/.gitignore b/.gitignore index 46236d8..d6a1885 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ goldendict-415f35e.tar.gz /goldendict-0f951b06a55f3a201891cf645a556e773bda5f52.tar.gz /goldendict-c53fe1c64061c7285b7451ff48089d443721c2a9.tar.gz /goldendict-353ea1793ed430193ce586e57c560867e4a2a55b.tar.gz +/goldendict-a1c7c5b3762c292c2620af41428c3c6c3f758f04.tar.gz diff --git a/goldendict-add-x11-action.patch b/goldendict-add-x11-action.patch deleted file mode 100644 index 22a8924..0000000 --- a/goldendict-add-x11-action.patch +++ /dev/null @@ -1,28 +0,0 @@ -From a1c7c5b3762c292c2620af41428c3c6c3f758f04 Mon Sep 17 00:00:00 2001 -From: Vitaly Zaitsev -Date: Sun, 15 Mar 2020 10:15:58 +0100 -Subject: [PATCH] Added a desktop action as a workaround to crashes on Wayland. - -Also removed deprecated Encoding directive from desktop file. - -Signed-off-by: Vitaly Zaitsev ---- - redist/goldendict.desktop | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/redist/goldendict.desktop b/redist/goldendict.desktop -index e4cbd42b..13a5fe8f 100755 ---- a/redist/goldendict.desktop -+++ b/redist/goldendict.desktop -@@ -5,6 +5,10 @@ Categories=Office;Dictionary;Education;Qt; - Name=GoldenDict - GenericName=Multiformat Dictionary - Comment=GoldenDict --Encoding=UTF-8 - Icon=goldendict - Exec=goldendict -+Actions=X11; -+ -+[Desktop Action X11] -+Name=GoldenDict (X11) -+Exec=env QT_QPA_PLATFORM=xcb goldendict diff --git a/goldendict.spec b/goldendict.spec index d347050..26362d2 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -1,17 +1,14 @@ %global owner goldendict -%global commit 353ea1793ed430193ce586e57c560867e4a2a55b +%global commit a1c7c5b3762c292c2620af41428c3c6c3f758f04 Name: goldendict Version: 1.5 -Release: 0.25.RC2%{?dist} +Release: 0.26.RC2%{?dist} Summary: A feature-rich dictionary lookup program License: GPLv3+ URL: http://goldendict.org Source0: https://github.com/%{owner}/%{name}/archive/%{commit}/%{name}-%{commit}.tar.gz -# https://github.com/goldendict/goldendict/pull/1238 -Patch100: %{name}-add-x11-action.patch - BuildRequires: cmake(Qt5LinguistTools) BuildRequires: cmake(Qt5XmlPatterns) BuildRequires: cmake(Qt5Multimedia) @@ -86,6 +83,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %{_datadir}/%{name}/help %changelog +* Sun Mar 15 2020 Vitaly Zaitsev - 1.5-0.26.RC2 +- Rebased to a1c7c5b snapshot with a separate desktop action for Wayland. + * Sun Mar 15 2020 Vitaly Zaitsev - 1.5-0.25.RC2 - Added a separate desktop icon for Gnome users with workaround. - Updated to 353ea17 snapshot with crash fixes under Qt 5.13+. diff --git a/sources b/sources index 6e7ce9a..ccec74c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (goldendict-353ea1793ed430193ce586e57c560867e4a2a55b.tar.gz) = 6ee14aeac72796a034ef2d6f345fe7f5d5838759cbad5f59830672206b9eaae2b207c97cdbdde1964fc88e18561e26496741bcecec21e24ad7892e189ea7b025 +SHA512 (goldendict-a1c7c5b3762c292c2620af41428c3c6c3f758f04.tar.gz) = 2bfd394bb2c8f6788a377970a5bc6e13e5082e9ac9e1d4b1ce70af67fd95d78f00aa543bf3ac161916fd3ea2dc767cffe6ec1f4321662ba39028e44caa2520b9 From 6b88221133acef57c41480c9ffc976c8f903c9f0 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Fri, 27 Mar 2020 11:30:53 +0100 Subject: [PATCH 72/94] Use a better workaround for crashes on Wayland. --- goldendict-pr1243.patch | 48 +++++++++++++++++++++++++++++++++++++++++ goldendict.spec | 8 ++++++- 2 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 goldendict-pr1243.patch diff --git a/goldendict-pr1243.patch b/goldendict-pr1243.patch new file mode 100644 index 0000000..10ae83d --- /dev/null +++ b/goldendict-pr1243.patch @@ -0,0 +1,48 @@ +From 6ca112b797e70774d252b3635d41b4c5d38ea9dd Mon Sep 17 00:00:00 2001 +From: Vitaly Zaitsev +Date: Fri, 27 Mar 2020 11:08:52 +0100 +Subject: [PATCH] Use a better workaround for Wayland crashes. + +GoldenDict use lots of X11 functions and it currently cannot work natively on Wayland. This workaround will force GoldenDict to use XWayland. + +Signed-off-by: Vitaly Zaitsev +--- + main.cc | 11 +++++++++++ + redist/goldendict.desktop | 5 ----- + 2 files changed, 11 insertions(+), 5 deletions(-) + +diff --git a/main.cc b/main.cc +index b3f16ed7..f6a85c07 100644 +--- a/main.cc ++++ b/main.cc +@@ -212,6 +212,17 @@ class LogFilePtrGuard + + int main( int argc, char ** argv ) + { ++#ifdef Q_OS_UNIX ++ // GoldenDict use lots of X11 functions and it currently cannot work ++ // natively on Wayland. This workaround will force GoldenDict to use ++ // XWayland. ++ char * xdg_envc = getenv("XDG_SESSION_TYPE"); ++ QString xdg_session = xdg_envc ? QString::fromLatin1(xdg_envc) : QString(); ++ if (!QString::compare(xdg_session, QString("wayland"), Qt::CaseInsensitive)) ++ { ++ setenv("QT_QPA_PLATFORM", "xcb", 1); ++ } ++#endif + #ifdef Q_OS_MAC + setenv("LANG", "en_US.UTF-8", 1); + +diff --git a/redist/goldendict.desktop b/redist/goldendict.desktop +index 13a5fe8f..9cb1d574 100755 +--- a/redist/goldendict.desktop ++++ b/redist/goldendict.desktop +@@ -7,8 +7,3 @@ GenericName=Multiformat Dictionary + Comment=GoldenDict + Icon=goldendict + Exec=goldendict +-Actions=X11; +- +-[Desktop Action X11] +-Name=GoldenDict (X11) +-Exec=env QT_QPA_PLATFORM=xcb goldendict diff --git a/goldendict.spec b/goldendict.spec index 26362d2..d612d2d 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -3,12 +3,15 @@ Name: goldendict Version: 1.5 -Release: 0.26.RC2%{?dist} +Release: 0.27.RC2%{?dist} Summary: A feature-rich dictionary lookup program License: GPLv3+ URL: http://goldendict.org Source0: https://github.com/%{owner}/%{name}/archive/%{commit}/%{name}-%{commit}.tar.gz +# https://github.com/goldendict/goldendict/pull/1243 +Patch100: %{name}-pr1243.patch + BuildRequires: cmake(Qt5LinguistTools) BuildRequires: cmake(Qt5XmlPatterns) BuildRequires: cmake(Qt5Multimedia) @@ -83,6 +86,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %{_datadir}/%{name}/help %changelog +* Fri Mar 27 2020 Vitaly Zaitsev - 1.5-0.27.RC2 +- Use a better workaround for crashes on Wayland. + * Sun Mar 15 2020 Vitaly Zaitsev - 1.5-0.26.RC2 - Rebased to a1c7c5b snapshot with a separate desktop action for Wayland. From e1216865892e6c2b449a4600495d51e60083dc72 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Fri, 27 Mar 2020 16:03:48 +0100 Subject: [PATCH 73/94] Rebased to 6ca112b snapshot with Wayland crash fixes. --- .gitignore | 1 + goldendict-pr1243.patch | 48 ----------------------------------------- goldendict.spec | 7 ++---- sources | 2 +- 4 files changed, 4 insertions(+), 54 deletions(-) delete mode 100644 goldendict-pr1243.patch diff --git a/.gitignore b/.gitignore index d6a1885..397e1f8 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ goldendict-415f35e.tar.gz /goldendict-c53fe1c64061c7285b7451ff48089d443721c2a9.tar.gz /goldendict-353ea1793ed430193ce586e57c560867e4a2a55b.tar.gz /goldendict-a1c7c5b3762c292c2620af41428c3c6c3f758f04.tar.gz +/goldendict-6ca112b797e70774d252b3635d41b4c5d38ea9dd.tar.gz diff --git a/goldendict-pr1243.patch b/goldendict-pr1243.patch deleted file mode 100644 index 10ae83d..0000000 --- a/goldendict-pr1243.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 6ca112b797e70774d252b3635d41b4c5d38ea9dd Mon Sep 17 00:00:00 2001 -From: Vitaly Zaitsev -Date: Fri, 27 Mar 2020 11:08:52 +0100 -Subject: [PATCH] Use a better workaround for Wayland crashes. - -GoldenDict use lots of X11 functions and it currently cannot work natively on Wayland. This workaround will force GoldenDict to use XWayland. - -Signed-off-by: Vitaly Zaitsev ---- - main.cc | 11 +++++++++++ - redist/goldendict.desktop | 5 ----- - 2 files changed, 11 insertions(+), 5 deletions(-) - -diff --git a/main.cc b/main.cc -index b3f16ed7..f6a85c07 100644 ---- a/main.cc -+++ b/main.cc -@@ -212,6 +212,17 @@ class LogFilePtrGuard - - int main( int argc, char ** argv ) - { -+#ifdef Q_OS_UNIX -+ // GoldenDict use lots of X11 functions and it currently cannot work -+ // natively on Wayland. This workaround will force GoldenDict to use -+ // XWayland. -+ char * xdg_envc = getenv("XDG_SESSION_TYPE"); -+ QString xdg_session = xdg_envc ? QString::fromLatin1(xdg_envc) : QString(); -+ if (!QString::compare(xdg_session, QString("wayland"), Qt::CaseInsensitive)) -+ { -+ setenv("QT_QPA_PLATFORM", "xcb", 1); -+ } -+#endif - #ifdef Q_OS_MAC - setenv("LANG", "en_US.UTF-8", 1); - -diff --git a/redist/goldendict.desktop b/redist/goldendict.desktop -index 13a5fe8f..9cb1d574 100755 ---- a/redist/goldendict.desktop -+++ b/redist/goldendict.desktop -@@ -7,8 +7,3 @@ GenericName=Multiformat Dictionary - Comment=GoldenDict - Icon=goldendict - Exec=goldendict --Actions=X11; -- --[Desktop Action X11] --Name=GoldenDict (X11) --Exec=env QT_QPA_PLATFORM=xcb goldendict diff --git a/goldendict.spec b/goldendict.spec index d612d2d..01803c1 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -1,5 +1,5 @@ %global owner goldendict -%global commit a1c7c5b3762c292c2620af41428c3c6c3f758f04 +%global commit 6ca112b797e70774d252b3635d41b4c5d38ea9dd Name: goldendict Version: 1.5 @@ -9,9 +9,6 @@ License: GPLv3+ URL: http://goldendict.org Source0: https://github.com/%{owner}/%{name}/archive/%{commit}/%{name}-%{commit}.tar.gz -# https://github.com/goldendict/goldendict/pull/1243 -Patch100: %{name}-pr1243.patch - BuildRequires: cmake(Qt5LinguistTools) BuildRequires: cmake(Qt5XmlPatterns) BuildRequires: cmake(Qt5Multimedia) @@ -87,7 +84,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %changelog * Fri Mar 27 2020 Vitaly Zaitsev - 1.5-0.27.RC2 -- Use a better workaround for crashes on Wayland. +- Rebased to 6ca112b snapshot with Wayland crash fixes. * Sun Mar 15 2020 Vitaly Zaitsev - 1.5-0.26.RC2 - Rebased to a1c7c5b snapshot with a separate desktop action for Wayland. diff --git a/sources b/sources index ccec74c..e04889d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (goldendict-a1c7c5b3762c292c2620af41428c3c6c3f758f04.tar.gz) = 2bfd394bb2c8f6788a377970a5bc6e13e5082e9ac9e1d4b1ce70af67fd95d78f00aa543bf3ac161916fd3ea2dc767cffe6ec1f4321662ba39028e44caa2520b9 +SHA512 (goldendict-6ca112b797e70774d252b3635d41b4c5d38ea9dd.tar.gz) = 021c97d1e06b1faf162505d70ccea9a7b1edad6102b19765b30ccdce6985edfe9d1d3532640da69bd6c5dc0099322cb40bbc674c4ccf0da99ffb840a8fbe4c25 From 4149c039e32d5c6aeac842c1c853caea5099b73a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 00:06:19 +0000 Subject: [PATCH 74/94] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- goldendict.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/goldendict.spec b/goldendict.spec index 01803c1..b1078dc 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -3,7 +3,7 @@ Name: goldendict Version: 1.5 -Release: 0.27.RC2%{?dist} +Release: 0.28.RC2%{?dist} Summary: A feature-rich dictionary lookup program License: GPLv3+ URL: http://goldendict.org @@ -83,6 +83,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %{_datadir}/%{name}/help %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 1.5-0.28.RC2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Mar 27 2020 Vitaly Zaitsev - 1.5-0.27.RC2 - Rebased to 6ca112b snapshot with Wayland crash fixes. From e76754f78716b69a5a65621bc2fb397b19426884 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Tue, 29 Sep 2020 11:59:58 +0200 Subject: [PATCH 75/94] Rebased to dda311c snapshot with different bugfixes. Added Git hash to the version number (will be visible in About dialog). --- goldendict.spec | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/goldendict.spec b/goldendict.spec index b1078dc..c3c5149 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -1,9 +1,10 @@ %global owner goldendict -%global commit 6ca112b797e70774d252b3635d41b4c5d38ea9dd +%global commit dda311cf9c44ffce7eadf489bfbf7f02d61fa0d4 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: goldendict Version: 1.5 -Release: 0.28.RC2%{?dist} +Release: 0.29.RC2%{?dist} Summary: A feature-rich dictionary lookup program License: GPLv3+ URL: http://goldendict.org @@ -21,17 +22,20 @@ BuildRequires: cmake(Qt5Help) BuildRequires: cmake(Qt5Gui) BuildRequires: cmake(Qt5Svg) BuildRequires: cmake(Qt5Xml) -BuildRequires: libXtst-devel -BuildRequires: hunspell-devel -BuildRequires: libvorbis-devel -BuildRequires: desktop-file-utils -BuildRequires: phonon-qt5-devel -BuildRequires: bzip2-devel -BuildRequires: lzo-devel -BuildRequires: libtiff-devel -BuildRequires: eb-devel + +BuildRequires: pkgconfig(phonon4qt5) +BuildRequires: pkgconfig(libtiff-4) +BuildRequires: pkgconfig(hunspell) +BuildRequires: pkgconfig(libzstd) +BuildRequires: pkgconfig(vorbis) +BuildRequires: pkgconfig(bzip2) +BuildRequires: pkgconfig(xtst) +BuildRequires: pkgconfig(lzo2) + BuildRequires: qtsingleapplication-qt5-devel +BuildRequires: desktop-file-utils BuildRequires: libappstream-glib +BuildRequires: eb-devel Requires: qt5-qtsvg%{?_isa} Recommends: %{name}-docs = %{?epoch:%{epoch}:}%{version}-%{release} @@ -54,8 +58,8 @@ Contain doc files of %{name}. %prep %autosetup -n %{name}-%{commit} -p1 -rm -r qtsingleapplication -sed -e '/qtsingleapplication.pri/d' -i %{name}.pro +rm -rf {qtsingleapplication,maclibs,winlibs} +sed -e '/^VERSION =/s/$/%{shortcommit}/' -e '/qtsingleapplication.pri/d' -i %{name}.pro %build %qmake_qt5 PREFIX=%{_prefix} CONFIG+=qtsingleapplication CONFIG+=no_ffmpeg_player %{name}.pro @@ -83,6 +87,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %{_datadir}/%{name}/help %changelog +* Tue Sep 29 2020 Vitaly Zaitsev - 1.5-0.29.RC2 +- Rebased to dda311c snapshot with different bugfixes. + * Tue Jul 28 2020 Fedora Release Engineering - 1.5-0.28.RC2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 45dbc5c8f025ab2a6eb2326f882d5bf4defd0ff8 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Tue, 29 Sep 2020 12:19:32 +0200 Subject: [PATCH 76/94] Added missing tarball. --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 397e1f8..3c4f6b6 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ goldendict-415f35e.tar.gz /goldendict-353ea1793ed430193ce586e57c560867e4a2a55b.tar.gz /goldendict-a1c7c5b3762c292c2620af41428c3c6c3f758f04.tar.gz /goldendict-6ca112b797e70774d252b3635d41b4c5d38ea9dd.tar.gz +/goldendict-dda311cf9c44ffce7eadf489bfbf7f02d61fa0d4.tar.gz diff --git a/sources b/sources index e04889d..9171c11 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (goldendict-6ca112b797e70774d252b3635d41b4c5d38ea9dd.tar.gz) = 021c97d1e06b1faf162505d70ccea9a7b1edad6102b19765b30ccdce6985edfe9d1d3532640da69bd6c5dc0099322cb40bbc674c4ccf0da99ffb840a8fbe4c25 +SHA512 (goldendict-dda311cf9c44ffce7eadf489bfbf7f02d61fa0d4.tar.gz) = d583fda2b98a927761d1a6462d193743b696536f10032a48554653f2a72e6f75c1358236cd512ee043efab4faf74cec4c07775bb117c380819369eebc9971ed3 From 32bea0da9e4ca7bd15b0900dc8bd3dccf32344aa Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Tue, 29 Sep 2020 12:32:12 +0200 Subject: [PATCH 77/94] Partially reverted previous changes with build requirements. --- goldendict.spec | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/goldendict.spec b/goldendict.spec index c3c5149..8e83a0f 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -23,19 +23,18 @@ BuildRequires: cmake(Qt5Gui) BuildRequires: cmake(Qt5Svg) BuildRequires: cmake(Qt5Xml) -BuildRequires: pkgconfig(phonon4qt5) -BuildRequires: pkgconfig(libtiff-4) -BuildRequires: pkgconfig(hunspell) -BuildRequires: pkgconfig(libzstd) -BuildRequires: pkgconfig(vorbis) -BuildRequires: pkgconfig(bzip2) -BuildRequires: pkgconfig(xtst) -BuildRequires: pkgconfig(lzo2) - -BuildRequires: qtsingleapplication-qt5-devel +BuildRequires: libXtst-devel +BuildRequires: hunspell-devel +BuildRequires: libvorbis-devel BuildRequires: desktop-file-utils -BuildRequires: libappstream-glib +BuildRequires: phonon-qt5-devel +BuildRequires: bzip2-devel +BuildRequires: lzo-devel +BuildRequires: libtiff-devel BuildRequires: eb-devel +BuildRequires: qtsingleapplication-qt5-devel +BuildRequires: libappstream-glib +BuildRequires: libzstd-devel Requires: qt5-qtsvg%{?_isa} Recommends: %{name}-docs = %{?epoch:%{epoch}:}%{version}-%{release} From 42f41dfd5f0ba459f6ba421aa99a1c631309f9ec Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Tue, 29 Sep 2020 12:44:56 +0200 Subject: [PATCH 78/94] Switched to the new way of forwarding commit hash to the About dialog. --- goldendict.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/goldendict.spec b/goldendict.spec index 8e83a0f..7291890 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -58,10 +58,11 @@ Contain doc files of %{name}. %prep %autosetup -n %{name}-%{commit} -p1 rm -rf {qtsingleapplication,maclibs,winlibs} -sed -e '/^VERSION =/s/$/%{shortcommit}/' -e '/qtsingleapplication.pri/d' -i %{name}.pro +sed -e '/qtsingleapplication.pri/d' -i %{name}.pro %build %qmake_qt5 PREFIX=%{_prefix} CONFIG+=qtsingleapplication CONFIG+=no_ffmpeg_player %{name}.pro +echo "1.5.0-RC2 (%{shortcommit})" > version.txt %make_build %install From 560a7d1a1db52a8e7d06ad3e7d1f74143fcf7b38 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Wed, 14 Oct 2020 12:06:30 -0600 Subject: [PATCH 79/94] Add missing #include for gcc-11 --- goldendict-gcc11.patch | 12 ++++++++++++ goldendict.spec | 6 +++++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 goldendict-gcc11.patch diff --git a/goldendict-gcc11.patch b/goldendict-gcc11.patch new file mode 100644 index 0000000..d9fb009 --- /dev/null +++ b/goldendict-gcc11.patch @@ -0,0 +1,12 @@ +diff --git a/ripemd.cc b/ripemd.cc +index 14dd491..044535f 100644 +--- a/ripemd.cc ++++ b/ripemd.cc +@@ -18,6 +18,7 @@ + + #include "ripemd.hh" + ++#include + #include + #include + diff --git a/goldendict.spec b/goldendict.spec index 7291890..feb4465 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -4,11 +4,12 @@ Name: goldendict Version: 1.5 -Release: 0.29.RC2%{?dist} +Release: 0.30.RC2%{?dist} Summary: A feature-rich dictionary lookup program License: GPLv3+ URL: http://goldendict.org Source0: https://github.com/%{owner}/%{name}/archive/%{commit}/%{name}-%{commit}.tar.gz +Patch0: goldendict-gcc11.patch BuildRequires: cmake(Qt5LinguistTools) BuildRequires: cmake(Qt5XmlPatterns) @@ -87,6 +88,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %{_datadir}/%{name}/help %changelog +* Wed Oct 14 2020 Jeff Law - 1.5-0.30.RC2 +- Fix missing #include for gcc-11 + * Tue Sep 29 2020 Vitaly Zaitsev - 1.5-0.29.RC2 - Rebased to dda311c snapshot with different bugfixes. From 7e473d729518f45668f7938745d1147d7f98e5b3 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Tue, 1 Dec 2020 15:01:18 +0100 Subject: [PATCH 80/94] Added BR: make. --- goldendict.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/goldendict.spec b/goldendict.spec index feb4465..b299a2e 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -9,7 +9,7 @@ Summary: A feature-rich dictionary lookup program License: GPLv3+ URL: http://goldendict.org Source0: https://github.com/%{owner}/%{name}/archive/%{commit}/%{name}-%{commit}.tar.gz -Patch0: goldendict-gcc11.patch +Patch0: goldendict-gcc11.patch BuildRequires: cmake(Qt5LinguistTools) BuildRequires: cmake(Qt5XmlPatterns) @@ -24,6 +24,9 @@ BuildRequires: cmake(Qt5Gui) BuildRequires: cmake(Qt5Svg) BuildRequires: cmake(Qt5Xml) +BuildRequires: gcc +BuildRequires: gcc-c++ +BuildRequires: make BuildRequires: libXtst-devel BuildRequires: hunspell-devel BuildRequires: libvorbis-devel From 19ccd1f8b62d020ca5f59bcd42c3b072efcfeae8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 12:42:56 +0000 Subject: [PATCH 81/94] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- goldendict.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/goldendict.spec b/goldendict.spec index b299a2e..b0dd174 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -4,7 +4,7 @@ Name: goldendict Version: 1.5 -Release: 0.30.RC2%{?dist} +Release: 0.31.RC2%{?dist} Summary: A feature-rich dictionary lookup program License: GPLv3+ URL: http://goldendict.org @@ -91,6 +91,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %{_datadir}/%{name}/help %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1.5-0.31.RC2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Oct 14 2020 Jeff Law - 1.5-0.30.RC2 - Fix missing #include for gcc-11 From 024198a5fa8091fc3a6e94e0d9f698e2097bb56c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 06:50:59 +0000 Subject: [PATCH 82/94] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- goldendict.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/goldendict.spec b/goldendict.spec index b0dd174..ea8d285 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -4,7 +4,7 @@ Name: goldendict Version: 1.5 -Release: 0.31.RC2%{?dist} +Release: 0.32.RC2%{?dist} Summary: A feature-rich dictionary lookup program License: GPLv3+ URL: http://goldendict.org @@ -91,6 +91,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %{_datadir}/%{name}/help %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 1.5-0.32.RC2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 1.5-0.31.RC2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 567d9fc3048ec19000578d9af0905db831876fd8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 11:31:04 +0000 Subject: [PATCH 83/94] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- goldendict.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/goldendict.spec b/goldendict.spec index ea8d285..e9f926f 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -4,7 +4,7 @@ Name: goldendict Version: 1.5 -Release: 0.32.RC2%{?dist} +Release: 0.33.RC2%{?dist} Summary: A feature-rich dictionary lookup program License: GPLv3+ URL: http://goldendict.org @@ -91,6 +91,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %{_datadir}/%{name}/help %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 1.5-0.33.RC2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Jul 22 2021 Fedora Release Engineering - 1.5-0.32.RC2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From e349ed001ee313158964d60d67427845e6965cc5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 12:43:02 +0000 Subject: [PATCH 84/94] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- goldendict.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/goldendict.spec b/goldendict.spec index e9f926f..c3a7446 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -4,7 +4,7 @@ Name: goldendict Version: 1.5 -Release: 0.33.RC2%{?dist} +Release: 0.34.RC2%{?dist} Summary: A feature-rich dictionary lookup program License: GPLv3+ URL: http://goldendict.org @@ -91,6 +91,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %{_datadir}/%{name}/help %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 1.5-0.34.RC2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jan 20 2022 Fedora Release Engineering - 1.5-0.33.RC2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 37d818146a4e7b2f5a6e961c5c00f312220a5f78 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Mon, 15 Aug 2022 14:31:33 +0200 Subject: [PATCH 85/94] Rebased to 1064880 snapshot with different bugfixes. --- .gitignore | 1 + goldendict-gcc11.patch | 12 ----- goldendict.spec | 99 ++++++++++++++++++++++-------------------- sources | 2 +- 4 files changed, 53 insertions(+), 61 deletions(-) delete mode 100644 goldendict-gcc11.patch diff --git a/.gitignore b/.gitignore index 3c4f6b6..6ef2804 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ goldendict-415f35e.tar.gz /goldendict-a1c7c5b3762c292c2620af41428c3c6c3f758f04.tar.gz /goldendict-6ca112b797e70774d252b3635d41b4c5d38ea9dd.tar.gz /goldendict-dda311cf9c44ffce7eadf489bfbf7f02d61fa0d4.tar.gz +/goldendict-1064880.tar.gz diff --git a/goldendict-gcc11.patch b/goldendict-gcc11.patch deleted file mode 100644 index d9fb009..0000000 --- a/goldendict-gcc11.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/ripemd.cc b/ripemd.cc -index 14dd491..044535f 100644 ---- a/ripemd.cc -+++ b/ripemd.cc -@@ -18,6 +18,7 @@ - - #include "ripemd.hh" - -+#include - #include - #include - diff --git a/goldendict.spec b/goldendict.spec index c3a7446..157c9ab 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -1,55 +1,55 @@ -%global owner goldendict -%global commit dda311cf9c44ffce7eadf489bfbf7f02d61fa0d4 +%global commit 1064880450a648696dfabdf698fdbeec095604e1 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -Name: goldendict -Version: 1.5 -Release: 0.34.RC2%{?dist} -Summary: A feature-rich dictionary lookup program -License: GPLv3+ -URL: http://goldendict.org -Source0: https://github.com/%{owner}/%{name}/archive/%{commit}/%{name}-%{commit}.tar.gz -Patch0: goldendict-gcc11.patch - -BuildRequires: cmake(Qt5LinguistTools) -BuildRequires: cmake(Qt5XmlPatterns) -BuildRequires: cmake(Qt5Multimedia) -BuildRequires: cmake(Qt5X11Extras) -BuildRequires: cmake(Qt5Network) -BuildRequires: cmake(Qt5WebKit) -BuildRequires: cmake(Qt5Core) -BuildRequires: cmake(Qt5DBus) -BuildRequires: cmake(Qt5Help) -BuildRequires: cmake(Qt5Gui) -BuildRequires: cmake(Qt5Svg) -BuildRequires: cmake(Qt5Xml) - -BuildRequires: gcc -BuildRequires: gcc-c++ -BuildRequires: make -BuildRequires: libXtst-devel -BuildRequires: hunspell-devel -BuildRequires: libvorbis-devel -BuildRequires: desktop-file-utils -BuildRequires: phonon-qt5-devel -BuildRequires: bzip2-devel -BuildRequires: lzo-devel -BuildRequires: libtiff-devel -BuildRequires: eb-devel -BuildRequires: qtsingleapplication-qt5-devel -BuildRequires: libappstream-glib -BuildRequires: libzstd-devel - -Requires: qt5-qtsvg%{?_isa} -Recommends: %{name}-docs = %{?epoch:%{epoch}:}%{version}-%{release} +Name: goldendict +Version: 1.5 +Release: 0.35.RC2%{?dist} + +License: GPLv3+ +Summary: A feature-rich dictionary lookup program +URL: http://goldendict.org +Source0: https://github.com/%{name}/%{name}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz + +BuildRequires: cmake(Qt5Core) +BuildRequires: cmake(Qt5DBus) +BuildRequires: cmake(Qt5Gui) +BuildRequires: cmake(Qt5Help) +BuildRequires: cmake(Qt5LinguistTools) +BuildRequires: cmake(Qt5Multimedia) +BuildRequires: cmake(Qt5Network) +BuildRequires: cmake(Qt5Svg) +BuildRequires: cmake(Qt5WebKit) +BuildRequires: cmake(Qt5X11Extras) +BuildRequires: cmake(Qt5Xml) +BuildRequires: cmake(Qt5XmlPatterns) + +BuildRequires: bzip2-devel +BuildRequires: eb-devel +BuildRequires: hunspell-devel +BuildRequires: libXtst-devel +BuildRequires: libtiff-devel +BuildRequires: libvorbis-devel +BuildRequires: libzstd-devel +BuildRequires: lzo-devel +BuildRequires: phonon-qt5-devel +BuildRequires: qtsingleapplication-qt5-devel + +BuildRequires: desktop-file-utils +BuildRequires: gcc +BuildRequires: gcc-c++ +BuildRequires: libappstream-glib +BuildRequires: make + +Requires: qt5-qtsvg%{?_isa} + +Recommends: %{name}-docs = %{?epoch:%{epoch}:}%{version}-%{release} %description -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; -Support MediaWiki-based sites to perform search; -Scan popup functionality. +GoldenDict is a feature-rich dictionary lookup program, supporting multiple +dictionary formats (StarDict/Babylon/Lingvo/Dictd/AARD/MDict/SDict) and +online dictionaries, featuring perfect article rendering with the complete +markup, illustrations and other content retained, and allowing you to type +in words without any accents or correct case. %package docs Summary: Documentation for %{name} @@ -91,6 +91,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %{_datadir}/%{name}/help %changelog +* Mon Aug 15 2022 Vitaly Zaitsev - 1.5-0.35.RC2 +- Rebased to 1064880 snapshot with different bugfixes. + * Thu Jul 21 2022 Fedora Release Engineering - 1.5-0.34.RC2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 9171c11..05c8d4a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (goldendict-dda311cf9c44ffce7eadf489bfbf7f02d61fa0d4.tar.gz) = d583fda2b98a927761d1a6462d193743b696536f10032a48554653f2a72e6f75c1358236cd512ee043efab4faf74cec4c07775bb117c380819369eebc9971ed3 +SHA512 (goldendict-1064880.tar.gz) = 1204f18d82a5933d7b8b0a66df94ded77cecff88eac0d97cf38d229c831d755c028d1be3ce5f186dd3432a65a7b55e652beb6318ee11d230004d3f8f76d68293 From 65b651f5545627775ca2538d59782819fca1da78 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Mon, 15 Aug 2022 14:44:59 +0200 Subject: [PATCH 86/94] Fixed files section. --- goldendict.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/goldendict.spec b/goldendict.spec index 157c9ab..9ec7a56 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -74,8 +74,8 @@ echo "1.5.0-RC2 (%{shortcommit})" > version.txt rm -rf %{buildroot}%{_datadir}/app-install %check -appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.appdata.xml -desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop +appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.metainfo.xml +desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %files %license LICENSE.txt @@ -83,9 +83,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %{_bindir}/%{name} %dir %{_datadir}/%{name} %{_datadir}/%{name}/locale -%{_metainfodir}/%{name}.appdata.xml -%{_datadir}/applications/%{name}.desktop +%{_datadir}/applications/*.desktop %{_datadir}/pixmaps/%{name}.png +%{_metainfodir}/*.metainfo.xml %files docs %{_datadir}/%{name}/help From 0479329ecf2449b6f975792ac6e0875e83902bae Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Tue, 13 Dec 2022 15:56:22 +0100 Subject: [PATCH 87/94] Converted license tag to SPDX format. --- .gitignore | 17 +---------------- goldendict.spec | 2 +- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 6ef2804..31b6296 100644 --- a/.gitignore +++ b/.gitignore @@ -1,16 +1 @@ -goldendict-c33fa2c.tar.gz -goldendict-4fa567e.tar.gz -goldendict-415f35e.tar.gz -/goldendict-ac4be0b.tar.gz -/goldendict-1.0.1-src.tar.bz2 -/goldendict-3bd078debb7ae506e91e5d47f88f34ab847167c3.tar.gz -/goldendict-eaa8e8f270bee84fbb1f73702d0b65c3f9f89efa.tar.gz -/goldendict-system-qtsingleapp.patch -/goldendict-04d9dc43f67b102c7727228326c05eb82d87e4f2.tar.gz -/goldendict-0f951b06a55f3a201891cf645a556e773bda5f52.tar.gz -/goldendict-c53fe1c64061c7285b7451ff48089d443721c2a9.tar.gz -/goldendict-353ea1793ed430193ce586e57c560867e4a2a55b.tar.gz -/goldendict-a1c7c5b3762c292c2620af41428c3c6c3f758f04.tar.gz -/goldendict-6ca112b797e70774d252b3635d41b4c5d38ea9dd.tar.gz -/goldendict-dda311cf9c44ffce7eadf489bfbf7f02d61fa0d4.tar.gz -/goldendict-1064880.tar.gz +/goldendict-*.tar.gz diff --git a/goldendict.spec b/goldendict.spec index 9ec7a56..81f90a2 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -5,7 +5,7 @@ Name: goldendict Version: 1.5 Release: 0.35.RC2%{?dist} -License: GPLv3+ +License: GPL-3.0-or-later Summary: A feature-rich dictionary lookup program URL: http://goldendict.org Source0: https://github.com/%{name}/%{name}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz From ec951c48b581dfd823af4a14ae722a8cba3115cb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 11:13:38 +0000 Subject: [PATCH 88/94] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- goldendict.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/goldendict.spec b/goldendict.spec index 81f90a2..23195bd 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -3,7 +3,7 @@ Name: goldendict Version: 1.5 -Release: 0.35.RC2%{?dist} +Release: 0.36.RC2%{?dist} License: GPL-3.0-or-later Summary: A feature-rich dictionary lookup program @@ -91,6 +91,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %{_datadir}/%{name}/help %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 1.5-0.36.RC2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Mon Aug 15 2022 Vitaly Zaitsev - 1.5-0.35.RC2 - Rebased to 1064880 snapshot with different bugfixes. From c892cd7a03e7b847c323ff40e27b3ef31e5ed081 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Wed, 31 May 2023 14:55:49 +0200 Subject: [PATCH 89/94] Updated to version 1.5.0. --- goldendict.spec | 16 ++++++++-------- sources | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/goldendict.spec b/goldendict.spec index 23195bd..dc8da98 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -1,14 +1,11 @@ -%global commit 1064880450a648696dfabdf698fdbeec095604e1 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) - Name: goldendict -Version: 1.5 -Release: 0.36.RC2%{?dist} +Version: 1.5.0 +Release: 1%{?dist} License: GPL-3.0-or-later Summary: A feature-rich dictionary lookup program URL: http://goldendict.org -Source0: https://github.com/%{name}/%{name}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz +Source0: https://github.com/%{name}/%{name}/archive/%{version}/%{name}-%{version}.tar.gz BuildRequires: cmake(Qt5Core) BuildRequires: cmake(Qt5DBus) @@ -60,13 +57,13 @@ BuildArch: noarch Contain doc files of %{name}. %prep -%autosetup -n %{name}-%{commit} -p1 +%autosetup -p1 rm -rf {qtsingleapplication,maclibs,winlibs} sed -e '/qtsingleapplication.pri/d' -i %{name}.pro %build %qmake_qt5 PREFIX=%{_prefix} CONFIG+=qtsingleapplication CONFIG+=no_ffmpeg_player %{name}.pro -echo "1.5.0-RC2 (%{shortcommit})" > version.txt +echo "%{version}" > version.txt %make_build %install @@ -91,6 +88,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %{_datadir}/%{name}/help %changelog +* Wed May 31 2023 Vitaly Zaitsev - 1.5.0-2 +- Updated to version 1.5.0. + * Thu Jan 19 2023 Fedora Release Engineering - 1.5-0.36.RC2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index 05c8d4a..a982e41 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (goldendict-1064880.tar.gz) = 1204f18d82a5933d7b8b0a66df94ded77cecff88eac0d97cf38d229c831d755c028d1be3ce5f186dd3432a65a7b55e652beb6318ee11d230004d3f8f76d68293 +SHA512 (goldendict-1.5.0.tar.gz) = 8a10450c40ebd7c747a61fb5d311f47cbfa6f2708867ccd6e879c0ab479513c0c0be6c038ced3fbb52754f53802746d83983d9f77c2550e7a7f84fd14c421ead From bf435ee359557cfeda8d22355a8ee26df4a5d986 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Wed, 31 May 2023 15:05:34 +0200 Subject: [PATCH 90/94] Enabled ffmpeg player. --- goldendict.spec | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/goldendict.spec b/goldendict.spec index dc8da98..f1b4a17 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -20,14 +20,21 @@ BuildRequires: cmake(Qt5X11Extras) BuildRequires: cmake(Qt5Xml) BuildRequires: cmake(Qt5XmlPatterns) -BuildRequires: bzip2-devel +BuildRequires: pkgconfig(ao) +BuildRequires: pkgconfig(bzip2) +BuildRequires: pkgconfig(hunspell) +BuildRequires: pkgconfig(libavcodec) +BuildRequires: pkgconfig(libavformat) +BuildRequires: pkgconfig(libavutil) +BuildRequires: pkgconfig(libswresample) +BuildRequires: pkgconfig(libtiff-4) +BuildRequires: pkgconfig(libzstd) +BuildRequires: pkgconfig(lzo2) +BuildRequires: pkgconfig(ogg) +BuildRequires: pkgconfig(vorbis) +BuildRequires: pkgconfig(xtst) + BuildRequires: eb-devel -BuildRequires: hunspell-devel -BuildRequires: libXtst-devel -BuildRequires: libtiff-devel -BuildRequires: libvorbis-devel -BuildRequires: libzstd-devel -BuildRequires: lzo-devel BuildRequires: phonon-qt5-devel BuildRequires: qtsingleapplication-qt5-devel @@ -62,7 +69,7 @@ rm -rf {qtsingleapplication,maclibs,winlibs} sed -e '/qtsingleapplication.pri/d' -i %{name}.pro %build -%qmake_qt5 PREFIX=%{_prefix} CONFIG+=qtsingleapplication CONFIG+=no_ffmpeg_player %{name}.pro +%qmake_qt5 PREFIX=%{_prefix} CONFIG+=qtsingleapplication %{name}.pro echo "%{version}" > version.txt %make_build @@ -90,6 +97,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %changelog * Wed May 31 2023 Vitaly Zaitsev - 1.5.0-2 - Updated to version 1.5.0. +- Enabled ffmpeg player. * Thu Jan 19 2023 Fedora Release Engineering - 1.5-0.36.RC2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From d7812b92da18d86e8f5c26ed75579c04ee0458bb Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Wed, 31 May 2023 15:25:51 +0200 Subject: [PATCH 91/94] Fixed bogus changelog entry. --- goldendict.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/goldendict.spec b/goldendict.spec index f1b4a17..7ae7874 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -95,7 +95,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %{_datadir}/%{name}/help %changelog -* Wed May 31 2023 Vitaly Zaitsev - 1.5.0-2 +* Wed May 31 2023 Vitaly Zaitsev - 1.5.0-1 - Updated to version 1.5.0. - Enabled ffmpeg player. From 26ec6d2a6c39b88d3077209ebee73d25c53497a6 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Fri, 30 Jun 2023 15:16:00 +0200 Subject: [PATCH 92/94] Disabled ffmpeg player to reduce the set of dependencies. --- goldendict.spec | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/goldendict.spec b/goldendict.spec index 7ae7874..b7aec70 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -1,6 +1,6 @@ Name: goldendict Version: 1.5.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL-3.0-or-later Summary: A feature-rich dictionary lookup program @@ -20,13 +20,8 @@ BuildRequires: cmake(Qt5X11Extras) BuildRequires: cmake(Qt5Xml) BuildRequires: cmake(Qt5XmlPatterns) -BuildRequires: pkgconfig(ao) BuildRequires: pkgconfig(bzip2) BuildRequires: pkgconfig(hunspell) -BuildRequires: pkgconfig(libavcodec) -BuildRequires: pkgconfig(libavformat) -BuildRequires: pkgconfig(libavutil) -BuildRequires: pkgconfig(libswresample) BuildRequires: pkgconfig(libtiff-4) BuildRequires: pkgconfig(libzstd) BuildRequires: pkgconfig(lzo2) @@ -69,7 +64,7 @@ rm -rf {qtsingleapplication,maclibs,winlibs} sed -e '/qtsingleapplication.pri/d' -i %{name}.pro %build -%qmake_qt5 PREFIX=%{_prefix} CONFIG+=qtsingleapplication %{name}.pro +%qmake_qt5 PREFIX=%{_prefix} CONFIG+=qtsingleapplication CONFIG+=no_ffmpeg_player %{name}.pro echo "%{version}" > version.txt %make_build @@ -95,6 +90,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %{_datadir}/%{name}/help %changelog +* Fri Jun 30 2023 Vitaly Zaitsev - 1.5.0-2 +- Disabled ffmpeg player to reduce the set of dependencies. + * Wed May 31 2023 Vitaly Zaitsev - 1.5.0-1 - Updated to version 1.5.0. - Enabled ffmpeg player. From d1ddfa1b7d0b2f2e0d08a1f6dea4b1550f33cc9f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 05:13:37 +0000 Subject: [PATCH 93/94] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- goldendict.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/goldendict.spec b/goldendict.spec index b7aec70..f7e8cbc 100644 --- a/goldendict.spec +++ b/goldendict.spec @@ -1,6 +1,6 @@ Name: goldendict Version: 1.5.0 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL-3.0-or-later Summary: A feature-rich dictionary lookup program @@ -90,6 +90,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %{_datadir}/%{name}/help %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 1.5.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Fri Jun 30 2023 Vitaly Zaitsev - 1.5.0-2 - Disabled ffmpeg player to reduce the set of dependencies. From 09cfde569f080123b8d155b762a4a0b71aa8e96d Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 30 Oct 2023 22:18:17 +0300 Subject: [PATCH 94/94] Remove unnecessary files --- sources | 1 - 1 file changed, 1 deletion(-) delete mode 100644 sources diff --git a/sources b/sources deleted file mode 100644 index a982e41..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (goldendict-1.5.0.tar.gz) = 8a10450c40ebd7c747a61fb5d311f47cbfa6f2708867ccd6e879c0ab479513c0c0be6c038ced3fbb52754f53802746d83983d9f77c2550e7a7f84fd14c421ead