Hello community, here is the log from the commit of package gjiten checked in at Tue Mar 13 00:45:48 CET 2007. -------- --- gjiten/gjiten.changes 2007-01-24 19:23:44.000000000 +0100 +++ /mounts/work_src_done/STABLE/gjiten/gjiten.changes 2007-03-12 15:58:58.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Mar 12 15:57:34 CET 2007 - mfabian@suse.de + +- fix build on STABLE: adapt installtion of schemas for + openSUSE > 10.2. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gjiten.spec ++++++ --- /var/tmp/diff_new_pack.I27574/_old 2007-03-13 00:45:31.000000000 +0100 +++ /var/tmp/diff_new_pack.I27574/_new 2007-03-13 00:45:31.000000000 +0100 @@ -24,7 +24,7 @@ Autoreqprov: on Provides: locale(libgnome:ja) Version: 2.6 -Release: 2 +Release: 8 URL: http://gjiten.sourceforge.net/ # CVS version is here: # cvs -d:pserver:anonymous@gjiten.cvs.sourceforge.net:/cvsroot/gjiten login @@ -41,7 +41,8 @@ %define gnome_prefix %(pkg-config --variable=prefix libgnomeui-2.0) %if "%gnome_prefix" == "/usr" %define gnome_etc /etc -PreReq: /usr/bin/gconftool-2 + +%gconf_schemas_prereq %else %define gnome_etc /etc%gnome_prefix PreReq: gconf2 @@ -78,7 +79,6 @@ #libtoolize --force #autoreconf -I /opt/gnome/share/aclocal --force --install --verbose export CFLAGS="$RPM_OPT_FLAGS" -#export CFLAGS="-g -O0" ./autogen.sh --prefix=%{gnome_prefix} \ --mandir=%{_mandir} \ --infodir=%{_infodir} \ @@ -100,17 +100,32 @@ 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 gjiten.lang +%files -f %{name}.lst %defattr(-, root, root) %doc %{_defaultdocdir}/%{name}/ %{gnome_prefix}/bin/* @@ -123,10 +138,15 @@ %{gnome_prefix}/share/omf/gjiten %{gnome_prefix}/share/pixmaps/* %exclude %{gnome_prefix}/share/doc/gjiten/gjiten-doc.ja.html +%if %suse_version <= 1020 %{gnome_etc}/gconf/schemas/* +%endif %{_mandir}/man1/* -%changelog -n gjiten +%changelog +* Mon Mar 12 2007 - mfabian@suse.de +- fix build on STABLE: adapt installtion of schemas for + openSUSE > 10.2. * Wed Jan 24 2007 - mfabian@suse.de - make it build in older distributions in the openSUSE build service. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org