Hello community, here is the log from the commit of package gjiten for openSUSE:Factory checked in at 2019-08-22 10:54:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gjiten (Old) and /work/SRC/openSUSE:Factory/.gjiten.new.22127 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gjiten" Thu Aug 22 10:54:43 2019 rev:4 rq:725073 version:2.6 Changes: -------- --- /work/SRC/openSUSE:Factory/gjiten/gjiten.changes 2019-08-09 16:54:40.385450162 +0200 +++ /work/SRC/openSUSE:Factory/.gjiten.new.22127/gjiten.changes 2019-08-22 10:54:49.821680094 +0200 @@ -1,0 +2,8 @@ +Wed Aug 21 12:51:47 UTC 2019 - Jan Engelhardt <[email protected]> + +- As a result of port-to-GSettings.patch(?), gjiten no longer found + its dictionaries. Add more symlinks from /usr/share/gjiten to + /usr/share/edict and drop the GJITEN_DICDIR change from + gjiten-dirs.patch. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gjiten.spec ++++++ --- /var/tmp/diff_new_pack.Css52k/_old 2019-08-22 10:54:50.465680008 +0200 +++ /var/tmp/diff_new_pack.Css52k/_new 2019-08-22 10:54:50.465680008 +0200 @@ -28,10 +28,10 @@ # cvs -d:pserver:[email protected]:/cvsroot/gjiten login # (empty password) # cvs -d:pserver:[email protected]:/cvsroot/gjiten checkout gjiten -Source: %{url}/%{name}-%{version}.tar.gz +Source: %url/%name-%version.tar.gz -Patch0: %{name}.patch -Patch1: %{name}-desktop.patch +Patch0: %name.patch +Patch1: %name-desktop.patch Patch2: configure-set-foreign.patch Patch3: stop-using-gnome-common.patch Patch4: skip-validation.patch @@ -75,25 +75,26 @@ %install %make_install -ln -fsv "%{_datadir}/edict/radkfile" "%{buildroot}/%{_datadir}/%{name}/radkfile.utf8" -%find_lang %{name} -%suse_update_desktop_file %{name} Office Dictionary - -%files -f %{name}.lang -%{_bindir}/%{name} -%dir %{_datadir}/application-registry -%{_datadir}/application-registry/%{name}.desktop -%{_datadir}/applications/%{name}.desktop -%dir %{_datadir}/doc/%{name} -%{_datadir}/doc/%{name}/%{name}-doc.ja.html -%{_datadir}/GConf/gsettings/%{name}.convert -%{_datadir}/glib-2.0/schemas/net.sf.%{name}.gschema.xml -%dir %{_datadir}/%{name} -%{_datadir}/%{name} -%{_datadir}/pixmaps/* -%dir %{_datadir}/gnome -%dir %{_datadir}/gnome/help -%dir %{_datadir}/omf -%{_mandir}/man1/%{name}.1%{ext_man} +b="%buildroot" +ln -fsv "%_datadir/edict/radkfile" "$b/%_datadir/%name/radkfile.utf8" +mkdir "$b/%_datadir/%name/dics" +for i in %_datadir/edict/*; do + ln -s "$i" "$b/%_datadir/%name/dics/" +done +%find_lang %name +%suse_update_desktop_file %name Office Dictionary + +%files -f %name.lang +%_bindir/%name +%_datadir/application-registry/ +%_datadir/applications/* +%_datadir/doc/* +%_datadir/GConf/ +%_datadir/glib-2.0/ +%_datadir/omf/ +%_datadir/%name/ +%_datadir/pixmaps/* +%_datadir/gnome/ +%_mandir/man1/*.1* %changelog ++++++ gjiten.patch ++++++ --- /var/tmp/diff_new_pack.Css52k/_old 2019-08-22 10:54:50.493680004 +0200 +++ /var/tmp/diff_new_pack.Css52k/_new 2019-08-22 10:54:50.493680004 +0200 @@ -1,7 +1,15 @@ -diff -ru gjiten-2.5.20060907.orig/po/de.po gjiten-2.5.20060907/po/de.po ---- gjiten-2.5.20060907.orig/po/de.po 2006-04-09 22:02:28.000000000 +0200 -+++ gjiten-2.5.20060907/po/de.po 2006-09-07 17:35:15.000000000 +0200 -@@ -132,10 +132,8 @@ +--- + po/de.po | 6 ++---- + po/ja.po | 4 ++-- + src/conf.c | 4 ++-- + src/constants.h | 4 ++-- + 4 files changed, 8 insertions(+), 10 deletions(-) + +Index: gjiten-2.6/po/de.po +=================================================================== +--- gjiten-2.6.orig/po/de.po ++++ gjiten-2.6/po/de.po +@@ -132,10 +132,8 @@ msgid "WordDic" msgstr "Wörterbuch" #: ../data/gjiten-settings.glade.h:28 @@ -14,10 +22,11 @@ #: ../data/gjiten-settings.glade.h:29 msgid "_English interface [LANGUAGE=C]" -diff -ru gjiten-2.5.20060907.orig/po/ja.po gjiten-2.5.20060907/po/ja.po ---- gjiten-2.5.20060907.orig/po/ja.po 2006-04-09 22:11:14.000000000 +0200 -+++ gjiten-2.5.20060907/po/ja.po 2006-09-07 17:34:53.000000000 +0200 -@@ -137,9 +137,9 @@ +Index: gjiten-2.6/po/ja.po +=================================================================== +--- gjiten-2.6.orig/po/ja.po ++++ gjiten-2.6/po/ja.po +@@ -137,9 +137,9 @@ msgid "WordDic" msgstr "単語辞典" #: ../data/gjiten-settings.glade.h:28 @@ -29,10 +38,11 @@ #: ../data/gjiten-settings.glade.h:29 msgid "_English interface [LANGUAGE=C]" -diff -ru gjiten-2.5.20060907.orig/src/conf.c gjiten-2.5.20060907/src/conf.c ---- gjiten-2.5.20060907.orig/src/conf.c 2005-12-10 22:39:45.000000000 +0100 -+++ gjiten-2.5.20060907/src/conf.c 2006-09-07 17:35:55.000000000 +0200 -@@ -64,8 +64,8 @@ +Index: gjiten-2.6/src/conf.c +=================================================================== +--- gjiten-2.6.orig/src/conf.c ++++ gjiten-2.6/src/conf.c +@@ -64,8 +64,8 @@ GjitenConfig *conf_load() { conf->kdiccfg[CREF] = TRUE; conf->toolbar = TRUE; conf->menubar = TRUE; @@ -43,10 +53,11 @@ if (conf->kanjidic == NULL) conf->kanjidic = g_new0(GjitenDicfile, 1); conf->kanjidic->path = GJITEN_DICDIR"/kanjidic"; conf->dictpath = GJITEN_DICDIR; -diff -ru gjiten-2.5.20060907.orig/src/constants.h gjiten-2.5.20060907/src/constants.h ---- gjiten-2.5.20060907.orig/src/constants.h 2005-12-10 22:39:45.000000000 +0100 -+++ gjiten-2.5.20060907/src/constants.h 2006-09-07 17:38:06.000000000 +0200 -@@ -1,14 +1,14 @@ +Index: gjiten-2.6/src/constants.h +=================================================================== +--- gjiten-2.6.orig/src/constants.h ++++ gjiten-2.6/src/constants.h +@@ -1,8 +1,8 @@ #ifndef __CONSTANTS_H__ #define __CONSTANTS_H__ @@ -57,10 +68,3 @@ #define DEFMAXWORDMATCHES 100 #define MAXDICFILES 100 - #define VINFL_FILENAME GJITEN_DATADIR"/vconj.utf8" - #define RADKFILE_NAME GJITEN_DATADIR"/radkfile.utf8" --#define GJITEN_DICDIR GJITEN_DATADIR"/dics" -+#define GJITEN_DICDIR "/usr/share/edict" - - #define GCONF_ROOT "/apps/gjiten" - #define GCONF_PATH_GENERAL GCONF_ROOT"/general"
