- merged from DEVEL

Changed files:
    gnome-panel-no_launchers_on_panel.patch -> 1.5
    gnome-panel.spec -> 1.173

diff --git a/gnome-panel-no_launchers_on_panel.patch b/gnome-panel-no_launchers_on_panel.patch
index ddb7b5ffe2f3b0c062408da1d21a5243e316a845..a12f491aa7f1b13d7eb55cc589fca4cbff7dada7 100644 (file)
--- a/gnome-panel-no_launchers_on_panel.patch
+++ b/gnome-panel-no_launchers_on_panel.patch
@@ -1,12 +1,10 @@
-diff -urN gnome-panel-2.12.0.orig/gnome-panel/panel-compatibility.schemas gnome-panel-2.12.0/gnome-panel/panel-compatibility.schemas
---- gnome-panel-2.12.0.orig/gnome-panel/panel-compatibility.schemas    2005-09-06 15:14:47.749805808 +0200
-+++ gnome-panel-2.12.0/gnome-panel/panel-compatibility.schemas 2005-09-06 15:15:02.122620808 +0200
-@@ -180,15 +180,7 @@
-         <default>launcher-object</default>
-       <locale name="C"/>
+diff -aurN gnome-panel-2.13.90.orig/gnome-panel/panel-compatibility.schemas gnome-panel-2.13.90/gnome-panel/panel-compatibility.schemas
+--- gnome-panel-2.13.90.orig/gnome-panel/panel-compatibility.schemas   2003-09-05 14:35:53.000000000 +0200
++++ gnome-panel-2.13.90/gnome-panel/panel-compatibility.schemas        2006-01-27 21:40:03.374369000 +0100
+@@ -182,14 +182,6 @@
        </schema>
--     
--      <schema>
+      
+       <schema>
 -        <key>/schemas/apps/panel/default_profiles/medium/objects/00000001/launcher_location</key>
 -        <owner>panel</owner>
 -        <type>string</type>
@@ -14,28 +12,28 @@ diff -urN gnome-panel-2.12.0.orig/gnome-panel/panel-compatibility.schemas gnome-
 -      <locale name="C"/>
 -      </schema>
 -     
-+
-       <schema>
+-      <schema>
          <key>/schemas/apps/panel/default_profiles/medium/objects/00000001/panel_id</key>
          <owner>panel</owner>
-@@ -220,14 +212,6 @@
-         <default>launcher-object</default>
-       <locale name="C"/>
+         <type>string</type>
+@@ -222,14 +214,6 @@
        </schema>
--
--      <schema>
+ 
+       <schema>
 -        <key>/schemas/apps/panel/default_profiles/medium/objects/00000002/launcher_location</key>
 -        <owner>panel</owner>
 -        <type>string</type>
 -        <default>applications:///System/gnome-terminal.desktop</default>
 -      <locale name="C"/>
 -      </schema>
-      
-       <schema>
+-     
+-      <schema>
          <key>/schemas/apps/panel/default_profiles/medium/objects/00000002/panel_id</key>
-diff -urN gnome-panel-2.12.0.orig/gnome-panel/panel-default-setup.entries.in gnome-panel-2.12.0/gnome-panel/panel-default-setup.entries.in
---- gnome-panel-2.12.0.orig/gnome-panel/panel-default-setup.entries.in 2005-09-06 15:14:47.752805352 +0200
-+++ gnome-panel-2.12.0/gnome-panel/panel-default-setup.entries.in      2005-09-06 15:17:04.029088208 +0200
+         <owner>panel</owner>
+         <type>string</type>
+diff -aurN gnome-panel-2.13.90.orig/gnome-panel/panel-default-setup.entries gnome-panel-2.13.90/gnome-panel/panel-default-setup.entries
+--- gnome-panel-2.13.90.orig/gnome-panel/panel-default-setup.entries   2006-01-22 12:34:03.000000000 +0100
++++ gnome-panel-2.13.90/gnome-panel/panel-default-setup.entries        2006-01-27 21:41:51.414369000 +0100
 @@ -29,12 +29,6 @@
            <value>
              <string>menu_bar</string>
@@ -49,31 +47,179 @@ diff -urN gnome-panel-2.12.0.orig/gnome-panel/panel-default-setup.entries.in gno
          </list>
        </value>
      </entry>
-@@ -248,13 +242,6 @@
-         <bool>true</bool>
-       </value>
-     </entry>
+@@ -211,114 +205,6 @@
+     <entry><key>objects/menu_bar/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
+     <entry><key>objects/menu_bar/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
+ 
+-  <!-- Browser Launcher -->
+-
+-    <entry>
+-      <key>objects/browser_launcher/object_type</key>
+-      <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
+-      <value>
+-        <string>launcher-object</string>
+-      </value>
+-    </entry>
+-    <entry>
+-      <key>objects/browser_launcher/toplevel_id</key>
+-      <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
+-      <value>
+-        <string>top_panel</string>
+-      </value>
+-    </entry>
+-    <entry>
+-      <key>objects/browser_launcher/position</key>
+-      <schema_key>/schemas/apps/panel/objects/position</schema_key>
+-      <value>
+-        <int>1</int>
+-      </value>
+-    </entry>
+-    <entry>
+-      <key>objects/browser_launcher/panel_right_stick</key>
+-      <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
+-      <value>
+-        <bool>false</bool>
+-      </value>
+-    </entry>
+-    <entry>
+-      <key>objects/browser_launcher/locked</key>
+-      <schema_key>/schemas/apps/panel/objects/locked</schema_key>
+-      <value>
+-        <bool>true</bool>
+-      </value>
+-    </entry>
 -    <entry>
 -      <key>objects/browser_launcher/launcher_location</key>
 -      <schema_key>/schemas/apps/panel/objects/launcher_location</schema_key>
 -      <value>
--        <string>@DATADIR@/applications/epiphany.desktop</string>
+-        <string>epiphany.desktop</string>
+-      </value>
+-    </entry>
+-
+-    <entry><key>objects/browser_launcher/bonobo_iid</key><schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key></entry>
+-    <entry><key>objects/browser_launcher/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
+-    <entry><key>objects/browser_launcher/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
+-    <entry><key>objects/browser_launcher/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
+-    <entry><key>objects/browser_launcher/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
+-    <entry><key>objects/browser_launcher/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
+-    <entry><key>objects/browser_launcher/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
+-    <entry><key>objects/browser_launcher/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
+-
+-  <!-- Email Launcher -->
+-
+-    <entry>
+-      <key>objects/email_launcher/object_type</key>
+-      <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
+-      <value>
+-        <string>launcher-object</string>
+-      </value>
+-    </entry>
+-    <entry>
+-      <key>objects/email_launcher/toplevel_id</key>
+-      <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
+-      <value>
+-        <string>top_panel</string>
+-      </value>
+-    </entry>
+-    <entry>
+-      <key>objects/email_launcher/position</key>
+-      <schema_key>/schemas/apps/panel/objects/position</schema_key>
+-      <value>
+-        <int>2</int>
+-      </value>
+-    </entry>
+-    <entry>
+-      <key>objects/email_launcher/panel_right_stick</key>
+-      <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
+-      <value>
+-        <bool>false</bool>
+-      </value>
+-    </entry>
+-    <entry>
+-      <key>objects/email_launcher/locked</key>
+-      <schema_key>/schemas/apps/panel/objects/locked</schema_key>
+-      <value>
+-        <bool>true</bool>
 -      </value>
 -    </entry>
- 
-     <entry><key>objects/browser_launcher/bonobo_iid</key><schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key></entry>
-     <entry><key>objects/browser_launcher/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
-@@ -302,13 +289,6 @@
-         <bool>true</bool>
-       </value>
-     </entry>
 -    <entry>
 -      <key>objects/email_launcher/launcher_location</key>
 -      <schema_key>/schemas/apps/panel/objects/launcher_location</schema_key>
 -      <value>
--        <string>@DATADIR@/applications/evolution.desktop</string>
+-        <string>evolution.desktop</string>
+-      </value>
+-    </entry>
+-
+-    <entry><key>objects/email_launcher/bonobo_iid</key><schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key></entry>
+-    <entry><key>objects/email_launcher/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
+-    <entry><key>objects/email_launcher/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
+-    <entry><key>objects/email_launcher/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
+-    <entry><key>objects/email_launcher/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
+-    <entry><key>objects/email_launcher/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
+-    <entry><key>objects/email_launcher/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
+-    <entry><key>objects/email_launcher/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
+-
+   <!-- Window Menu Applet -->
+ 
+     <entry>
+@@ -373,60 +259,6 @@
+     <entry><key>applets/window_menu/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
+     <entry><key>applets/window_menu/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
+ 
+-  <!-- Mixer Applet -->
+-
+-    <entry>
+-      <key>applets/mixer/object_type</key>
+-      <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
+-      <value>
+-        <string>bonobo-applet</string>
+-      </value>
+-    </entry>
+-    <entry>
+-      <key>applets/mixer/toplevel_id</key>
+-      <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
+-      <value>
+-        <string>top_panel</string>
+-      </value>
+-    </entry>
+-    <entry>
+-      <key>applets/mixer/position</key>
+-      <schema_key>/schemas/apps/panel/objects/position</schema_key>
+-      <value>
+-        <int>1</int>
+-      </value>
+-    </entry>
+-    <entry>
+-      <key>applets/mixer/panel_right_stick</key>
+-      <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
+-      <value>
+-        <bool>true</bool>
+-      </value>
+-    </entry>
+-    <entry>
+-      <key>applets/mixer/locked</key>
+-      <schema_key>/schemas/apps/panel/objects/locked</schema_key>
+-      <value>
+-        <bool>true</bool>
 -      </value>
 -    </entry>
+-    <entry>
+-      <key>applets/mixer/bonobo_iid</key>
+-      <schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key>
+-      <value>
+-        <string>OAFIID:GNOME_MixerApplet</string>
+-      </value>
+-    </entry>
+-
+-    <entry><key>applets/mixer/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
+-    <entry><key>applets/mixer/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
+-    <entry><key>applets/mixer/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
+-    <entry><key>applets/mixer/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
+-    <entry><key>applets/mixer/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
+-    <entry><key>applets/mixer/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
+-    <entry><key>applets/mixer/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
+-    <entry><key>applets/mixer/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
+-
+   <!-- Clock Applet -->
  
-     <entry><key>objects/email_launcher/bonobo_iid</key><schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key></entry>
-     <entry><key>objects/email_launcher/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
+     <entry>

diff --git a/gnome-panel.spec b/gnome-panel.spec
index 4c64554341fd3353db389fa9c0415c3828bdf61e..6f7b350f31493e8cb3e10b90faa2b6bef1d8e46c 100644 (file)
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -1,15 +1,14 @@
 Summary:       The core programs for the GNOME GUI desktop environment
 Summary(pl):   Podstawowe programy ¶rodowiska graficznego GNOME
 Name:          gnome-panel
-Version:       2.12.3
-Release:       1
+Version:       2.14.0
+Release:       3
 License:       LGPL
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/gnome/sources/gnome-panel/2.12/%{name}-%{version}.tar.bz2
-# Source0-md5: 50a27090f7c667536e4bb5b077428853
+Source0:       http://ftp.gnome.org/pub/gnome/sources/gnome-panel/2.14/%{name}-%{version}.tar.bz2
+# Source0-md5: 85a2815aefd7d3c3acf93c588149b75b
 Patch0:                %{name}-finalize-memleak.patch
-Patch1:                %{name}-no_mixer_applet.patch
-Patch2:                %{name}-no_launchers_on_panel.patch
+Patch1:                %{name}-no_launchers_on_panel.patch
 URL:           http://www.gnome.org/
 BuildRequires: GConf2-devel >= 2.12.0
 BuildRequires: ORBit2-devel >= 1:2.12.3
@@ -26,9 +25,9 @@ BuildRequires:        gtk-doc >= 1.4
 BuildRequires: intltool >= 0.31
 BuildRequires: libart_lgpl-devel >= 2.3.15
 BuildRequires: libglade2-devel >= 1:2.5.0
-BuildRequires: libgnomeui-devel >= 2.12.0
+BuildRequires: libgnomeui-devel >= 2.13.0
 BuildRequires: libtool
-BuildRequires: libwnck-devel >= 2.12.1
+BuildRequires: libwnck-devel >= 2.13.5
 BuildRequires: pango-devel >= 1:1.10.1
 BuildRequires: perl-base
 BuildRequires: pkgconfig >= 1:0.15.0
@@ -37,13 +36,12 @@ BuildRequires:      rpm-build >= 4.1-10
 BuildRequires: rpmbuild(macros) >= 1.197
 BuildRequires: scrollkeeper >= 0.3.11
 BuildConflicts:        GConf-devel < 1.0.9-7
-Requires(post,postun): /sbin/ldconfig
 Requires(post,preun):  GConf2 >= 2.12.0
 Requires(post,postun): scrollkeeper
 Requires:      %{name}-libs = %{version}-%{release}
+Requires:      hicolor-icon-theme
 Requires:      gnome-desktop >= 2.12.1
 Requires:      gnome-icon-theme >= 2.12.1
-Requires:      gnome-session >= 2.12.0
 Requires:      xdg-menus
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -95,7 +93,7 @@ Statyczne biblioteki panelu GNOME.
 Summary:       GNOME panel library
 Summary(pl):   Biblioteka panelu GNOME
 Group:         X11/Libraries
-Requires:      libgnomeui >= 2.12.0
+Requires:      libgnomeui >= 2.13.0
 Requires:      librsvg >= 1:2.11.0
 
 %description libs
@@ -108,7 +106,6 @@ Biblioteka panelu GNOME.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 gnome-doc-prepare --copy --force