- move capplet to {_datadir}/gnome/capplets

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

diff --git a/gnome-panel.spec b/gnome-panel.spec
index e08822fa8a7d6ec8502fceca3f5de502ed1967d3..dfd79322c040cac9f97a511d4656fb670a03449f 100644 (file)
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -1,37 +1,44 @@
 Summary:       The core programs for the GNOME GUI desktop environment
 Summary(pl):   Podstawowe programy ¶rodowiska graficznego GNOME
 Name:          gnome-panel
-Version:       2.3.6
-Release:       1
+Version:       2.4.1
+Release:       3
 License:       LGPL
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.3/%{name}-%{version}.tar.bz2
-# Source0-md5: 74118d98b3546b799269b349d1d2c657
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.4/%{name}-%{version}.tar.bz2
+# 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.3.3
-BuildRequires: ORBit2-devel >= 2.7.5-1
+BuildRequires: GConf2-devel >= 2.4.0
+BuildRequires: ORBit2-devel >= 2.8.1
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: glib2-devel >= 2.2.1
+BuildRequires: glib2-devel >= 2.2.3
 BuildRequires: gnome-common >= 2.3.0
-BuildRequires: gnome-desktop-devel >= 2.3.6
-BuildRequires: gtk+2-devel >= 2.2.1
-BuildRequires:  gtk-doc >= 1.0
-BuildRequires: intltool >= 0.23
-BuildRequires: libart_lgpl-devel >= 2.3.13
+BuildRequires: gnome-desktop-devel >= 2.4.0
+BuildRequires: gtk+2-devel >= 2.2.4
+BuildRequires: gtk-doc >= 1.1
+BuildRequires: intltool >= 0.27.2
+BuildRequires: libart_lgpl-devel >= 2.3.15
 BuildRequires: libglade2-devel >= 2.0.1
-BuildRequires: libgnomeui-devel >= 2.3.3.1-2
+BuildRequires: libgnomeui-devel >= 2.4.0.1
 BuildRequires: libtool
-BuildRequires: libwnck-devel >= 2.3.0
-BuildRequires: pkgconfig >= 0.12.0
+BuildRequires: libwnck-devel >= 2.4.0
+BuildRequires: pkgconfig >= 0.15.0
 BuildRequires: rpm-build >= 4.1-10
 BuildRequires: scrollkeeper >= 0.3.11
 BuildConflicts:        GConf-devel < 1.0.9-7
-Requires(post,postun): /sbin/ldconfig
-Requires(post,postun): scrollkeeper
-Requires(post):        GConf2 >= 2.3.3
-Requires:      gnome-desktop >= 2.3.6
-Requires:      libgnomeui >= 2.3.3.1-2
+Requires(post,postun): /sbin/ldconfig
+Requires(post,postun): scrollkeeper
+Requires(post):        GConf2 >= 2.4.0
+Requires:      gnome-desktop >= 2.4.0
+Requires:      gnome-icon-theme >= 1.0.9
+Requires:      libgnomeui >= 2.4.0.1
+Requires:      librsvg >= 2.4.0-3
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -40,7 +47,7 @@ applications and desktop tools to be used in conjunction with a window
 manager for the X Window System. GNOME is similar in purpose and scope
 to CDE and KDE, but GNOME is based completely on free software.
 
-The GNOME panel packages provides the gnome panel, menus and some
+The gnome-panel packages provides the GNOME panel, menus and some
 basic applets for the panel.
 
 %description -l pl
@@ -57,8 +64,8 @@ Summary:      GNOME panel includes, and more
 Summary(pl):   Pliki nag³ówkowe biblioteki panelu GNOME
 Group:         X11/Development/Libraries
 Requires:      %{name} = %{version}
-Requires:      libgnomeui-devel >= 2.3.3.1-2
 Requires:      gtk-doc-common
+Requires:      libgnomeui-devel >= 2.4.0.1
 
 %description devel
 Panel header files for creating GNOME panels.
@@ -80,6 +87,11 @@ Statyczne biblioteki panelu GNOME.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
 intltoolize --copy --force
@@ -99,10 +111,13 @@ glib-gettextize --copy --force
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT 
+       DESTDIR=$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
 
@@ -119,7 +134,7 @@ scrollkeeper-update
 --config-source="`%{_bindir}/gconftool-2 --get-default-source`" \
 --load %{_datadir}/%{name}/panel-default-setup.entries > /dev/null
 
-%postun        
+%postun
 /sbin/ldconfig
 scrollkeeper-update
 
@@ -134,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