SPECS: gnome-system-tools.spec - merged from DEVEL, 1.4.0

[aflinta]

Author: aflinta                      Date: Tue Sep  6 23:11:36 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged from DEVEL, 1.4.0

---- Files affected:
SPECS:
   gnome-system-tools.spec (1.46 -> 1.47) 

---- Diffs:

================================================================
Index: SPECS/gnome-system-tools.spec
diff -u SPECS/gnome-system-tools.spec:1.46 SPECS/gnome-system-tools.spec:1.47
--- SPECS/gnome-system-tools.spec:1.46	Sun May 15 03:17:46 2005
+++ SPECS/gnome-system-tools.spec	Wed Sep  7 01:11:30 2005
@@ -1,36 +1,38 @@
 # $Revision$, $Date$
+# TODO:
+# - "no" locale ?
 Summary:	GNOME System Tools
 Summary(pl):	GNOME System Tools - narzędzia systemowe GNOME
 Name:		gnome-system-tools
-Version:	1.2.0
-Release:	4
+Version:	1.4.0
+Release:	1
 License:	GPL v2
 Group:		Applications/System
-Source0:	http://ftp.gnome.org/pub/gnome/sources/gnome-system-tools/1.2/%{name}-%{version}.tar.bz2
-# Source0-md5:	fbcf8866ecea8b330cbe53cf8b0df55e
+Source0:	http://ftp.gnome.org/pub/gnome/sources/gnome-system-tools/1.4/%{name}-%{version}.tar.bz2
+# Source0-md5:	bbc13f526025c4da1607fa640499b6ee
 Patch0:		%{name}-desktop.patch
-Patch1:		%{name}-locale-names.patch
 URL:		http://www.gnome.org/projects/gst/
 BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake
-BuildRequires:	GConf2-devel >= 2.10.0
+BuildRequires:	GConf2-devel >= 2.12.0
 BuildRequires:	cracklib-devel
 BuildRequires:	gnome-common >= 2.8.0
-BuildRequires:	gtk+2-devel >= 2:2.6.4
+BuildRequires:	gtk+2-devel >= 2:2.8.3
 BuildRequires:	intltool >= 0.33
 BuildRequires:	libglade2-devel >= 1:2.5.1
-BuildRequires:	libgnomeui-devel >= 2.10.0-2
+BuildRequires:	libgnomeui-devel >= 2.12.0
 BuildRequires:	libtool
-BuildRequires:	libxml2-devel >= 2.6.17
-BuildRequires:	nautilus-devel >= 2.10.0
+BuildRequires:	libxml2-devel >= 2.6.21
+BuildRequires:	nautilus-devel >= 2.12.0
 BuildRequires:	pkgconfig
-BuildRequires:	system-tools-backends >= 1.2.0
-Requires(post):	GConf2
-Requires(post):	scrollkeeper
+BuildRequires:	rpmbuild(macros) >= 1.197
+BuildRequires:	system-tools-backends >= 1.4.0
+Requires(post,preun):	GConf2
+Requires(post,postun):	scrollkeeper
 Requires:	/etc/pld-release
-Requires:	gtk+2 >= 2:2.6.4
+Requires:	gtk+2 >= 2:2.8.3
 Requires:	shadow-extras
-Requires:	system-tools-backends >= 1.2.0
+Requires:	system-tools-backends >= 1.4.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -51,10 +53,6 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-
-# It IS required for proper translations in desktop files (merged during build)
-mv -f po/{no,nb}.po
 
 %build
 %{__libtoolize}
@@ -73,7 +71,6 @@
 	--enable-users \
 	--enable-disks \
 	--enable-share
-
 %{__make}
 
 %install
@@ -85,27 +82,33 @@
 
 rm -r $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-1.0/libnautilus-gst-shares.la
 
+rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
+
 %find_lang %{name} --with-gnome --all-name
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/usr/bin/scrollkeeper-update
-%gconf_schema_install
+%gconf_schema_install gnome-system-tools.schemas
+%scrollkeeper_update_post
 
-%postun -p /usr/bin/scrollkeeper-update
+%preun
+%gconf_schema_uninstall gnome-system-tools.schemas
+
+%postun
+%scrollkeeper_update_postun
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc README AUTHORS HACKING NEWS ChangeLog
 %attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/nautilus/extensions-1.0/lib*.so
-%{_pkgconfigdir}/*.pc
-%{_desktopdir}/*.desktop
 %{_datadir}/%{name}
-%{_sysconfdir}/gconf/schemas/%{name}.*
+%{_desktopdir}/*.desktop
+%attr(755,root,root) %{_libdir}/nautilus/extensions-1.0/lib*.so
 %{_omf_dest_dir}/%{name}
+%{_pkgconfigdir}/*.pc
+%{_sysconfdir}/gconf/schemas/gnome-system-tools.schemas
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -113,6 +116,29 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.47  2005/09/06 23:11:30  aflinta
+- merged from DEVEL, 1.4.0
+
+Revision 1.46.2.6  2005/08/24 08:26:29  aflinta
+- fixed schema name in post
+
+Revision 1.46.2.5  2005/08/23 14:50:22  paladine
+- added missing commit log
+
+Revision 1.46.2.4  2005/08/23 14:35:15  paladine
+- updated to 1.3.92
+- use more macros
+- sorted files
+
+Revision 1.46.2.3  2005/08/18 11:03:33  aflinta
+- rebuild with cairo, rel. 2
+
+Revision 1.46.2.2  2005/08/09 11:57:59  aflinta
+- up to version 1.3.2
+
+Revision 1.46.2.1  2005/07/29 08:42:17  wiget
+- updated to 1.3.1
+
 Revision 1.46  2005/05/15 01:17:46  ankry
 - proper locale fix (incl. desktops), rel.4
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/gnome-system-tools.spec?r1=1.46&r2=1.47&f=u