X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=gconf-editor.spec;h=64e7e7fb319ed16799ccfcece87de0c08e0565e4;hb=9ef0bf854e7d4219db7ee50381a294ac06553aa2;hp=980ad69e326467161d140e9cab6709cf3bc320ff;hpb=e6f3621fb314fc8e40184d04e42194cad624cc62;p=packages%2Fgconf-editor.git

diff --git a/gconf-editor.spec b/gconf-editor.spec
index 980ad69..64e7e7f 100644
--- a/gconf-editor.spec
+++ b/gconf-editor.spec
@@ -1,39 +1,44 @@
 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.15.91
+Version:	3.0.1
 Release:	1
 License:	GPL v2+
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/gnome/sources/gconf-editor/2.15/%{name}-%{version}.tar.bz2
-# Source0-md5:	5b46ca0f177428b6c84c53cebd81831e
-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:	535eb5986d83c17a91891da26f6b78f3
+BuildRequires:	GConf2-devel >= 2.24.0
 BuildRequires:	autoconf
-BuildRequires:	automake
-BuildRequires:	gnome-common >= 2.12.0
-BuildRequires:	gnome-doc-utils >= 0.7.1
-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-devel
+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
 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
 %{__intltoolize}
@@ -41,8 +46,11 @@ Edytor do systemu konfiguracji GConf.
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
+%{__autoheader}
 %{__automake}
-%configure
+%configure \
+	--disable-silent-rules \
+	--disable-scrollkeeper
 %{__make}
 
 %install
@@ -51,14 +59,13 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-rm -r $RPM_BUILD_ROOT%{_datadir}/locale/ug
-
-%find_lang %{name} --with-gnome
+%find_lang %{name} --with-gnome --with-omf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
+%scrollkeeper_update_post
 %gconf_schema_install gconf-editor.schemas
 %update_icon_cache hicolor
 
@@ -66,14 +73,16 @@ rm -rf $RPM_BUILD_ROOT
 %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}/*
-%{_desktopdir}/*
+%attr(755,root,root) %{_bindir}/gconf-editor
+%{_desktopdir}/gconf-editor.desktop
 %{_iconsdir}/hicolor/*/*/*.png
-%{_mandir}/man1/*
-%{_pixmapsdir}/*
+%dir %{_datadir}/gconf-editor
+%{_datadir}/gconf-editor/icons
+%{_mandir}/man1/gconf-editor.1*
 %{_sysconfdir}/gconf/schemas/gconf-editor.schemas