packages: gnome-panel/gnome-panel.spec - merged from DEVEL

[patrys]

Author: patrys                       Date: Sat Sep 26 21:24:58 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- merged from DEVEL

---- Files affected:
packages/gnome-panel:
   gnome-panel.spec (1.230 -> 1.231) 

---- Diffs:

================================================================
Index: packages/gnome-panel/gnome-panel.spec
diff -u packages/gnome-panel/gnome-panel.spec:1.230 packages/gnome-panel/gnome-panel.spec:1.231
--- packages/gnome-panel/gnome-panel.spec:1.230	Wed Jul  1 16:42:11 2009
+++ packages/gnome-panel/gnome-panel.spec	Sat Sep 26 23:24:52 2009
@@ -2,22 +2,19 @@
 Summary:	The core programs for the GNOME GUI desktop environment
 Summary(pl.UTF-8):	Podstawowe programy środowiska graficznego GNOME
 Name:		gnome-panel
-Version:	2.26.3
+Version:	2.28.0
 Release:	1
 License:	LGPL
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-panel/2.26/%{name}-%{version}.tar.bz2
-# Source0-md5:	38de69896976d57abb4f4720fef62fcf
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-panel/2.28/%{name}-%{version}.tar.bz2
+# Source0-md5:	9f0ea283d44bbcce67dc2e8a02fe9fad
 Patch0:		%{name}-no_launchers_on_panel.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=552049
 Patch1:		%{name}-use-sysconfig-timezone.patch
-Patch2:		%{name}-logout.patch
-Patch3:		%{name}-logout-po.patch
 URL:		http://www.gnome.org/
 BuildRequires:	GConf2-devel >= 2.26.0
 BuildRequires:	NetworkManager-devel >= 0.6
 BuildRequires:	ORBit2-devel >= 1:2.14.9
-BuildRequires:	PolicyKit-gnome-devel >= 0.7
 BuildRequires:	autoconf
 BuildRequires:	automake > 1:1.9
 BuildRequires:	dbus-devel >= 1.1.2
@@ -28,19 +25,20 @@
 BuildRequires:	gnome-common >= 2.24.0
 BuildRequires:	gnome-desktop-devel >= 2.26.0
 BuildRequires:	gnome-doc-utils >= 0.14.0
-BuildRequires:	gnome-menus-devel >= 2.26.0
+BuildRequires:	gnome-menus-devel >= 2.27.92
 BuildRequires:	gtk+2-devel >= 2:2.16.0
 BuildRequires:	gtk-doc >= 1.9
 BuildRequires:	intltool >= 0.40.0
 BuildRequires:	libbonoboui-devel >= 2.24.0
 BuildRequires:	libglade2-devel >= 1:2.6.2
 BuildRequires:	libgnomeui-devel >= 2.24.0
-BuildRequires:	libgweather-devel >= 2.24.1
+BuildRequires:	libgweather-devel >= 2.27.90
 BuildRequires:	librsvg-devel >= 2.22.0
 BuildRequires:	libtool
 BuildRequires:	libwnck-devel >= 2.26.0
 BuildRequires:	perl-base
 BuildRequires:	pkgconfig >= 1:0.15.0
+BuildRequires:	polkit-gnome-devel >= 0.93
 BuildRequires:	rpm-build >= 4.1-10
 BuildRequires:	rpmbuild(find_lang) >= 1.23
 BuildRequires:	rpmbuild(macros) >= 1.311
@@ -55,9 +53,9 @@
 Requires:	gnome-icon-theme >= 2.26.0
 Requires:	tzdata >= 2008b-4
 Requires:	xdg-menus
-Suggests:	PolicyKit-gnome >= 0.7
 Suggests:	gnome-utils-screenshot
 Suggests:	gnome-utils-search-tool
+Suggests:	polkit-gnome >= 0.93
 # sr at Latn vs. sr at latin
 Conflicts:	glibc-misc < 6:2.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -136,9 +134,6 @@
 %setup -q
 %patch0 -p1
 %patch1 -p0
-%patch2 -p1
-# needs update!
-#%patch3 -p1
 
 # short circuit stopper (fix me!)
 mv ChangeLog main-ChangeLog
@@ -172,7 +167,7 @@
 install %{name}/panel-default-setup.entries $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/panel-default-setup.entries
-rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/{ca at valencia,la}
+rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/la
 
 %find_lang %{name} --with-gnome --with-omf --all-name
 
@@ -223,17 +218,18 @@
 %attr(755,root,root) %{_bindir}/gnome-desktop-item-edit
 %attr(755,root,root) %{_bindir}/gnome-panel
 %attr(755,root,root) %{_bindir}/panel-test-applets
-%attr(755,root,root) %{_libdir}/clock-applet
-%attr(755,root,root) %{_libdir}/fish-applet-2
-%attr(755,root,root) %{_libdir}/gnome-clock-applet-mechanism
-%attr(755,root,root) %{_libdir}/notification-area-applet
-%attr(755,root,root) %{_libdir}/wnck-applet
-%{_datadir}/PolicyKit/policy/org.gnome.clockapplet.mechanism.policy
+%attr(755,root,root) %{_libexecdir}/clock-applet
+%attr(755,root,root) %{_libexecdir}/fish-applet-2
+%attr(755,root,root) %{_libexecdir}/gnome-clock-applet-mechanism
+%attr(755,root,root) %{_libexecdir}/gnome-panel-add
+%attr(755,root,root) %{_libexecdir}/notification-area-applet
+%attr(755,root,root) %{_libexecdir}/wnck-applet
 %{_datadir}/dbus-1/system-services/org.gnome.ClockApplet.Mechanism.service
 %{_datadir}/gnome-2.0/ui/*.xml
 %{_datadir}/gnome-panel
 %{_datadir}/gnome-panelrc
 %{_datadir}/idl/gnome-panel-2.0
+%{_datadir}/polkit-1/actions/org.gnome.clockapplet.mechanism.policy
 %{_desktopdir}/gnome-panel.desktop
 %{_iconsdir}/hicolor/*/apps/*
 %{_libdir}/bonobo/servers/*.server
@@ -275,6 +271,21 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.231  2009/09/26 21:24:52  patrys
+- merged from DEVEL
+
+Revision 1.230.2.4  2009/09/26 21:24:30  patrys
+- 2.28.0
+
+Revision 1.230.2.3  2009/09/09 08:58:20  patrys
+- 2.27.92
+
+Revision 1.230.2.2  2009/08/25 23:47:33  patrys
+- 2.27.91
+
+Revision 1.230.2.1  2009/07/16 09:20:45  patrys
+- 2.27.4
+
 Revision 1.230  2009/07/01 14:42:11  megabajt
 - updated to 2.26.3
 
================================================================

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