packages: gnome-system-tools/gnome-system-tools.spec, gnome-system-tools/as...

[wiget]

Author: wiget                        Date: Sat Feb  5 22:04:55 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 2.32.0
- fix linking (adneeded.patch)
- use %{__rm} macro

---- Files affected:
packages/gnome-system-tools:
   gnome-system-tools.spec (1.85 -> 1.86) , asneeded.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/gnome-system-tools/gnome-system-tools.spec
diff -u packages/gnome-system-tools/gnome-system-tools.spec:1.85 packages/gnome-system-tools/gnome-system-tools.spec:1.86
--- packages/gnome-system-tools/gnome-system-tools.spec:1.85	Fri Feb  4 19:23:53 2011
+++ packages/gnome-system-tools/gnome-system-tools.spec	Sat Feb  5 23:04:50 2011
@@ -2,16 +2,19 @@
 Summary:	GNOME System Tools
 Summary(pl.UTF-8):	GNOME System Tools - narzędzia systemowe GNOME
 Name:		gnome-system-tools
-Version:	2.30.1
-Release:	3
+Version:	2.32.0
+Release:	1
 License:	GPL v2
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-system-tools/2.30/%{name}-%{version}.tar.bz2
-# Source0-md5:	d752a0bc2e075ba6d99fbf5d609051cc
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-system-tools/2.32/%{name}-%{version}.tar.bz2
+# Source0-md5:	93e3d21b041c771d4ac12307e4ef3392
 Patch0:		%{name}-desktop.patch
+Patch1:		asneeded.patch
 URL:		http://www.gnome.org/projects/gst/
 BuildRequires:	GConf2
 BuildRequires:	GConf2-devel >= 2.22.0
+BuildRequires:	autoconf >= 2.59-9
+BuildRequires:	automake >= 1:1.9
 BuildRequires:	dbus-devel >= 1.1.2
 BuildRequires:	docbook-dtd412-xml
 BuildRequires:	gettext-devel
@@ -20,7 +23,7 @@
 BuildRequires:	gtk+2-devel >= 2:2.16.0
 BuildRequires:	intltool
 BuildRequires:	libiw-devel
-BuildRequires:	liboobs-devel >= 2.30.0
+BuildRequires:	liboobs-devel >= 2.32.0
 BuildRequires:	libxml2-progs
 BuildRequires:	nautilus-devel >= 2.22.0
 BuildRequires:	pkgconfig
@@ -61,11 +64,19 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %{__sed} -i -e 's/en at shaw//' po/LINGUAS
-rm -f po/en at shaw.po
+%{__rm} po/en at shaw.po
 
 %build
+%{__glib_gettextize}
+%{__intltoolize}
+%{__libtoolize}
+%{__aclocal}
+%{__autoheader}
+%{__automake}
+%{__autoconf}
 %configure \
 	--disable-scrollkeeper \
 	--disable-schemas-install \
@@ -94,14 +105,12 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%gconf_schema_install gnome-system-tools.schemas
+%glib_compile_schemas
 %scrollkeeper_update_post
 %update_icon_cache hicolor
 
-%preun
-%gconf_schema_uninstall gnome-system-tools.schemas
-
 %postun
+%glib_compile_schemas
 %scrollkeeper_update_postun
 %update_icon_cache hicolor
 
@@ -123,7 +132,7 @@
 %{_pkgconfigdir}/gnome-system-tools.pc
 %dir %{_sysconfdir}/gnome-system-tools
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gnome-system-tools/user-profiles.conf
-%{_sysconfdir}/gconf/schemas/gnome-system-tools.schemas
+%{_datadir}/glib-2.0/schemas/org.gnome.system-tools.gschema.xml
 %{_iconsdir}/hicolor/*/*/*.png
 %{_iconsdir}/hicolor/*/apps/*.svg
 
@@ -133,6 +142,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.86  2011/02/05 22:04:50  wiget
+- up to 2.32.0
+- fix linking (adneeded.patch)
+- use %{__rm} macro
+
 Revision 1.85  2011/02/04 18:23:53  wiget
 - Requires(post,postun): gtk-update-icon-cache
 

================================================================
Index: packages/gnome-system-tools/asneeded.patch
diff -u /dev/null packages/gnome-system-tools/asneeded.patch:1.1
--- /dev/null	Sat Feb  5 23:04:55 2011
+++ packages/gnome-system-tools/asneeded.patch	Sat Feb  5 23:04:50 2011
@@ -0,0 +1,24 @@
+--- gnome-system-tools-2.32.0/configure.in.wiget	2011-02-05 22:17:45.830948540 +0100
++++ gnome-system-tools-2.32.0/configure.in	2011-02-05 22:19:44.130016049 +0100
+@@ -234,7 +234,7 @@ fi
+ dnl GST_DEPRECATED_FLAGS="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED"
+ GST_DEPRECATED_FLAGS=""
+ 
+-GST_LIBS="$GST_DEPENDS_LIBS $POLKIT_GTK_LIBS"
++GST_LIBS="$POLKIT_GTK_LIBS $GST_DEPENDS_LIBS"
+ GST_CFLAGS="$GST_DEPENDS_CFLAGS $POLKIT_GTK_CFLAGS $GST_DEPRECATED_FLAGS"
+ 
+ GST_TOOL_LIBS="\$(top_builddir)/src/common/libsetuptool.a $GST_LIBS"
+--- gnome-system-tools-2.32.0/src/time/Makefile.am.wiget	2011-02-05 22:45:01.509213693 +0100
++++ gnome-system-tools-2.32.0/src/time/Makefile.am	2011-02-05 22:46:05.221078393 +0100
+@@ -15,8 +15,8 @@ INCLUDES += $(GST_TOOL_CFLAGS) $(DBUS_CF
+ CLEANFILES = $(GST_TOOL_CLEANFILES)
+ EXTRA_DIST = $(GST_TOOL_EXTRA_DIST)
+ 
+-time_admin_LDADD = $(GST_TOOL_LIBS) $(DBUS_LIBS) ./e-map/libemap.a
+-time_admin_DEPENDENCIES = $(GST_TOOL_DEPENDENCIES) ./e-map/libemap.a
++time_admin_LDADD = ./e-map/libemap.a $(GST_TOOL_LIBS) $(DBUS_LIBS)
++time_admin_DEPENDENCIES = ./e-map/libemap.a $(GST_TOOL_DEPENDENCIES)
+ time_admin_SOURCES = \
+ 	time-tool.c	time-tool.h \
+ 	tz.c		tz.h \
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gnome-system-tools/gnome-system-tools.spec?r1=1.85&r2=1.86&f=u