- move capplet to {_datadir}/gnome/capplets

[packages/gnome-panel.git] / gnome-panel.spec

diff --git a/gnome-panel.spec b/gnome-panel.spec
index f51ab9f770c52d657618bfa435f5ce7705ec5db5..dfd79322c040cac9f97a511d4656fb670a03449f 100644 (file)
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -1,15 +1,17 @@
 Summary:       The core programs for the GNOME GUI desktop environment
 Summary(pl):   Podstawowe programy ¶rodowiska graficznego GNOME
 Name:          gnome-panel
-Version:       2.4.0
-Release:       5
+Version:       2.4.1
+Release:       3
 License:       LGPL
 Group:         X11/Applications
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.4/%{name}-%{version}.tar.bz2
-# Source0-md5: 9a81f7ebbb450611a28783900f5f2cbc
+# Source0-md5: bdef7c238e1d1eb7976f2bca3b0c8aca
 Patch0:                %{name}-clock.patch
 Patch1:                %{name}-no_launchers_on_panel.patch
 Patch2:                %{name}-focus.patch
+Patch3:                %{name}-finalize-memleak.patch
+Patch4:                %{name}-menu_icon.patch
 URL:           http://www.gnome.org/
 BuildRequires: GConf2-devel >= 2.4.0
 BuildRequires: ORBit2-devel >= 2.8.1
@@ -33,7 +35,6 @@ BuildConflicts:       GConf-devel < 1.0.9-7
 Requires(post,postun): /sbin/ldconfig
 Requires(post,postun): scrollkeeper
 Requires(post):        GConf2 >= 2.4.0
-#Requires:     gnome-applets >= 2.4.1
 Requires:      gnome-desktop >= 2.4.0
 Requires:      gnome-icon-theme >= 1.0.9
 Requires:      libgnomeui >= 2.4.0.1
@@ -89,6 +90,8 @@ Statyczne biblioteki panelu GNOME.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
 intltoolize --copy --force
@@ -112,6 +115,9 @@ rm -rf $RPM_BUILD_ROOT
 
 install %{name}/panel-default-setup.entries $RPM_BUILD_ROOT%{_datadir}/%{name}
 
+install -d $RPM_BUILD_ROOT%{_datadir}/gnome/capplets
+mv $RPM_BUILD_ROOT%{_datadir}/control-center-2.0/capplets/*.desktop $RPM_BUILD_ROOT%{_datadir}/gnome/capplets/*.desktop
+
 mv ChangeLog main-ChangeLog
 find . -name ChangeLog |awk '{src=$0; dst=$0;sub("^./","",dst);gsub("/","-",dst); print "cp " src " " dst}'|sh
 
@@ -143,7 +149,7 @@ scrollkeeper-update
 %attr(755,root,root) %{_libdir}/wnck-applet
 %attr(755,root,root) %{_libdir}/notification-area-applet
 %{_libdir}/bonobo/servers/*
-%{_datadir}/control-center-2.0/capplets/*
+%{_datadir}/gnome/capplets/*
 %{_datadir}/gnome/panel
 %{_datadir}/gnome-2.0/ui/*
 %{_datadir}/gnome-panel