Hello community, here is the log from the commit of package goldendict for openSUSE:Factory checked in at 2017-07-12 19:35:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/goldendict (Old) and /work/SRC/openSUSE:Factory/.goldendict.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "goldendict" Wed Jul 12 19:35:18 2017 rev:9 rq:500936 version:1.5.0~rc2+git.20170601T224956 Changes: -------- --- /work/SRC/openSUSE:Factory/goldendict/goldendict.changes 2012-03-20 12:11:04.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.goldendict.new/goldendict.changes 2017-07-12 19:35:20.713948821 +0200 @@ -1,0 +2,13 @@ +Sun Jun 4 06:32:52 UTC 2017 - [email protected] + +- Update to 1.5.0 RC2 version +- Remove install-paths.patch +- Remove goldendict-gcc47.patch + +------------------------------------------------------------------- +Sun Mar 5 10:55:36 UTC 2017 - [email protected] + +- Build with Qt5 for openSUSE Leap 42 and newer openSUSE versions, + also for SUSE 12 SP2 or newer. Other versions will still use Qt4. + +------------------------------------------------------------------- @@ -7 +20 @@ -Thu Oct 12 15:26:32 UTC 2011 - [email protected] +Thu Oct 12 15:26:32 UTC 2011 - [email protected] @@ -24 +37 @@ -Sat Aug 20 14:34:22 UTC 2010 - [email protected] +Sat Aug 20 14:34:22 UTC 2010 - [email protected] Old: ---- goldendict-1291478773.tar.bz goldendict-gcc47.patch install-paths.patch New: ---- PKGBUILD debian.changelog debian.compat debian.control debian.rules goldendict-1.5.0~rc2+git.20170601T224956.tar.gz goldendict-Debian_7.0.dsc goldendict-Debian_8.0.dsc goldendict-xUbuntu_12.04.dsc goldendict-xUbuntu_16.04.dsc goldendict.dsc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ goldendict.spec ++++++ --- /var/tmp/diff_new_pack.HFxmR8/_old 2017-07-12 19:35:21.933776508 +0200 +++ /var/tmp/diff_new_pack.HFxmR8/_new 2017-07-12 19:35:21.933776508 +0200 @@ -1,7 +1,9 @@ # # spec file for package goldendict # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012-2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright 2013 Tvangeste <[email protected]> +# Copyright 2011-2017 <[email protected]> # Copyright 2008-2009 Buschmann <[email protected]> # # All modifications and additions to the file contributed by third parties @@ -12,54 +14,72 @@ # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. - +# # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - -%define gitversion 1291478773 - Name: goldendict Summary: Dictionary Lookup Program License: GPL-3.0+ +Url: http://goldendict.org/ Group: Productivity/Office/Dictionary -Version: 1.0.1 +Version: 1.5.0~rc2+git.20170601T224956 Release: 0 -Source0: %{name}-%{gitversion}.tar.bz -#Date of goldendict-1290012314.tar: 2010-11-20 -# -#The newest .tar.gz ball can be downloaded from: -#http://gitorious.org/goldendict/goldendict/archive-tarball/master -Patch0: install-paths.patch -Patch1: goldendict-gcc47.patch +Source0: goldendict-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: hunspell >= 1.2.4 -Requires: libqt4 >= 4.5.0 +%if 0%{?suse_version} != 1110 +BuildRequires: eb-devel +%endif +BuildRequires: git BuildRequires: hunspell-devel >= 1.2.4 -BuildRequires: libqt4-devel >= 4.5.0 +BuildRequires: libtiff-devel BuildRequires: libvorbis-devel BuildRequires: libzip-devel -BuildRequires: phonon-devel +BuildRequires: lzo-devel BuildRequires: zlib-devel +BuildRequires: unzip +BuildRequires: xz %if 0%{?suse_version} -BuildRequires: libQtWebKit-devel +BuildRequires: libbz2-devel BuildRequires: update-desktop-files +%if 0%{?suse_version} > 1320 || ( 0%{?suse_version} == 1315 && 0%{?is_opensuse} ) || ( 0%{?suse_version} == 1315 && 0%{?sle_version} >= 120200) +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: pkgconfig(Qt5Help) +BuildRequires: pkgconfig(Qt5Network) +BuildRequires: pkgconfig(Qt5PrintSupport) +BuildRequires: pkgconfig(Qt5Sql) +BuildRequires: pkgconfig(Qt5Svg) +BuildRequires: pkgconfig(Qt5WebKitWidgets) +BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(Qt5X11Extras) +BuildRequires: pkgconfig(Qt5Xml) +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xtst) +%else +BuildRequires: libQtWebKit-devel +BuildRequires: libqt4-devel >= 4.5.0 +%endif +%if ( 0%{?suse_version} == 1315 && 0%{?is_opensuse} ) || 0%{?suse_version} > 1320 +BuildRequires: libao-devel +BuildRequires: pkgconfig(libavformat) +#BuildRequires: libavutil-devel +#BuildRequires: libffmpeg-devel +%endif %endif + %if 0%{?fedora_version} BuildRequires: desktop-file-utils BuildRequires: gcc-c++ BuildRequires: libXtst-devel -BuildRequires: phonon-devel +BuildRequires: bzip2-devel BuildRequires: qt-devel -%endif -%if 0%{?fedora_version} > 130 -BuildRequires: qt-webkit-devel +BuildRequires: qt-webkit-devel >= 4.5 %endif -Url: http://goldendict.berlios.de %description Feature-rich dictionary lookup program. @@ -74,6 +94,7 @@ * Support for Wikipedia, Wiktionary or any other MediaWiki-based sites * Scan popup functionality. A small window pops up with translation of a word chosen from antoher application. + * Full-text search. * And much more... Author: @@ -81,42 +102,44 @@ Konstantin Isakov %prep -%setup -n %{name}-%{gitversion} -q -#%setup -n %{name}-goldendict -q -%patch0 -%patch1 -p1 +%setup -n goldendict-%{version} -q + git init %build - %if 0%{?fedora_version} - qmake-qt4 PREFIX=/usr +%if 0%{?suse_version} + %if 0%{?suse_version} > 1320 || ( 0%{?suse_version} == 1315 && 0%{?is_opensuse} ) || (0%{?suse_version} == 1315 && 0%{?sle_version} >= 120200) + %if 0%{?is_opensuse} + %qmake5 \ + PREFIX=%{_prefix} "CONFIG+=zim_support" + %make_jobs %else - qmake PREFIX=/usr + %qmake5 \ + PREFIX=%{_prefix} "DISABLE_INTERNAL_PLAYER=1" "CONFIG+=zim_support" + %make_jobs %endif -make %{?jobs:-j %jobs} + %else + qmake PREFIX=/usr "DISABLE_INTERNAL_PLAYER=1" && make clean && make + make %{?jobs:-j %jobs} + %endif +%endif +%if 0%{?fedora_version} + qmake-qt4 PREFIX=/usr "DISABLE_INTERNAL_PLAYER=1" && make clean && make + make %{?jobs:-j %jobs} +%endif %install - MD5SUM=$(md5sum LICENSE.txt | sed 's/ .*//') - if test -f /usr/share/doc/licenses/md5/$MD5SUM ; then - ln -sf /usr/share/doc/licenses/md5/$MD5SUM LICENSE - fi - - %if 0%{?suse_version} +%if 0%{?suse_version} + %if 0%{?suse_version} > 1320 || ( 0%{?suse_version} == 1315 && 0%{?is_opensuse} ) || ( 0%{?suse_version} == 1315 && 0%{?sle_version} >= 120200) + %qmake5_install + %else INSTALL_ROOT=%{buildroot} %makeinstall + %endif %suse_update_desktop_file -r %{name} Office Dictionary - %else +%endif +%if 0%{?fedora_version} rm -rf %{buildroot} make install DESTDIR=%buildroot INSTALL_ROOT=%{buildroot} INSTALL="install -p" - %endif - - install -d %{buildroot}/%{_datadir}/%{name}/locale - install -m 644 locale/*.qm %{buildroot}/%{_datadir}/%{name}/locale - -# %if 0%{?mandriva_version} -# %post -# %update_menus -# %postun -# %clean_menus -# %endif +%endif %clean rm -rf $RPM_BUILD_ROOT @@ -130,6 +153,5 @@ %_datadir/applications/%{name}.desktop %_datadir/pixmaps/%{name}.png %_datadir/%{name} -#%_datadir/%{name}/locale/*.qm %changelog ++++++ PKGBUILD ++++++ # $Id$ # Maintainer: Jaroslav Lichtblau <[email protected]> # Contributor: m0rph <[email protected]> # Contributor: Tvangeste <[email protected]> pkgname=goldendict pkgver=1.5.0~rc2+git.20170601T224956 pkgrel=1 pkgdesc="Feature-rich dictionary lookup program" arch=('i686' 'x86_64') packager="Tvangeste <[email protected]>" url="http://goldendict.org/"; license=('GPL3') depends=('hunspell' 'libvorbis' 'libxtst' 'libzip' 'qtwebkit' 'libao' 'ffmpeg' 'lzo' 'bzip2') makedepends=('patch') provides=('stardict') changelog=debian.changelog source=("${pkgname}-${pkgver}.tar.gz") sha256sums=('SKIP') build(){ cd ${srcdir}/${pkgname}-${pkgver} qmake-qt4 PREFIX=/usr make } package() { cd ${srcdir}/${pkgname}-${pkgver} make INSTALL_ROOT=${pkgdir} install } ++++++ debian.changelog ++++++ goldendict (1.5.0) unstable; urgency=low * Initial release -- Tvangeste <[email protected]> Wed, 17 Jul 2013 12:59:45 +0200++++++ debian.compat ++++++ 5 ++++++ debian.control ++++++ Source: goldendict Section: office Priority: extra Maintainer: Tvangeste <[email protected]> Homepage: http://goldendict.org/ Standards-Version: 3.9.3 Build-Depends: cdbs, debhelper (>= 7), libao-dev, libavformat-dev, libavutil-dev, liblzo2-dev, libxtst-dev, libbz2-dev, libhunspell-dev, libphonon-dev, libqt4-dev (>= 4.5.1), libqtwebkit-dev, libvorbis-dev, libx11-dev, pkg-config, qt4-qmake, x11proto-record-dev, zlib1g-dev Package: goldendict Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: Feature-rich dictionary lookup program. * Use of WebKit for an accurate articles' representation, complete with all formatting, colors, images and links. * Support of multiple dictionary file formats: * Babylon .BGL files * StarDict .ifo/.dict/.idx/.syn dictionaries * Dictd .index/.dict(.dz) dictionary files * ABBYY Lingvo .dsl source files * ABBYY Lingvo .lsa/.dat audio archives * Support for Wikipedia, Wiktionary or any other MediaWiki-based sites * Scan popup functionality. A small window pops up with translation of a word chosen from antoher application. * And much more... ++++++ debian.rules ++++++ #!/usr/bin/make -f # -*- makefile -*- include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/qmake.mk export PREFIX=/usr QMAKE = qmake-qt4 # Uncomment this to turn on verbose mode. export DH_VERBOSE=1 export DEB_BUILD_OPTIONS=nocheck # for Ubuntu/Debian: DISTRO_NAME=$(shell (cat /etc/issue | cut -d' ' -f1-1)) # for Ubuntu: DISTRO_YEAR=$(shell (cat /etc/issue | cut -d' ' -f2-2 | cut -d'.' -f1-1)) # for Debian: DISTRO_VERSION=$(shell (cat /etc/issue | cut -d' ' -f3-3)) ifeq ($(DISTRO_NAME), Ubuntu) OLD_UBUNTU=$(shell (expr $(DISTRO_YEAR) \< 12)) ifeq ($(OLD_UBUNTU), 1) DEB_QMAKE_ARGS="DISABLE_INTERNAL_PLAYER=1" endif NEW_UBUNTU=$(shell (expr $(DISTRO_YEAR) \> 12)) ifeq ($(NEW_UBUNTU), 1) DEB_QMAKE_ARGS="'CONFIG+=no_epwing_support' DISABLE_INTERNAL_PLAYER=1" endif ifeq ($(DISTRO_YEAR), 12) DEB_QMAKE_ARGS="'CONFIG+=no_epwing_support'" endif endif ifeq ($(DISTRO_NAME), Debian) ifeq ($(DISTRO_VERSION), 6.0) DEB_QMAKE_ARGS="DISABLE_INTERNAL_PLAYER=1" endif endif build: pwd $(QMAKE) -v gcc --version dh build override_dh_check: echo "WARNING: skipping running make check for now..." ++++++ goldendict-Debian_7.0.dsc ++++++ Format: 1.0 Source: goldendict Binary: goldendict Architecture: any Version: 1.5.0~rc2+git.20170601T224956-0 Maintainer: Tvangeste <[email protected]> Homepage: http://goldendict.org/ Standards-Version: 3.9.3 Build-Depends: cdbs, debhelper (>= 7), libao-dev, libavformat-dev, libavutil-dev, libeb16-dev, liblzo2-dev, libxtst-dev, libbz2-dev, libhunspell-dev, libphonon-dev, libqt4-dev (>= 4.5.1), libqtwebkit-dev, libtiff4-dev, libvorbis-dev, libx11-dev, pkg-config, qt4-qmake, x11proto-record-dev, zlib1g-dev ++++++ goldendict-Debian_8.0.dsc ++++++ Format: 1.0 Source: goldendict Binary: goldendict Architecture: any Version: 1.5.0~rc2+git.20170601T224956-0 Maintainer: Tvangeste <[email protected]> Homepage: http://goldendict.org/ Standards-Version: 3.9.3 Build-Depends: cdbs, debhelper (>= 7), libao-dev, libavformat-dev, libavutil-dev, libeb16-dev, liblzo2-dev, libxtst-dev, libbz2-dev, libhunspell-dev, libjpeg-dev, libphonon-dev, libqt4-dev (>= 4.5.1), libqtwebkit-dev, libtiff5-dev, libvorbis-dev, libx11-dev, pkg-config, qt4-qmake, x11proto-record-dev, zlib1g-dev ++++++ goldendict-xUbuntu_12.04.dsc ++++++ Format: 1.0 Source: goldendict Binary: goldendict Architecture: any Version: 1.5.0~rc2+git.20170601T224956-0 Maintainer: Tvangeste <[email protected]> Homepage: http://goldendict.org/ Standards-Version: 3.9.3 Build-Depends: cdbs, debhelper (>= 7), libao-dev, libavformat-dev, libavutil-dev, libjpeg-dev, liblzo2-dev, libxtst-dev, libbz2-dev, libhunspell-dev, libphonon-dev, libqt4-dev (>= 4.5.1), libqtwebkit-dev, libtiff4-dev, libvorbis-dev, libx11-dev, pkg-config, qt4-qmake, x11proto-record-dev, zlib1g-dev ++++++ goldendict-xUbuntu_16.04.dsc ++++++ Format: 1.0 Source: goldendict Binary: goldendict Architecture: any Version: 1.5.0~rc2+git.20170601T224956-0 Maintainer: Tvangeste <[email protected]> Homepage: http://goldendict.org/ Standards-Version: 3.9.3 Build-Depends: cdbs, debhelper (>= 7), libao-dev, libavformat-dev, libavutil-dev, libeb16-dev, liblzo2-dev, libxtst-dev, libbz2-dev, libhunspell-dev, libphonon-dev, libqt4-dev (>= 4.5.1), libqtwebkit-dev, libtiff5-dev, libvorbis-dev, libx11-dev, pkg-config, qt4-qmake, x11proto-record-dev, zlib1g-dev ++++++ goldendict.dsc ++++++ Format: 1.0 Source: goldendict Binary: goldendict Architecture: any Version: 1.5.0-1 Maintainer: Tvangeste <[email protected]> Homepage: http://goldendict.org/ Standards-Version: 3.9.3 Build-Depends: cdbs, debhelper (>= 7), libao-dev, libavformat-dev, libavutil-dev, libeb16-dev, liblzo2-dev, libxtst-dev, libbz2-dev, libhunspell-dev, libphonon-dev, libqt4-dev (>= 4.5.1), libqtwebkit-dev, libtiff4-dev, libvorbis-dev, libx11-dev, pkg-config, qt4-qmake, x11proto-record-dev, zlib1g-dev
