diff -u -r gjiten-2.5.orig/help/C/gjiten.xml gjiten-2.5/help/C/gjiten.xml --- gjiten-2.5.orig/help/C/gjiten.xml 2006-02-14 11:42:26.000000000 -0500 +++ gjiten-2.5/help/C/gjiten.xml 2006-02-14 12:06:54.000000000 -0500 @@ -1,6 +1,6 @@ diff -u -r gjiten-2.5.orig/rpm/gjiten.spec gjiten-2.5/rpm/gjiten.spec --- gjiten-2.5.orig/rpm/gjiten.spec 2006-02-14 11:42:26.000000000 -0500 +++ gjiten-2.5/rpm/gjiten.spec 2006-02-14 12:36:56.000000000 -0500 @@ -1,5 +1,3 @@ -%define prefix /usr - Summary: Japanese dictionary for GNOME. Name: gjiten Version: 2.5 @@ -8,42 +6,48 @@ Group: Productivity/Office/Dictionary Group: X11/Applications Source: gjiten-2.5.tar.gz -BuildRoot: /var/tmp/gjiten-2.5-root +BuildRoot: %{_tmppath}/%{name}-%{version}-root Packager: Botond Botyanszki URL: http://gjiten.sourceforge.net +BuildRequires: scrollkeeper %description -Gjiten is a Japanese dictionary program for GNOME. It also has a kanji dictionary; -any combination of stroke number, radicals and search key can be used for kanji lookups. -Requires dictionary files in edict format and a working X Input Method [eg. kinput2] for Japanese input. +Gjiten is a Japanese dictionary program for GNOME. It also has a kanji +dictionary; any combination of stroke number, radicals and search key can be +used for kanji lookups. Requires dictionary files in edict format and a +working X Input Method [eg. kinput2] for Japanese input. See http://gjiten.sourceforge.net for dictionary files and updates. %prep %setup + %build -export GCONF_SCHEMA_FILE_DIR=%{_sysconfdir}/gconf/schemas -./configure --prefix=%prefix \ - --mandir=%{_mandir} +%configure make %install -export GCONF_SCHEMA_FILE_DIR=%{_sysconfdir}/gconf/schemas if [ -d $RPM_BUILD_ROOT ] ; then rm -rf $RPM_BUILD_ROOT; fi -mkdir $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT install +export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 +%makeinstall +unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL + +mv $RPM_BUILD_ROOT%{_docdir}/gjiten/* . +rmdir $RPM_BUILD_ROOT%{_docdir}/gjiten/ +rm -rf $RPM_BUILD_ROOT/var/scrollkeeper %post export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` SCHEMAS="gjiten.schemas gjiten-dicfiles.schemas" -for S in $SCHEMAS; do - gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S >/dev/nulldone +for S in $SCHEMAS; do + gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S >/dev/null done update-desktop-database %{_datadir}/applications +scrollkeeper-update %postun -#FIXME uninstall schema update-desktop-database %{_datadir}/applications +scrollkeeper-update %clean rm -rf $RPM_BUILD_ROOT @@ -51,8 +55,14 @@ %files %defattr(-, root, root) -%doc README COPYING TODO AUTHORS INSTALL NEWS ChangeLog -%{prefix}/bin/* -%{prefix}/share/* -%{_sysconfdir}/gconf/schemas/* +%doc README COPYING TODO AUTHORS INSTALL NEWS ChangeLog gjiten-doc.ja.html +%{_bindir}/gjiten %{_mandir}/man1/* +%{_datadir}/pixmaps/* +%{_datadir}/gjiten/* +%{_datadir}/applications/gjiten.desktop +%{_datadir}/application-registry/gjiten.applications +%{_datadir}/gnome/help/gjiten +%{_datadir}/omf/gjiten +%{_datadir}/locale/* +%{_sysconfdir}/gconf/schemas/*.schemas diff -u -r gjiten-2.5.orig/rpm/gjiten.spec.in gjiten-2.5/rpm/gjiten.spec.in --- gjiten-2.5.orig/rpm/gjiten.spec.in 2006-02-14 11:42:26.000000000 -0500 +++ gjiten-2.5/rpm/gjiten.spec.in 2006-02-14 12:37:37.000000000 -0500 @@ -1,5 +1,3 @@ -%define prefix /usr - Summary: Japanese dictionary for GNOME. Name: gjiten Version: @VERSION@ @@ -8,42 +6,48 @@ Group: Productivity/Office/Dictionary Group: X11/Applications Source: gjiten-@VERSION@.tar.gz -BuildRoot: /var/tmp/gjiten-@VERSION@-root +BuildRoot: %{_tmppath}/%{name}-%{version}-root Packager: Botond Botyanszki URL: http://gjiten.sourceforge.net +BuildRequires: scrollkeeper %description -Gjiten is a Japanese dictionary program for GNOME. It also has a kanji dictionary; -any combination of stroke number, radicals and search key can be used for kanji lookups. -Requires dictionary files in edict format and a working X Input Method [eg. kinput2] for Japanese input. +Gjiten is a Japanese dictionary program for GNOME. It also has a kanji +dictionary; any combination of stroke number, radicals and search key can be +used for kanji lookups. Requires dictionary files in edict format and a +working X Input Method [eg. kinput2] for Japanese input. See http://gjiten.sourceforge.net for dictionary files and updates. %prep %setup + %build -export GCONF_SCHEMA_FILE_DIR=%{_sysconfdir}/gconf/schemas -./configure --prefix=%prefix \ - --mandir=%{_mandir} +%configure make %install -export GCONF_SCHEMA_FILE_DIR=%{_sysconfdir}/gconf/schemas if [ -d $RPM_BUILD_ROOT ] ; then rm -rf $RPM_BUILD_ROOT; fi -mkdir $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT install +export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 +%makeinstall +unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL + +mv $RPM_BUILD_ROOT%{_docdir}/gjiten/* . +rmdir $RPM_BUILD_ROOT%{_docdir}/gjiten/ +rm -rf $RPM_BUILD_ROOT/var/scrollkeeper %post export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` SCHEMAS="gjiten.schemas gjiten-dicfiles.schemas" -for S in $SCHEMAS; do - gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S >/dev/nulldone +for S in $SCHEMAS; do + gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S >/dev/null done update-desktop-database %{_datadir}/applications +scrollkeeper-update %postun -#FIXME uninstall schema update-desktop-database %{_datadir}/applications +scrollkeeper-update %clean rm -rf $RPM_BUILD_ROOT @@ -51,8 +55,14 @@ %files %defattr(-, root, root) -%doc README COPYING TODO AUTHORS INSTALL NEWS ChangeLog -%{prefix}/bin/* -%{prefix}/share/* -%{_sysconfdir}/gconf/schemas/* +%doc README COPYING TODO AUTHORS INSTALL NEWS ChangeLog gjiten-doc.ja.html +%{_bindir}/gjiten %{_mandir}/man1/* +%{_datadir}/pixmaps/* +%{_datadir}/gjiten/* +%{_datadir}/applications/gjiten.desktop +%{_datadir}/application-registry/gjiten.applications +%{_datadir}/gnome/help/gjiten +%{_datadir}/omf/gjiten +%{_datadir}/locale/* +%{_sysconfdir}/gconf/schemas/*.schemas