From 9e775044522bd41ad7d56645adc79ded0a9266f6ec9e18a0c3ced4bfe825d2a6 Mon Sep 17 00:00:00 2001 From: Kirill Kirillov Date: Thu, 22 Mar 2018 09:09:33 +0000 Subject: [PATCH] Accepting request 589929 from home:alois:branches:Education - Use espeak-ng when available - Remove espeak and enchant runtime dependencies (rpm will require each library automatically) OBS-URL: https://build.opensuse.org/request/show/589929 OBS-URL: https://build.opensuse.org/package/show/Education/stardict?expand=0&rev=44 --- stardict.changes | 8 ++++++++ stardict.spec | 16 ++++++++++------ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/stardict.changes b/stardict.changes index 37add39..fb66c81 100644 --- a/stardict.changes +++ b/stardict.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Mar 21 08:29:03 UTC 2018 - aloisio@gmx.com + +- Use espeak-ng when available + +- Remove espeak and enchant runtime dependencies (rpm will require + each library automatically) + ------------------------------------------------------------------- Mon Aug 18 21:24:06 UTC 2014 - kkirill@opensuse.org diff --git a/stardict.spec b/stardict.spec index bcf3efc..eb4b740 100644 --- a/stardict.spec +++ b/stardict.spec @@ -1,7 +1,7 @@ # # spec file for package stardict # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,11 +16,17 @@ # +%if 0%{?suse_version} >= 1500 +%define espeakdev espeak-ng-compat-devel +%else +%define espeakdev espeak-devel +%endif + Name: stardict Version: 3.0.5 Release: 0 Summary: A cross-platform and internationalized dictionary -License: GPL-3.0 +License: GPL-3.0-only Group: Productivity/Office/Dictionary Url: http://stardict-4.sourceforge.net/ Source0: %{name}-%{version}.tar.bz2 @@ -33,8 +39,7 @@ Patch2: stardict-3.0.5-enable-gtk3.patch %if 0%{?suse_version} BuildRequires: update-desktop-files %endif -BuildRequires: enchant-devel -BuildRequires: espeak-devel +BuildRequires: %{espeakdev} BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: gnome-doc-utils-devel @@ -45,11 +50,10 @@ BuildRequires: libtool BuildRequires: perl-XML-Parser BuildRequires: sgml-skel BuildRequires: zlib-devel +BuildRequires: pkgconfig(enchant) BuildRequires: pkgconfig(libxml-2.0) # gucharmap now uses gtk3, but stardict still uses gtk2 # BuildRequires: gucharmap-devel -Requires: enchant -Requires: espeak BuildRoot: %{_tmppath}/%{name}-%{version}-build %description