Hello community, here is the log from the commit of package gjiten for openSUSE:Factory checked in at 2018-11-27 10:42:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gjiten (Old) and /work/SRC/openSUSE:Factory/.gjiten.new.19453 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gjiten" Tue Nov 27 10:42:05 2018 rev:2 rq:651897 version:2.6 Changes: -------- --- /work/SRC/openSUSE:Factory/gjiten/gjiten.changes 2017-01-24 10:32:05.617523541 +0100 +++ /work/SRC/openSUSE:Factory/.gjiten.new.19453/gjiten.changes 2018-11-27 10:42:25.196195833 +0100 @@ -1,0 +2,7 @@ +Mon Nov 26 02:56:53 UTC 2018 - Jan Engelhardt <[email protected]> + +- Unbundle radkfile and symlink to edict instead. +- Replace old $RPM_* shell vars. Remove redundant %clean section. +- Drop spec code for openSUSE < 10.2. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gjiten.spec ++++++ --- /var/tmp/diff_new_pack.aummRq/_old 2018-11-27 10:42:26.052194956 +0100 +++ /var/tmp/diff_new_pack.aummRq/_new 2018-11-27 10:42:26.052194956 +0100 @@ -1,7 +1,7 @@ # # spec file for package gjiten # -# 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 @@ -12,33 +12,17 @@ # 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/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: gjiten -BuildRequires: edict -BuildRequires: intltool -BuildRequires: libglade2-devel -BuildRequires: libgnomeui-devel -BuildRequires: libtool -BuildRequires: libxslt -BuildRequires: perl-XML-Parser -BuildRequires: scrollkeeper -BuildRequires: sgml-skel -BuildRequires: update-desktop-files -BuildRequires: w3m -BuildRequires: xmlto -%if 0%{?suse_version} >= 1130 -BuildRequires: libgnome-keyring-devel -%else -BuildRequires: gnome-keyring-devel -%endif -Requires: edict -Provides: locale(libgnome:ja) Version: 2.6 Release: 0 -Url: http://gjiten.sourceforge.net/ +Summary: Japanese Dictionary Browser for GNOME/GTK+ +License: GPL-2.0-or-later +Group: Productivity/Office/Dictionary +URL: http://gjiten.sourceforge.net/ # CVS version is here: # cvs -d:pserver:[email protected]:/cvsroot/gjiten login # (empty password) @@ -52,30 +36,40 @@ Patch348100: bugzilla-348100-empty-radicals-window.patch Patch6: gjiten-automake-fix.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build -Summary: Japanese Dictionary Browser for GNOME/GTK+ -License: GPL-2.0+ -Group: Productivity/Office/Dictionary %define gnome_prefix %(pkg-config --variable=prefix libgnomeui-2.0) %if "%gnome_prefix" == "/usr" %define gnome_etc /etc %gconf_schemas_prereq %else %define gnome_etc /etc%gnome_prefix -PreReq: gconf2 +Requires(pre): gconf2 %endif +BuildRequires: edict +BuildRequires: intltool +BuildRequires: libglade2-devel +BuildRequires: libgnomeui-devel +BuildRequires: libtool +BuildRequires: libxslt +BuildRequires: perl-XML-Parser +BuildRequires: scrollkeeper +BuildRequires: sgml-skel +BuildRequires: update-desktop-files +BuildRequires: w3m +BuildRequires: xmlto +%if 0%{?suse_version} >= 1130 +BuildRequires: libgnome-keyring-devel +%else +BuildRequires: gnome-keyring-devel +%endif +Requires: edict +Provides: locale(libgnome:ja) %description -Gjiten is a GNOME-based Japanese dictionary program. It uses some of -the xjdic code written by Jim Breen and his dictionary files. Gjiten -also has a kanji dictionary. Any combination of stroke count, radicals, -and search key can be used for kanji lookups. It requires a working X -input method (such as kinput2) for Japanese input. - - - -Authors: --------- - Botond Botyanszki <[email protected]> +Gjiten is a GNOME-based Japanese dictionary program. It uses the +JMdict/edict word dictionary, KANJIDIC kanji dictionary, and some of +the xjdic code. Any combination of stroke count, radicals, and search +key can be used for Kanji lookups. It requires a working X input +method (such as ibus) for Japanese input. %prep %setup -q @@ -88,7 +82,7 @@ %patch6 -p1 %build -export CFLAGS="$RPM_OPT_FLAGS" +export CFLAGS="%optflags" ./autogen.sh --prefix=%{gnome_prefix} \ --mandir=%{_mandir} \ --infodir=%{_infodir} \ @@ -98,42 +92,28 @@ make %{?_smp_mflags} %install -make DESTDIR=$RPM_BUILD_ROOT install -mkdir -p -m 755 $RPM_BUILD_ROOT%{_defaultdocdir}/%{name} +%make_install +ln -fsv "%_datadir/edict/radkfile" "%buildroot/%_datadir/gjiten/radkfile.utf8" +mkdir -p -m 755 %buildroot/%{_defaultdocdir}/%{name} cp AUTHORS BUGS COPYING ChangeLog* INSTALL* NEWS* README* TODO \ - $RPM_BUILD_ROOT/%{gnome_prefix}/share/doc/gjiten/gjiten-doc.ja.html \ - $RPM_BUILD_ROOT%{_defaultdocdir}/%{name} -pushd $RPM_BUILD_ROOT%{_defaultdocdir}/%{name} - for i in $RPM_BUILD_ROOT%{gnome_prefix}/share/gnome/help/gjiten/* + %buildroot/%{gnome_prefix}/share/doc/gjiten/gjiten-doc.ja.html \ + %buildroot/%{_defaultdocdir}/%{name} +pushd %buildroot/%{_defaultdocdir}/%{name} + for i in %buildroot/%{gnome_prefix}/share/gnome/help/gjiten/* do - ln -sf $( echo $i | sed "s%%^$RPM_BUILD_ROOT%%%%g" ) . + ln -sfv $(echo "$i" | sed "s%%^%buildroot/%%%%g") . done popd %find_lang gjiten -%if %suse_version > 1020 %find_gconf_schemas cat %{name}.lang %{name}.schemas_list >%{name}.lst -%else -cat %{name}.lang >%{name}.lst -%endif %suse_update_desktop_file %name Office Dictionary -%if %suse_version > 1020 %pre -f %{name}.schemas_pre %posttrans -f %{name}.schemas_posttrans %preun -f %{name}.schemas_preun -%else - -%post -export GCONF_CONFIG_SOURCE=`./%{gnome_prefix}/bin/gconftool-2 --get-default-source` -./%{gnome_prefix}/bin/gconftool-2 --makefile-install-rule ./%{gnome_etc}/gconf/schemas/gjiten.schemas >/dev/null -./%{gnome_prefix}/bin/gconftool-2 --makefile-install-rule ./%{gnome_etc}/gconf/schemas/gjiten-dicfiles.schemas >/dev/null -%endif - -%clean -#rm -rf $RPM_BUILD_ROOT; %files -f %{name}.lst %defattr(-, root, root)
