- x32 rebuild

[packages/gconf-editor.git] / gconf-editor.spec

diff --git a/gconf-editor.spec b/gconf-editor.spec
index 1c79e0304156c881b696b73901863985a1de677c..7c882523eee373db50ec231bb39acac2666afd74 100644 (file)
--- a/gconf-editor.spec
+++ b/gconf-editor.spec
@@ -1,44 +1,56 @@
 Summary:       An editor for the GConf configuration system
-Summary(pl):   Edytor do systemu konfiguracji GConf
+Summary(pl.UTF-8):     Edytor do systemu konfiguracji GConf
 Name:          gconf-editor
-Version:       2.10.0
-Release:       3
-License:       GPL v2
+Version:       3.0.1
+Release:       2
+License:       GPL v2+
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/gnome/sources/gconf-editor/2.10/%{name}-%{version}.tar.bz2
-# Source0-md5: 651a18f7eb5af91761521aa4f04ccc07
-Patch0:                %{name}-desktop.patch
-BuildRequires: GConf2-devel >= 2.10.0
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/gconf-editor/3.0/%{name}-%{version}.tar.xz
+# Source0-md5: 107b8fa250da4ae2de197a1381a099f5
+BuildRequires: GConf2-devel >= 2.24.0
 BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: gnome-common >= 2.4.0
-BuildRequires: gtk+2-devel >= 2:2.6.4
-BuildRequires: libgnomeui-devel >= 2.10.0-2
+BuildRequires: automake >= 1:1.9
+BuildRequires: docbook-dtd412-xml
+BuildRequires: gettext-tools
+BuildRequires: gnome-common >= 2.20.0
+BuildRequires: gnome-doc-utils >= 0.14.0
+BuildRequires: gtk+3-devel >= 3.0.0
+BuildRequires: intltool >= 0.40.0
 BuildRequires: libtool
 BuildRequires: pkgconfig
-BuildRequires: rpmbuild(macros) >= 1.197
+BuildRequires: rpmbuild(find_lang) >= 1.23
+BuildRequires: rpmbuild(macros) >= 1.311
 BuildRequires: scrollkeeper
-Requires(post,preun):  GConf2
+BuildRequires: tar >= 1:1.22
+BuildRequires: xz
+Requires(post,postun): gtk-update-icon-cache
 Requires(post,postun): scrollkeeper
+Requires(post,preun):  GConf2
+Requires:      hicolor-icon-theme
+# sr@Latn vs. sr@latin
+Conflicts:     glibc-misc < 6:2.7
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 An editor for the GConf configuration system.
 
-%description -l pl
+%description -l pl.UTF-8
 Edytor do systemu konfiguracji GConf.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
-gnome-doc-common
+%{__intltoolize}
+%{__gnome_doc_common}
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
+%{__autoheader}
 %{__automake}
-%configure
+%configure \
+       --disable-silent-rules \
+       --disable-scrollkeeper
 %{__make}
 
 %install
@@ -47,30 +59,30 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
-
-%find_lang %{name} --with-gnome
+%find_lang %{name} --with-gnome --with-omf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%gconf_schema_install gconf-editor.schemas
 %scrollkeeper_update_post
+%gconf_schema_install gconf-editor.schemas
+%update_icon_cache hicolor
 
 %preun
 %gconf_schema_uninstall gconf-editor.schemas
 
 %postun
 %scrollkeeper_update_postun
+%update_icon_cache hicolor
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
-%attr(755,root,root) %{_bindir}/*
-%{_sysconfdir}/gconf/schemas/*.schemas
-%{_desktopdir}/*
-%{_pixmapsdir}/*
-%{_mandir}/man1/*
-%{_omf_dest_dir}/%{name}
-%{_iconsdir}/*/*/apps/*.png
+%attr(755,root,root) %{_bindir}/gconf-editor
+%{_desktopdir}/gconf-editor.desktop
+%{_iconsdir}/hicolor/*/*/*.png
+%dir %{_datadir}/gconf-editor
+%{_datadir}/gconf-editor/icons
+%{_mandir}/man1/gconf-editor.1*
+%{_sysconfdir}/gconf/schemas/gconf-editor.schemas