X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=gnome-panel.spec;h=22a89a6f891e101f2a7f15f1a1e9ada407399163;hb=05106596e8397f5949a90658baccdb494587c27e;hp=0c53e83a7e53a343596e766bc54cd3a70a879148;hpb=6913d8340a0207ab73975be1d6bdaa167cb562bc;p=packages%2Fgnome-panel.git

diff --git a/gnome-panel.spec b/gnome-panel.spec
index 0c53e83..22a89a6 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -1,49 +1,64 @@
 Summary:	The core programs for the GNOME GUI desktop environment
 Summary(pl.UTF-8):	Podstawowe programy środowiska graficznego GNOME
 Name:		gnome-panel
-Version:	2.18.0
+Version:	2.26.2
 Release:	2
 License:	LGPL
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/gnome/sources/gnome-panel/2.18/%{name}-%{version}.tar.bz2
-# Source0-md5:	67ab5a4df1817fe14572d9e366664665
-Patch0:		%{name}-finalize-memleak.patch
-Patch1:		%{name}-no_launchers_on_panel.patch
-Patch2:		%{name}-desktop.patch
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-panel/2.26/%{name}-%{version}.tar.bz2
+# Source0-md5:	07974105fec9a6bab8be8b20b9b956e9
+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.18.0.1
-BuildRequires:	ORBit2-devel >= 1:2.14.7
+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
-BuildRequires:	evolution-data-server-devel >= 1.9.92
-BuildRequires:	gnome-common >= 2.12.0
-BuildRequires:	gnome-desktop-devel >= 2.18.0
-BuildRequires:	gnome-doc-utils >= 0.10.0
-BuildRequires:	gnome-menus-devel >= 2.17.92
-BuildRequires:	gnome-vfs2-devel >= 2.18.0
-BuildRequires:	gtk+2-devel >= 2:2.10.10
-BuildRequires:	gtk-doc >= 1.8
-BuildRequires:	intltool >= 0.35.5
-BuildRequires:	libart_lgpl-devel >= 2.3.19
-BuildRequires:	libglade2-devel >= 1:2.6.0
-BuildRequires:	libgnomeui-devel >= 2.18.0
+BuildRequires:	automake > 1:1.9
+BuildRequires:	dbus-devel >= 1.1.2
+BuildRequires:	dbus-glib-devel >= 0.74
+BuildRequires:	evolution-data-server-devel >= 2.24.0
+BuildRequires:	gettext-devel
+BuildRequires:	glib2-devel >= 1:2.19.7
+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:	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:	librsvg-devel >= 2.22.0
 BuildRequires:	libtool
-BuildRequires:	libwnck-devel >= 2.17.92
-BuildRequires:	pango-devel >= 1:1.16.0
+BuildRequires:	libwnck-devel >= 2.26.0
 BuildRequires:	perl-base
 BuildRequires:	pkgconfig >= 1:0.15.0
-BuildRequires:	python-libxml2 >= 1:2.6.27
 BuildRequires:	rpm-build >= 4.1-10
+BuildRequires:	rpmbuild(find_lang) >= 1.23
 BuildRequires:	rpmbuild(macros) >= 1.311
 BuildRequires:	scrollkeeper >= 0.3.11
 BuildConflicts:	GConf-devel < 1.0.9-7
+Requires(post,postun):	gtk+2
 Requires(post,postun):	hicolor-icon-theme
 Requires(post,postun):	scrollkeeper
 Requires(post,preun):	GConf2
 Requires:	%{name}-libs = %{version}-%{release}
-Requires:	gnome-desktop >= 2.18.0
-Requires:	gnome-icon-theme >= 2.17.91
+Requires:	gnome-desktop >= 2.26.0
+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
+# sr@Latn vs. sr@latin
+Conflicts:	glibc-misc < 6:2.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -64,12 +79,27 @@ na wolnym oprogramowaniu.
 Ten pakiet dostarcza panel GNOME2, menu oraz podstawowe aplety dla
 panelu GNOME2.
 
+%package libs
+Summary:	GNOME panel library
+Summary(pl.UTF-8):	Biblioteka panelu GNOME
+Group:		X11/Libraries
+Requires:	libgnomeui >= 2.24.0
+Requires:	librsvg >= 1:2.22.0
+
+%description libs
+GNOME panel library.
+
+%description libs -l pl.UTF-8
+Biblioteka panelu GNOME.
+
 %package devel
 Summary:	GNOME panel includes, and more
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki panelu GNOME
 Group:		X11/Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
-Requires:	libgnomeui-devel >= 2.18.0
+Requires:	gtk+2-devel >= 2:2.16.0
+Requires:	libbonoboui-devel >= 2.24.0
+Requires:	libgnomeui-devel >= 2.24.0
 
 %description devel
 Panel header files for creating GNOME panels.
@@ -89,19 +119,6 @@ Panel static libraries.
 %description static -l pl.UTF-8
 Statyczne biblioteki panelu GNOME.
 
-%package libs
-Summary:	GNOME panel library
-Summary(pl.UTF-8):	Biblioteka panelu GNOME
-Group:		X11/Libraries
-Requires:	libgnomeui >= 2.18.0
-Requires:	librsvg >= 1:2.16.1
-
-%description libs
-GNOME panel library.
-
-%description libs -l pl.UTF-8
-Biblioteka panelu GNOME.
-
 %package apidocs
 Summary:	panel-applet API documentation
 Summary(pl.UTF-8):	Dokumentacja API panel-applet
@@ -117,17 +134,24 @@ Dokumentacja API panel-applet.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
+%patch1 -p0
 %patch2 -p1
+# needs update!
+#%patch3 -p1
+
+# short circuit stopper (fix me!)
+mv ChangeLog main-ChangeLog
+find . -name ChangeLog |awk '{src=$0; dst=$0;sub("^./","",dst);gsub("/","-",dst); print "cp " src " " dst}'|sh
 
 %build
+%{__gtkdocize}
 %{__gnome_doc_prepare}
 %{__gnome_doc_common}
 %{__intltoolize}
 %{__libtoolize}
-%{__aclocal}
-%{__autoheader}
+%{__aclocal} -I m4
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 %configure \
 	--disable-schemas-install \
@@ -146,13 +170,10 @@ install -d $RPM_BUILD_ROOT{%{_pixmapsdir},%{_datadir}/%{name}}
 
 install %{name}/panel-default-setup.entries $RPM_BUILD_ROOT%{_datadir}/%{name}
 
-# short circuit stopper (fix me!)
-mv ChangeLog main-ChangeLog
-find . -name ChangeLog |awk '{src=$0; dst=$0;sub("^./","",dst);gsub("/","-",dst); print "cp " src " " dst}'|sh
-
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/panel-default-setup.entries
+rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/{ca@valencia,la}
 
-%find_lang %{name} --with-gnome --all-name
+%find_lang %{name} --with-gnome --with-omf --all-name
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -177,11 +198,6 @@ rm -rf $RPM_BUILD_ROOT
 	--config-source="`%{_bindir}/gconftool-2 --get-default-source`" \
 	--load %{_datadir}/%{name}/panel-default-setup.entries /apps/panel/profiles/default > /dev/null
 
-%banner %{name} -e << EOF
-For full functionality, you need to install
-gnome-utils-screenshot and gnome-utils-search-tool.
-EOF
-
 %preun
 %gconf_schema_uninstall clock.schemas
 %gconf_schema_uninstall fish.schemas
@@ -208,22 +224,20 @@ EOF
 %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}/gnome-2.0/ui/*
+%{_datadir}/PolicyKit/policy/org.gnome.clockapplet.mechanism.policy
+%{_datadir}/dbus-1/system-services/org.gnome.ClockApplet.Mechanism.service
+%{_datadir}/gnome-2.0/ui/*.xml
 %{_datadir}/gnome-panel
-%{_datadir}/gnome/panel
 %{_datadir}/gnome-panelrc
 %{_datadir}/idl/gnome-panel-2.0
 %{_desktopdir}/gnome-panel.desktop
 %{_iconsdir}/hicolor/*/apps/*
-%{_libdir}/bonobo/servers/*
-%{_mandir}/man1/*
-%{_omf_dest_dir}/clock
-%{_omf_dest_dir}/fish
-%{_omf_dest_dir}/gnome-panel
-%{_omf_dest_dir}/window-list
-%{_omf_dest_dir}/workspace-switcher
+%{_libdir}/bonobo/servers/*.server
+%{_mandir}/man1/*.1*
+%{_sysconfdir}/dbus-1/system.d/org.gnome.ClockApplet.Mechanism.conf
 %{_sysconfdir}/gconf/schemas/clock.schemas
 %{_sysconfdir}/gconf/schemas/fish.schemas
 %{_sysconfdir}/gconf/schemas/panel-compatibility.schemas
@@ -234,6 +248,11 @@ EOF
 %{_sysconfdir}/gconf/schemas/window-list.schemas
 %{_sysconfdir}/gconf/schemas/workspace-switcher.schemas
 
+%files libs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libpanel-applet-2.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libpanel-applet-2.so.0
+
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libpanel-applet-2.so
@@ -245,10 +264,6 @@ EOF
 %defattr(644,root,root,755)
 %{_libdir}/libpanel-applet-2.a
 
-%files libs
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libpanel-applet-2.so.*.*.*
-
 %files apidocs
 %defattr(644,root,root,755)
 %{_gtkdocdir}/panel-applet