- release 3,

- added ac 2.53 dixes (ac253 patch),
- merge zh_CN patch from TurboLinux (rename Chinese translation to zh_CN from
  zh_CN.GB2312),
- added automake 1.6 fixes (am16 patch),
- merge disable_GConf_test patch from TurboLinux (disable run gconftoll during
  install target),
- added install eog scheme into GConf database in %post,
- merge sane-window-size Xiniam patch.

Changed files:
    eog.spec -> 1.17

diff --git a/eog.spec b/eog.spec
index 7bed5734b92d062061781cd1545fb3f2bb3de67c..c0b0c652f80b3a6600d85c1191e0296f35b1a4da 100644 (file)
--- a/eog.spec
+++ b/eog.spec
@@ -3,12 +3,17 @@ Summary(pl):  Oko GNOME - przegl
 Summary(pt_BR):        Visualizador de imagem Eye of GNOME
 Name:          eog
 Version:       0.6
-Release:       2
+Release:       3
 License:       GPL
 Group:         X11/Applications
 Source0:       ftp://ftp.gnome.org/pub/GNOME/unstable/sources/eog/%{name}-%{version}.tar.gz
 Source1:       %{name}.gif
 Patch0:                %{name}-am_ac.patch
+Patch1:                %{name}-am16.patch
+Patch2:                %{name}-ac253.patch
+Patch3:                %{name}-disable_GConf_test.patch
+Patch4:                %{name}-zh_CN.patch
+Patch5:                %{name}-sane-window-size.patch
 URL:           http://www.gnome.org/
 BuildRequires: GConf-devel >= 0.12
 BuildRequires: autoconf
@@ -25,6 +30,7 @@ BuildRequires:        libjpeg-devel
 BuildRequires: libpng-devel
 BuildRequires: libtool
 BuildRequires: oaf-devel >= 0.6.2
+Requires(post):        GConf
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _prefix         /usr/X11R6
@@ -44,6 +50,12 @@ Aplicativo para visualizar imagens chamado Eye of GNOME.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+mv -f ./po/zh_CN.GB2312.po ./po/zh_CN.po && rm -f ./po/zh_CN.GB2312.gm
+%patch5 -p1
 
 %build
 rm -f missing
@@ -69,13 +81,19 @@ rm -rf $RPM_BUILD_ROOT
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+GCONF_CONFIG_SOURCE=xml::%{_sysconfdir}/gconf/gconf.xml.defaults
+export GCONF_CONFIG_SOURCE
+gconftool --makefile-install-rule %{_sysconfdir}/gconf/schemas/eog.schemas
+
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
 %attr(755,root,root) %{_bindir}/*
+%{_sysconfdir}/gconf/schemas/eog.schemas
 %{_applnkdir}/Graphics/*
 %{_datadir}/idl/*.idl
 %{_datadir}/%{name}
 %{_datadir}/gnome/ui/*
 %{_datadir}/oaf/*.oaf
-%{_pixmapsdir}/%{name}
+%{_pixmapsdir}/*