packages (DEVEL): gnome-panel/gnome-panel.spec - up to 2.91.93

[wiget]

Author: wiget                        Date: Thu Mar 31 19:20:23 2011 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- up to 2.91.93

---- Files affected:
packages/gnome-panel:
   gnome-panel.spec (1.242.2.5 -> 1.242.2.6) 

---- Diffs:

================================================================
Index: packages/gnome-panel/gnome-panel.spec
diff -u packages/gnome-panel/gnome-panel.spec:1.242.2.5 packages/gnome-panel/gnome-panel.spec:1.242.2.6
--- packages/gnome-panel/gnome-panel.spec:1.242.2.5	Mon Mar 28 16:18:18 2011
+++ packages/gnome-panel/gnome-panel.spec	Thu Mar 31 21:20:18 2011
@@ -2,12 +2,12 @@
 Summary:	The core programs for the GNOME GUI desktop environment
 Summary(pl.UTF-8):	Podstawowe programy środowiska graficznego GNOME
 Name:		gnome-panel
-Version:	2.91.92
-Release:	2
+Version:	2.91.93
+Release:	1
 License:	LGPL
 Group:		X11/Applications
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-panel/2.91/%{name}-%{version}.tar.bz2
-# Source0-md5:	38a75aeec70f1ffa5673dc06fe05ba28
+# Source0-md5:	d1275b55c6ec4348a3314d4767923d08
 # http://bugzilla.gnome.org/show_bug.cgi?id=552049
 Patch0:		%{name}-use-sysconfig-timezone.patch
 Patch1:		%{name}-link.patch
@@ -131,7 +131,7 @@
 %prep
 %setup -q
 %patch0 -p0
-%patch1 -p1 -b .wiget
+%patch1 -p1
 
 # short circuit stopper (fix me!)
 mv ChangeLog main-ChangeLog
@@ -149,6 +149,7 @@
 %{__automake}
 %configure \
 	--disable-schemas-install \
+	--disable-schemas-compile \
 	--disable-silent-rules \
 	--enable-eds \
 	--enable-gtk-doc \
@@ -163,9 +164,6 @@
 	DESTDIR=$RPM_BUILD_ROOT \
 	GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 
-install %{name}/panel-default-setup.entries $RPM_BUILD_ROOT%{_datadir}/%{name}
-
-%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/panel-default-setup.entries
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libpanel-applet-4.la
 
 %find_lang %{name} --with-gnome --with-omf --all-name
@@ -176,36 +174,15 @@
 %post
 %scrollkeeper_update_post
 %gconf_schema_install clock.schemas
-%gconf_schema_install fish.schemas
-%gconf_schema_install panel-compatibility.schemas
-%gconf_schema_install panel-general.schemas
-%gconf_schema_install panel-global.schemas
-%gconf_schema_install panel-object.schemas
-%gconf_schema_install panel-toplevel.schemas
-%gconf_schema_install window-list.schemas
-%gconf_schema_install workspace-switcher.schemas
+%glib_compile_schemas
 %update_icon_cache hicolor
 
-%{_bindir}/gconftool-2 --direct \
-	--config-source="`%{_bindir}/gconftool-2 --get-default-source`" \
-	--load %{_datadir}/%{name}/panel-default-setup.entries > /dev/null
-%{_bindir}/gconftool-2 --direct \
-	--config-source="`%{_bindir}/gconftool-2 --get-default-source`" \
-	--load %{_datadir}/%{name}/panel-default-setup.entries /apps/panel/profiles/default > /dev/null
-
 %preun
 %gconf_schema_uninstall clock.schemas
-%gconf_schema_uninstall fish.schemas
-%gconf_schema_uninstall panel-compatibility.schemas
-%gconf_schema_uninstall panel-general.schemas
-%gconf_schema_uninstall panel-global.schemas
-%gconf_schema_uninstall panel-object.schemas
-%gconf_schema_uninstall panel-toplevel.schemas
-%gconf_schema_uninstall window-list.schemas
-%gconf_schema_uninstall workspace-switcher.schemas
 
 %postun
 %scrollkeeper_update_postun
+%glib_compile_schemas
 %update_icon_cache hicolor
 
 %post	libs -p /sbin/ldconfig
@@ -231,14 +208,15 @@
 %{_iconsdir}/hicolor/*/apps/*
 %{_mandir}/man1/*.1*
 %{_sysconfdir}/gconf/schemas/clock.schemas
-%{_sysconfdir}/gconf/schemas/fish.schemas
-%{_sysconfdir}/gconf/schemas/panel-compatibility.schemas
-%{_sysconfdir}/gconf/schemas/panel-general.schemas
-%{_sysconfdir}/gconf/schemas/panel-global.schemas
-%{_sysconfdir}/gconf/schemas/panel-object.schemas
-%{_sysconfdir}/gconf/schemas/panel-toplevel.schemas
-%{_sysconfdir}/gconf/schemas/window-list.schemas
-%{_sysconfdir}/gconf/schemas/workspace-switcher.schemas
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.applet.fish.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.applet.window-list.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.applet.workspace-switcher.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.enums.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.launcher.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.menu-button.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.object.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.toplevel.gschema.xml
 
 %files libs
 %defattr(644,root,root,755)
@@ -267,6 +245,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.242.2.6  2011/03/31 19:20:18  wiget
+- up to 2.91.93
+
 Revision 1.242.2.5  2011/03/28 14:18:18  wiget
 - rename gnome-desktop3 to gnome-desktop
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gnome-panel/gnome-panel.spec?r1=1.242.2.5&r2=1.242.2.6&f=u