- 2.4.2, STBR for AC

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

diff --git a/gnome-panel.spec b/gnome-panel.spec
index 802fe9ec5687cf5260ee6612ba283bda82d608f6..8574439a1ac264ba35d833475dfbe57a464c37bb 100644 (file)
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -1,36 +1,51 @@
 Summary:       The core programs for the GNOME GUI desktop environment
 Summary(pl):   Podstawowe programy ¶rodowiska graficznego GNOME
 Name:          gnome-panel
-Version:       2.3.1
+Version:       2.4.2
 Release:       1
 License:       LGPL
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.3/%{name}-%{version}.tar.bz2
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.4/%{name}-%{version}.tar.bz2
+# Source0-md5: d62da1f6cb129f65206a945d93a2fa85
+Source1:       pld-desktop-stripe.png
+# Source1-md5: 4b8b299a8aa7b95a606e7c4d8debd60c
+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
+Patch5:                %{name}-action-stock.patch
+Patch6:                %{name}-applet-categories.patch
+Patch7:                %{name}-menu-stripe.patch
+Patch8:                %{name}-notification_area_applet.patch
+Patch9:                %{name}-top_panel_size.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-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
@@ -39,7 +54,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,6 +72,7 @@ Summary(pl):  Pliki nag
 Group:         X11/Development/Libraries
 Requires:      %{name} = %{version}
 Requires:      gtk-doc-common
+Requires:      libgnomeui-devel >= 2.4.0.1
 
 %description devel
 Panel header files for creating GNOME panels.
@@ -78,6 +94,16 @@ Statyczne biblioteki panelu GNOME.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
 
 %build
 intltoolize --copy --force
@@ -97,7 +123,14 @@ 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 %{SOURCE1} $RPM_BUILD_ROOT%{_pixmapsdir}
+
+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
 
 mv ChangeLog main-ChangeLog
 find . -name ChangeLog |awk '{src=$0; dst=$0;sub("^./","",dst);gsub("/","-",dst); print "cp " src " " dst}'|sh
@@ -111,8 +144,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
 
@@ -126,23 +162,21 @@ scrollkeeper-update
 %attr(755,root,root) %{_libdir}/libclock-applet*.so
 %attr(755,root,root) %{_libdir}/wnck-applet
 %attr(755,root,root) %{_libdir}/notification-area-applet
-%{_libdir}/libclock-applet*.la
 %{_libdir}/bonobo/servers/*
-%{_datadir}/control-center-2.0/capplets/*
-%{_datadir}/fish/*
-%{_datadir}/gen_util
+%{_datadir}/gnome/capplets/*
 %{_datadir}/gnome/panel
 %{_datadir}/gnome-2.0/ui/*
-%{_datadir}/gnome-panel*
+%{_datadir}/gnome-panel
+%{_datadir}/gnome-panelrc
 %{_datadir}/idl/gnome-panel-2.0
-%{_datadir}/pixmaps/*
+%{_pixmapsdir}/*
 %{_omf_dest_dir}/%{name}
 %{_mandir}/man1/*
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libpanel-applet*.so
-%{_libdir}/libpanel-applet*.la
+%{_libdir}/*.la
 %{_gtkdocdir}/panel-applet
 %{_includedir}/panel-2.0
 %{_pkgconfigdir}/*.pc