- merged from DEVEL and updated to 2.8.0

- removed outdated applet-categories patch
- menu-stripe patch probably needs update

Changed files:
    gnome-panel.spec -> 1.149

diff --git a/gnome-panel.spec b/gnome-panel.spec
index e52e4caf99a26d10b9127ce6126aa2c74978d50f..0d2f620112bfd5bb8472081900f2dbae4c599cf5 100644 (file)
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -1,45 +1,42 @@
 #
 # Conditional build:
 %bcond_with     menu_stripe    # build with menu-stripe.patch
-
+#
 Summary:       The core programs for the GNOME GUI desktop environment
 Summary(pl):   Podstawowe programy ¶rodowiska graficznego GNOME
 Name:          gnome-panel
-Version:       2.6.2
-Release:       6
+Version:       2.8.0
+Release:       1
 License:       LGPL
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.6/%{name}-%{version}.tar.bz2
-# Source0-md5: 41318b24e18f497b4418c7d60aaf33f6
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.8/%{name}-%{version}.tar.bz2
+# Source0-md5: e52dccf538a07917d2840e95864fddfd
 Source1:       pld-desktop-stripe.png
 # Source1-md5: 4b8b299a8aa7b95a606e7c4d8debd60c
 Patch0:                %{name}-no_launchers_on_panel.patch
 Patch1:                %{name}-finalize-memleak.patch
-Patch2:                %{name}-locale-names.patch
-%{?with_menu_stripe:Patch3:            %{name}-menu-stripe.patch}
-Patch4:                %{name}-notification_area_applet.patch
-Patch5:                %{name}-applet-categories.patch
-Patch6:                %{name}-schemas.patch
-Patch7:                %{name}-desktop.patch
+%{?with_menu_stripe:Patch2:            %{name}-menu-stripe.patch}
+Patch3:                %{name}-notification_area_applet.patch
+Patch4:                %{name}-all_applications.patch
 URL:           http://www.gnome.org/
-BuildRequires: GConf2-devel >= 2.6.2
-BuildRequires: ORBit2-devel >= 1:2.10.2
+BuildRequires: GConf2-devel >= 2.8.0.1
+BuildRequires: ORBit2-devel >= 1:2.11.2
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: evolution-data-server-devel >= 0.0.94
-BuildRequires: gnome-common >= 2.4.0
-BuildRequires: gnome-desktop-devel >= 2.6.2
-BuildRequires: gnome-vfs2-devel >= 2.6.1.1
-BuildRequires: gtk+2-devel >= 2:2.4.3
+BuildRequires: evolution-data-server-devel >= 1.0.0
+BuildRequires: gnome-common >= 2.8.0
+BuildRequires: gnome-desktop-devel >= 2.8.0
+BuildRequires: gnome-vfs2-devel >= 2.8.0
+BuildRequires: gtk+2-devel >= 2:2.4.4
 BuildRequires: gtk-doc >= 1.1
-BuildRequires: intltool >= 0.29
+BuildRequires: intltool >= 0.31
 BuildRequires: libart_lgpl-devel >= 2.3.15
 BuildRequires: libglade2-devel >= 1:2.4.0
-BuildRequires: libgnomeui-devel >= 2.6.1.1
+BuildRequires: libgnomeui-devel >= 2.8.0
 BuildRequires: libpng-devel >= 1.2.0
 BuildRequires: libtool
-BuildRequires: libwnck-devel >= 2.6.2
-BuildRequires: pango-devel >= 1:1.4.0
+BuildRequires: libwnck-devel >= 2.7.91
+BuildRequires: pango-devel >= 1:1.6.0
 BuildRequires: perl-base
 BuildRequires: pkgconfig >= 0.15.0
 BuildRequires: rpm-build >= 4.1-10
@@ -48,12 +45,12 @@ BuildRequires:      zlib-devel
 BuildConflicts:        GConf-devel < 1.0.9-7
 Requires(post,postun): /sbin/ldconfig
 Requires(post,postun): scrollkeeper
-Requires(post):        GConf2 >= 2.6.2
-Requires:      gnome-desktop >= 2.6.2
-Requires:      gnome-icon-theme >= 1.2.3
+Requires(post):        GConf2 >= 2.8.0
+Requires:      gnome-desktop >= 2.8.0
+Requires:      gnome-icon-theme >= 2.8.0
 Requires:      gnome-vfs-menu-module
-Requires:      libgnomeui >= 2.6.1.1
-Requires:      librsvg >= 1:2.6.5
+Requires:      libgnomeui >= 2.8.0
+Requires:      librsvg >= 1:2.8.1
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -80,7 +77,7 @@ Summary(pl):  Pliki nag
 Group:         X11/Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 Requires:      gtk-doc-common
-Requires:      libgnomeui-devel >= 2.6.1.1
+Requires:      libgnomeui-devel >= 2.8.0
 
 %description devel
 Panel header files for creating GNOME panels.
@@ -104,20 +101,15 @@ Statyczne biblioteki panelu GNOME.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%{?with_menu_stripe:%patch3 -p1}
+%{?with_menu_stripe:%patch2 -p1}
+%patch3 -p1
 %patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-
-mv po/{no,nb}.po
 
 %build
 intltoolize --copy --force
 %{__libtoolize}
 glib-gettextize --copy --force
-%{__aclocal} -I %{_aclocaldir}/gnome2-macros
+%{__aclocal}
 %{__autoheader}
 %{__autoconf}
 %{__automake}
@@ -140,12 +132,11 @@ 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
+#mv ChangeLog main-ChangeLog
 find . -name ChangeLog |awk '{src=$0; dst=$0;sub("^./","",dst);gsub("/","-",dst); print "cp " src " " dst}'|sh
 
+rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
+
 %find_lang %{name} --with-gnome --all-name
 
 %clean
@@ -177,7 +168,6 @@ scrollkeeper-update
 %attr(755,root,root) %{_libdir}/wnck-applet
 %attr(755,root,root) %{_libdir}/notification-area-applet
 %{_libdir}/bonobo/servers/*
-%{_datadir}/gnome/capplets/*
 %{_datadir}/gnome/panel
 %{_datadir}/gnome-2.0/ui/*
 %{_datadir}/gnome-panel