- x32 rebuild

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

diff --git a/gconf-editor.spec b/gconf-editor.spec
index fc0f2fff424b52db8eed048d5116d4087d41a76c..7c882523eee373db50ec231bb39acac2666afd74 100644 (file)
--- a/gconf-editor.spec
+++ b/gconf-editor.spec
@@ -1,28 +1,34 @@
 Summary:       An editor for the GConf configuration system
 Summary(pl.UTF-8):     Edytor do systemu konfiguracji GConf
 Name:          gconf-editor
-Version:       2.16.0
-Release:       1
+Version:       3.0.1
+Release:       2
 License:       GPL v2+
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/gnome/sources/gconf-editor/2.16/%{name}-%{version}.tar.bz2
-# Source0-md5: e52b3177ef6ebd1fcf2c84acbe90a663
-Patch0:                %{name}-desktop.patch
-BuildRequires: GConf2-devel >= 2.14.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.12.0
-BuildRequires: gnome-doc-utils >= 0.7.2
-BuildRequires: gtk+2-devel >= 2:2.10.1
-BuildRequires: libgnomeui-devel >= 2.15.91
+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(find_lang) >= 1.23
 BuildRequires: rpmbuild(macros) >= 1.311
 BuildRequires: scrollkeeper
-Requires(post,preun):  GConf2 >= 2.14.0
-Requires(post,postun): gtk+2 >= 2:2.10.1
-Requires:      libgnomeui >= 2.14.0
+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
@@ -33,7 +39,6 @@ Edytor do systemu konfiguracji GConf.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %{__intltoolize}
@@ -41,8 +46,10 @@ Edytor do systemu konfiguracji GConf.
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 %configure \
+       --disable-silent-rules \
        --disable-scrollkeeper
 %{__make}
 
@@ -52,7 +59,7 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-%find_lang %{name} --with-gnome
+%find_lang %{name} --with-gnome --with-omf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -72,11 +79,10 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
-%attr(755,root,root) %{_bindir}/*
-%{_desktopdir}/*.desktop
+%attr(755,root,root) %{_bindir}/gconf-editor
+%{_desktopdir}/gconf-editor.desktop
 %{_iconsdir}/hicolor/*/*/*.png
-%{_mandir}/man1/*
-%{_pixmapsdir}/*
-%dir %{_omf_dest_dir}/%{name}
-%{_omf_dest_dir}/%{name}/*-C.omf
+%dir %{_datadir}/gconf-editor
+%{_datadir}/gconf-editor/icons
+%{_mandir}/man1/gconf-editor.1*
 %{_sysconfdir}/gconf/schemas/gconf-editor.schemas