From 28bf66ca0f20dcda51163ce7061302772c9d05bba50cd16c4dd4e2926b6012bd Mon Sep 17 00:00:00 2001 From: OBS User mrdocs Date: Sat, 7 Jan 2012 17:45:00 +0000 Subject: [PATCH] Accepting request 99265 from home:pgajdos:libpng15 - remove %{_infodir}/* from skkdic %files section, it is packaged in main package yet OBS-URL: https://build.opensuse.org/request/show/99265 OBS-URL: https://build.opensuse.org/package/show/M17N/ddskk?expand=0&rev=9 --- ddskk.changes | 6 ++++++ ddskk.spec | 35 ++++++++++++++++++++--------------- 2 files changed, 26 insertions(+), 15 deletions(-) diff --git a/ddskk.changes b/ddskk.changes index 17bdd4f..d636e17 100644 --- a/ddskk.changes +++ b/ddskk.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jan 6 15:33:15 UTC 2012 - pgajdos@suse.com + +- remove %{_infodir}/* from skkdic %files section, it is packaged + in main package yet + ------------------------------------------------------------------- Wed Oct 26 17:56:57 UTC 2011 - ftake@geeko.jp diff --git a/ddskk.spec b/ddskk.spec index db17a2f..46fc2ee 100644 --- a/ddskk.spec +++ b/ddskk.spec @@ -1,7 +1,7 @@ # # spec file for package ddskk # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,21 +15,28 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: ddskk # Current version does not build with current xemacs, disable for now %define use_xemacs 0 -BuildRequires: compface emacs-x11 flim giflib-devel krb5 libpng-devel libtiff-devel openldap2-devel w3m xorg-x11-devel +BuildRequires: compface +BuildRequires: emacs-x11 +BuildRequires: flim +BuildRequires: giflib-devel +BuildRequires: krb5 +BuildRequires: libpng-devel +BuildRequires: libtiff-devel +BuildRequires: openldap2-devel +BuildRequires: w3m +BuildRequires: xorg-x11-devel %if %use_xemacs -BuildRequires: flim-xemacs semi-xemacs xemacs-packages +BuildRequires: flim-xemacs +BuildRequires: semi-xemacs +BuildRequires: xemacs-packages %endif -License: GPL-2.0+ -Group: Productivity/Editors/Emacs Requires: emacs, apel, skkdic Provides: locale(emacs:ja) Version: 20050123 -Release: 267 +Release: 0 Url: http://openlab.jp/skk/index.html Source0: http://openlab.jp/skk/maintrunk/ddskk-20050123.tar.bz2 Source1: suse-start.el @@ -58,6 +65,8 @@ Patch0: fix-build-for-xemacs.patch Patch1: skk-texinfo-illegal-character.patch Patch2: bugzilla-141756-workaround.patch Summary: SKK (Simple Kana to Kanji Conversion Program) for Emacs +License: GPL-2.0+ +Group: Productivity/Editors/Emacs BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -69,11 +78,10 @@ aggressively developed. %if %use_xemacs %package -n ddskk-xemacs -License: GPL-2.0+ -Group: Productivity/Editors/Emacs Requires: xemacs, xemacs-packages, skkdic Provides: locale(xemacs:ja) Summary: SKK (`Simple Kana to Kanji conversion program') for XEmacs +Group: Productivity/Editors/Emacs %description -n ddskk-xemacs SKK (`Simple Kana to Kanji conversion program') is a Japanese input @@ -83,21 +91,19 @@ aggressively developed. %endif %package -n skkdic -License: GPL-2.0+ -Group: System/I18n/Japanese Provides: locale(scim-skk:ja) PreReq: info Url: http://openlab.jp/skk/dic.html Summary: Main Dictionary for SKK +Group: System/I18n/Japanese %description -n skkdic main dictionary for SKK %package -n skkdic-extra -License: GPL-2.0+ -Group: System/I18n/Japanese Url: http://openlab.jp/skk/dic.html Summary: optional, additional dictionaries for SKK +Group: System/I18n/Japanese %description -n skkdic-extra optional, additional dictionaries for SKK @@ -234,7 +240,6 @@ done /usr/share/skk/skk.xpm /usr/share/skk/SKK.tut /usr/share/skk/SKK.tut.E -%{_infodir}/* %files -n skkdic-extra %defattr(-,root,root)