- updated to 2.20.0.1; merged from DEVEL

Changed files:
    gnome-panel.spec -> 1.200

diff --git a/gnome-panel.spec b/gnome-panel.spec
index c5c2f059893d75c6c2744676592a7480806535f4..24a4d2795d3c27aeb83fda152857a379c24b8238 100644 (file)
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -1,37 +1,37 @@
 Summary:       The core programs for the GNOME GUI desktop environment
 Summary(pl.UTF-8):     Podstawowe programy środowiska graficznego GNOME
 Name:          gnome-panel
-Version:       2.18.3
+Version:       2.20.0.1
 Release:       1
 License:       LGPL
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/gnome/sources/gnome-panel/2.18/%{name}-%{version}.tar.bz2
-# Source0-md5: 545348de234fa8222e328fa7f3a5ba71
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-panel/2.20/%{name}-%{version}.tar.bz2
+# Source0-md5: bead455015de6bd86bb7259e6276af9e
 Patch0:                %{name}-finalize-memleak.patch
 Patch1:                %{name}-no_launchers_on_panel.patch
 URL:           http://www.gnome.org/
-BuildRequires: GConf2-devel >= 2.18.0.1
-BuildRequires: ORBit2-devel >= 1:2.14.7
+BuildRequires: GConf2-devel >= 2.19.1
+BuildRequires: ORBit2-devel >= 1:2.14.9
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: evolution-data-server-devel >= 1.10.3.1
-BuildRequires: gnome-common >= 2.18.0
-BuildRequires: gnome-desktop-devel >= 2.18.2
-BuildRequires: gnome-doc-utils >= 0.10.3
-BuildRequires: gnome-menus-devel >= 2.18.2
-BuildRequires: gnome-vfs2-devel >= 2.18.1
-BuildRequires: gtk+2-devel >= 2:2.10.14
+BuildRequires: evolution-data-server-devel >= 1.12.0
+BuildRequires: gnome-common >= 2.20.0
+BuildRequires: gnome-desktop-devel >= 2.20.0
+BuildRequires: gnome-doc-utils >= 0.12.0
+BuildRequires: gnome-menus-devel >= 2.20.0
+BuildRequires: gnome-vfs2-devel >= 2.20.0
+BuildRequires: gtk+2-devel >= 2:2.12.0
 BuildRequires: gtk-doc >= 1.8
-BuildRequires: intltool >= 0.35.5
+BuildRequires: intltool >= 0.36.2
 BuildRequires: libart_lgpl-devel >= 2.3.19
-BuildRequires: libglade2-devel >= 1:2.6.0
-BuildRequires: libgnomeui-devel >= 2.18.1
+BuildRequires: libglade2-devel >= 1:2.6.2
+BuildRequires: libgnomeui-devel >= 2.19.1
 BuildRequires: libtool
-BuildRequires: libwnck-devel >= 2.18.0
-BuildRequires: pango-devel >= 1:1.16.0
+BuildRequires: libwnck-devel >= 2.20.0
+BuildRequires: pango-devel >= 1:1.18.2
 BuildRequires: perl-base
 BuildRequires: pkgconfig >= 1:0.15.0
-BuildRequires: python-libxml2 >= 1:2.6.27
+BuildRequires: python-libxml2 >= 1:2.6.30
 BuildRequires: rpm-build >= 4.1-10
 BuildRequires: rpmbuild(macros) >= 1.311
 BuildRequires: scrollkeeper >= 0.3.11
@@ -40,8 +40,8 @@ Requires(post,postun):        hicolor-icon-theme
 Requires(post,postun): scrollkeeper
 Requires(post,preun):  GConf2
 Requires:      %{name}-libs = %{version}-%{release}
-Requires:      gnome-desktop >= 2.18.2
-Requires:      gnome-icon-theme >= 2.18.0
+Requires:      gnome-desktop >= 2.20.0
+Requires:      gnome-icon-theme >= 2.20.0
 Requires:      xdg-menus
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -67,8 +67,8 @@ panelu GNOME2.
 Summary:       GNOME panel library
 Summary(pl.UTF-8):     Biblioteka panelu GNOME
 Group:         X11/Libraries
-Requires:      libgnomeui >= 2.18.1
-Requires:      librsvg >= 1:2.16.1
+Requires:      libgnomeui >= 2.19.1
+Requires:      librsvg >= 1:2.18.1
 
 %description libs
 GNOME panel library.
@@ -81,7 +81,7 @@ Summary:      GNOME panel includes, and more
 Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki panelu GNOME
 Group:         X11/Development/Libraries
 Requires:      %{name}-libs = %{version}-%{release}
-Requires:      libgnomeui-devel >= 2.18.1
+Requires:      libgnomeui-devel >= 2.19.1
 
 %description devel
 Panel header files for creating GNOME panels.
@@ -210,18 +210,12 @@ EOF
 %attr(755,root,root) %{_libdir}/wnck-applet
 %{_datadir}/gnome-2.0/ui/*
 %{_datadir}/gnome-panel
-%{_datadir}/gnome/panel
 %{_datadir}/gnome-panelrc
 %{_datadir}/idl/gnome-panel-2.0
 %{_desktopdir}/gnome-panel.desktop
 %{_iconsdir}/hicolor/*/apps/*
 %{_libdir}/bonobo/servers/*
 %{_mandir}/man1/*
-%{_omf_dest_dir}/clock
-%{_omf_dest_dir}/fish
-%{_omf_dest_dir}/gnome-panel
-%{_omf_dest_dir}/window-list
-%{_omf_dest_dir}/workspace-switcher
 %{_sysconfdir}/gconf/schemas/clock.schemas
 %{_sysconfdir}/gconf/schemas/fish.schemas
 %{_sysconfdir}/gconf/schemas/panel-compatibility.schemas
@@ -231,6 +225,77 @@ EOF
 %{_sysconfdir}/gconf/schemas/panel-toplevel.schemas
 %{_sysconfdir}/gconf/schemas/window-list.schemas
 %{_sysconfdir}/gconf/schemas/workspace-switcher.schemas
+%dir %{_omf_dest_dir}/clock
+%{_omf_dest_dir}/clock/clock-C.omf
+%lang(ca) %{_omf_dest_dir}/clock/clock-ca.omf
+%lang(de) %{_omf_dest_dir}/clock/clock-de.omf
+%lang(el) %{_omf_dest_dir}/clock/clock-el.omf
+%lang(es) %{_omf_dest_dir}/clock/clock-es.omf
+%lang(fr) %{_omf_dest_dir}/clock/clock-fr.omf
+%lang(it) %{_omf_dest_dir}/clock/clock-it.omf
+%lang(ja) %{_omf_dest_dir}/clock/clock-ja.omf
+%lang(ko) %{_omf_dest_dir}/clock/clock-ko.omf
+%lang(nl) %{_omf_dest_dir}/clock/clock-nl.omf
+%lang(oc) %{_omf_dest_dir}/clock/clock-oc.omf
+%lang(pa) %{_omf_dest_dir}/clock/clock-pa.omf
+%lang(ru) %{_omf_dest_dir}/clock/clock-ru.omf
+%lang(sr) %{_omf_dest_dir}/clock/clock-sr.omf
+%lang(sv) %{_omf_dest_dir}/clock/clock-sv.omf
+%lang(uk) %{_omf_dest_dir}/clock/clock-uk.omf
+%lang(zh_CN) %{_omf_dest_dir}/clock/clock-zh_CN.omf
+%lang(zh_TW) %{_omf_dest_dir}/clock/clock-zh_TW.omf
+%dir %{_omf_dest_dir}/fish
+%{_omf_dest_dir}/fish/fish-C.omf
+%lang(ca) %{_omf_dest_dir}/fish/fish-ca.omf
+%lang(el) %{_omf_dest_dir}/fish/fish-el.omf
+%lang(es) %{_omf_dest_dir}/fish/fish-es.omf
+%lang(fr) %{_omf_dest_dir}/fish/fish-fr.omf
+%lang(it) %{_omf_dest_dir}/fish/fish-it.omf
+%lang(ko) %{_omf_dest_dir}/fish/fish-ko.omf
+%lang(oc) %{_omf_dest_dir}/fish/fish-oc.omf
+%lang(sv) %{_omf_dest_dir}/fish/fish-sv.omf
+%lang(uk) %{_omf_dest_dir}/fish/fish-uk.omf
+%dir %{_omf_dest_dir}/gnome-panel
+%lang(de) %{_omf_dest_dir}/gnome-panel/fish-applet-2-de.omf
+%lang(ja) %{_omf_dest_dir}/gnome-panel/fish-applet-2-ja.omf
+%lang(zh_CN) %{_omf_dest_dir}/gnome-panel/fish-applet-2-zh_CN.omf
+%lang(zh_TW) %{_omf_dest_dir}/gnome-panel/fish-applet-2-zh_TW.omf
+%lang(de) %{_omf_dest_dir}/gnome-panel/window-list-de.omf
+%lang(ja) %{_omf_dest_dir}/gnome-panel/window-list-ja.omf
+%lang(zh_TW) %{_omf_dest_dir}/gnome-panel/window-list-zh_TW.omf
+%lang(de) %{_omf_dest_dir}/gnome-panel/workspace-switcher-de.omf
+%lang(ja) %{_omf_dest_dir}/gnome-panel/workspace-switcher-ja.omf
+%lang(zh_CN) %{_omf_dest_dir}/gnome-panel/workspace-switcher-zh_CN.omf
+%lang(zh_TW) %{_omf_dest_dir}/gnome-panel/workspace-switcher-zh_TW.omf
+%dir %{_omf_dest_dir}/window-list
+%{_omf_dest_dir}/window-list/window-list-C.omf
+%lang(ca) %{_omf_dest_dir}/window-list/window-list-ca.omf
+%lang(el) %{_omf_dest_dir}/window-list/window-list-el.omf
+%lang(es) %{_omf_dest_dir}/window-list/window-list-es.omf
+%lang(fr) %{_omf_dest_dir}/window-list/window-list-fr.omf
+%lang(it) %{_omf_dest_dir}/window-list/window-list-it.omf
+%lang(ko) %{_omf_dest_dir}/window-list/window-list-ko.omf
+%lang(oc) %{_omf_dest_dir}/window-list/window-list-oc.omf
+%lang(pa) %{_omf_dest_dir}/window-list/window-list-pa.omf
+%lang(ru) %{_omf_dest_dir}/window-list/window-list-ru.omf
+%lang(sv) %{_omf_dest_dir}/window-list/window-list-sv.omf
+%lang(uk) %{_omf_dest_dir}/window-list/window-list-uk.omf
+%lang(zh_CN) %{_omf_dest_dir}/window-list/window-list-zh_CN.omf
+%dir %{_omf_dest_dir}/workspace-switcher
+%{_omf_dest_dir}/workspace-switcher/workspace-switcher-C.omf
+%lang(ca) %{_omf_dest_dir}/workspace-switcher/workspace-switcher-ca.omf
+%lang(el) %{_omf_dest_dir}/workspace-switcher/workspace-switcher-el.omf
+%lang(es) %{_omf_dest_dir}/workspace-switcher/workspace-switcher-es.omf
+%lang(fr) %{_omf_dest_dir}/workspace-switcher/workspace-switcher-fr.omf
+%lang(it) %{_omf_dest_dir}/workspace-switcher/workspace-switcher-it.omf
+%lang(ko) %{_omf_dest_dir}/workspace-switcher/workspace-switcher-ko.omf
+%lang(nl) %{_omf_dest_dir}/workspace-switcher/workspace-switcher-nl.omf
+%lang(oc) %{_omf_dest_dir}/workspace-switcher/workspace-switcher-oc.omf
+%lang(pa) %{_omf_dest_dir}/workspace-switcher/workspace-switcher-pa.omf
+%lang(ru) %{_omf_dest_dir}/workspace-switcher/workspace-switcher-ru.omf
+%lang(sv) %{_omf_dest_dir}/workspace-switcher/workspace-switcher-sv.omf
+%lang(uk) %{_omf_dest_dir}/workspace-switcher/workspace-switcher-uk.omf
+%lang(vi) %{_omf_dest_dir}/workspace-switcher/workspace-switcher-vi.omf
 
 %files libs
 %defattr(644,root,root,755)