- hm, i think this depandancy isnt hard required (BR on this for

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

diff --git a/gnome-panel.spec b/gnome-panel.spec
index 4ac6ddba59010b329e4a60cafa8d99f15bf7d8e7..f51ab9f770c52d657618bfa435f5ce7705ec5db5 100644 (file)
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -1,37 +1,43 @@
 Summary:       The core programs for the GNOME GUI desktop environment
 Summary(pl):   Podstawowe programy ¶rodowiska graficznego GNOME
 Name:          gnome-panel
-Version:       2.3.1
-Release:       3
+Version:       2.4.0
+Release:       5
 License:       LGPL
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.3/%{name}-%{version}.tar.bz2
-Patch0:                %{name}-locale-sp.patch
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.4/%{name}-%{version}.tar.bz2
+# Source0-md5: 9a81f7ebbb450611a28783900f5f2cbc
+Patch0:                %{name}-clock.patch
+Patch1:                %{name}-no_launchers_on_panel.patch
+Patch2:                %{name}-focus.patch
 URL:           http://www.gnome.org/
+BuildRequires: GConf2-devel >= 2.4.0
+BuildRequires: ORBit2-devel >= 2.8.1
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: GConf2-devel >= 2.3.0
-BuildRequires: glib2-devel >= 2.2.0
-BuildRequires: gnome-desktop-devel >= 2.3.1
-BuildRequires: gnome-common >= 1.2.4
-BuildRequires: gtk+2-devel >= 2.2.0
-BuildRequires:  gtk-doc >= 1.0
-BuildRequires: intltool >= 0.23
-BuildRequires: libart_lgpl-devel >= 2.3.11
+BuildRequires: glib2-devel >= 2.2.3
+BuildRequires: gnome-common >= 2.3.0
+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.2.0
+BuildRequires: libgnomeui-devel >= 2.4.0.1
 BuildRequires: libtool
-BuildRequires: libwnck-devel >= 2.3.0
-BuildRequires: ORBit2-devel >= 2.6.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): scrollkeeper
-Requires(post,postun): /sbin/ldconfig
-Requires(post):        GConf2 >= 2.3.0
-Requires:      gnome-desktop >= 2.3.1
-Requires:      libgnomeui >= 2.2.0
+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
+Requires:      librsvg >= 2.4.0-3
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -40,7 +46,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 +63,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.0
 Requires:      gtk-doc-common
+Requires:      libgnomeui-devel >= 2.4.0.1
 
 %description devel
 Panel header files for creating GNOME panels.
@@ -80,9 +86,9 @@ Statyczne biblioteki panelu GNOME.
 
 %prep
 %setup -q
-%patch -p1
-
-mv -f po/{sp,sr@cyrillic}.po
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 intltoolize --copy --force
@@ -102,7 +108,9 @@ 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}
 
 mv ChangeLog main-ChangeLog
 find . -name ChangeLog |awk '{src=$0; dst=$0;sub("^./","",dst);gsub("/","-",dst); print "cp " src " " dst}'|sh
@@ -116,8 +124,11 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/ldconfig
 scrollkeeper-update
 %gconf_schema_install
+%{_bindir}/gconftool-2 --direct \
+--config-source="`%{_bindir}/gconftool-2 --get-default-source`" \
+--load %{_datadir}/%{name}/panel-default-setup.entries > /dev/null
 
-%postun        
+%postun
 /sbin/ldconfig
 scrollkeeper-update
 
@@ -133,11 +144,10 @@ scrollkeeper-update
 %attr(755,root,root) %{_libdir}/notification-area-applet
 %{_libdir}/bonobo/servers/*
 %{_datadir}/control-center-2.0/capplets/*
-%{_datadir}/fish
-%{_datadir}/gen_util
 %{_datadir}/gnome/panel
 %{_datadir}/gnome-2.0/ui/*
-%{_datadir}/gnome-panel*
+%{_datadir}/gnome-panel
+%{_datadir}/gnome-panelrc
 %{_datadir}/idl/gnome-panel-2.0
 %{_pixmapsdir}/*
 %{_omf_dest_dir}/%{name}