- merged from DEVEL and updated to 2.6.0

- added schemas patch (fixes clock.schemas)
- commented out menu-stripe patch - it doesn't work for now
- rel. 0.1

Changed files:
    gnome-panel.spec -> 1.134

diff --git a/gnome-panel.spec b/gnome-panel.spec
index 67425c255af758ab610d6b840a56e07a7062e83d..fc4d652622f6382a5eb18cdaf84645580cca5f83 100644 (file)
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -1,52 +1,53 @@
 Summary:       The core programs for the GNOME GUI desktop environment
 Summary(pl):   Podstawowe programy ¶rodowiska graficznego GNOME
 Name:          gnome-panel
-Version:       2.4.2
-Release:       2
+Version:       2.6.0
+Release:       0.1
 License:       LGPL
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.4/%{name}-%{version}.tar.bz2
-# Source0-md5: d62da1f6cb129f65206a945d93a2fa85
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.6/%{name}-%{version}.tar.bz2
+# Source0-md5: 9e0ad03c9266d342b99837ca4e947b55
 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
+Patch0:                %{name}-no_launchers_on_panel.patch
+Patch1:                %{name}-finalize-memleak.patch
+Patch2:                %{name}-locale-names.patch
+#Patch3:               %{name}-menu-stripe.patch
+Patch4:                %{name}-notification_area_applet.patch
+Patch5:                %{name}-applet-categories.patch
+Patch6:                %{name}-schemas.patch
 URL:           http://www.gnome.org/
-BuildRequires: GConf2-devel >= 2.4.0
-BuildRequires: ORBit2-devel >= 2.8.1
+BuildRequires: GConf2-devel >= 2.5.90
+BuildRequires: ORBit2-devel >= 1:2.10.0
 BuildRequires: autoconf
 BuildRequires: automake
-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: evolution-data-server-devel >= 0.0.90
+BuildRequires: gnome-common >= 2.4.0
+BuildRequires: gnome-desktop-devel >= 2.6.0
+BuildRequires: gnome-vfs2-devel >= 2.6.0
+BuildRequires: gtk+2-devel >= 2:2.4.0
 BuildRequires: gtk-doc >= 1.1
-BuildRequires: intltool >= 0.27.2
+BuildRequires: intltool >= 0.29
 BuildRequires: libart_lgpl-devel >= 2.3.15
-BuildRequires: libglade2-devel >= 2.0.1
-BuildRequires: libgnomeui-devel >= 2.4.0.1
+BuildRequires: libglade2-devel >= 1:2.3.6
+BuildRequires: libgnomeui-devel >= 2.6.0
+BuildRequires: libpng-devel >= 1.2.0
 BuildRequires: libtool
-BuildRequires: libwnck-devel >= 2.4.0
+BuildRequires: libwnck-devel >= 2.6.0
+BuildRequires: pango-devel >= 1.4.0
+BuildRequires: perl-base
 BuildRequires: pkgconfig >= 0.15.0
 BuildRequires: rpm-build >= 4.1-10
 BuildRequires: scrollkeeper >= 0.3.11
-BuildRequires: libpng-devel >= 1.2.0
+BuildRequires: zlib-devel
 BuildConflicts:        GConf-devel < 1.0.9-7
 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
+Requires(post):        GConf2 >= 2.5.90
+Requires:      gnome-desktop >= 2.6.0
+Requires:      gnome-icon-theme >= 1.2.0
+Requires:      libgnomeui >= 2.6.0
+Requires:      librsvg >= 2.6.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -71,9 +72,9 @@ panelu GNOME2.
 Summary:       GNOME panel includes, and more
 Summary(pl):   Pliki nag³ówkowe biblioteki panelu GNOME
 Group:         X11/Development/Libraries
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{version}-%{release}
 Requires:      gtk-doc-common
-Requires:      libgnomeui-devel >= 2.4.0.1
+Requires:      libgnomeui-devel >= 2.6.0
 
 %description devel
 Panel header files for creating GNOME panels.
@@ -85,7 +86,7 @@ Pliki nag
 Summary:       GNOME panel static libraries
 Summary(pl):   Statyczne biblioteki panelu GNOME
 Group:         X11/Development/Libraries
-Requires:      %{name}-devel = %{version}
+Requires:      %{name}-devel = %{version}-%{release}
 
 %description static
 Panel static libraries.
@@ -98,13 +99,12 @@ Statyczne biblioteki panelu GNOME.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
+##%patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
+
+mv po/{no,nb}.po
 
 %build
 intltoolize --copy --force
@@ -116,7 +116,9 @@ glib-gettextize --copy --force
 %{__automake}
 %configure \
        --enable-gtk-doc \
-       --with-html-dir=%{_gtkdocdir}
+       --with-html-dir=%{_gtkdocdir} \
+       --enable-eds \
+       --disable-schemas-install
 
 %{__make}
 
@@ -124,7 +126,8 @@ glib-gettextize --copy --force
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT
+       DESTDIR=$RPM_BUILD_ROOT \
+       GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 
 install %{name}/panel-default-setup.entries $RPM_BUILD_ROOT%{_datadir}/%{name}
 
@@ -160,7 +163,7 @@ scrollkeeper-update
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_libdir}/fish-applet-2
 %attr(755,root,root) %{_libdir}/libpanel-applet*.so.*.*
-%attr(755,root,root) %{_libdir}/libclock-applet*.so
+%attr(755,root,root) %{_libdir}/clock-applet
 %attr(755,root,root) %{_libdir}/wnck-applet
 %attr(755,root,root) %{_libdir}/notification-area-applet
 %{_libdir}/bonobo/servers/*