- merged from DEVEL

Changed files:
    gnome-panel-no_launchers_on_panel.patch -> 1.7
    gnome-panel.spec -> 1.240

diff --git a/gnome-panel-no_launchers_on_panel.patch b/gnome-panel-no_launchers_on_panel.patch
index 826efb10f2cab28aa4bd110bc2d2f93dec247319..c272cf07d5c054f03b5755250c424a0160a64f6b 100644 (file)
--- a/gnome-panel-no_launchers_on_panel.patch
+++ b/gnome-panel-no_launchers_on_panel.patch
@@ -96,7 +96,7 @@ diff -aurN gnome-panel-2.13.90.orig/gnome-panel/panel-default-setup.entries gnom
 -      </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/applet_iid</key><schema_key>/schemas/apps/panel/objects/applet_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>
@@ -150,7 +150,7 @@ diff -aurN gnome-panel-2.13.90.orig/gnome-panel/panel-default-setup.entries gnom
 -      </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/applet_iid</key><schema_key>/schemas/apps/panel/objects/applet_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>

diff --git a/gnome-panel.spec b/gnome-panel.spec
index 5a2fbe6dc49848772b022e2706e7cd2b11d41f0c..49c799dfbdc7be6cc4f60c7e0cfa3d62992b9e62 100644 (file)
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -1,15 +1,16 @@
 Summary:       The core programs for the GNOME GUI desktop environment
 Summary(pl.UTF-8):     Podstawowe programy środowiska graficznego GNOME
 Name:          gnome-panel
-Version:       2.30.2
+Version:       2.32.0.2
 Release:       1
 License:       LGPL
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-panel/2.30/%{name}-%{version}.tar.bz2
-# Source0-md5: 11b6db12223c70a218a2f4602b1683cc
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-panel/2.32/%{name}-%{version}.tar.bz2
+# Source0-md5: c5759370aa3dadb050c3f8b6ca1fd1b0
 Patch0:                %{name}-no_launchers_on_panel.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=552049
 Patch1:                %{name}-use-sysconfig-timezone.patch
+Patch2:                %{name}-link.patch
 URL:           http://www.gnome.org/
 BuildRequires: GConf2-devel >= 2.26.0
 BuildRequires: NetworkManager-devel >= 0.6
@@ -17,16 +18,17 @@ BuildRequires:      ORBit2-devel >= 1:2.14.9
 BuildRequires: autoconf
 BuildRequires: automake >= 1:1.9
 BuildRequires: dbus-devel >= 1.1.2
-BuildRequires: dbus-glib-devel >= 0.74
+BuildRequires: dbus-glib-devel >= 0.80
 BuildRequires: docbook-dtd412-xml
 BuildRequires: evolution-data-server-devel >= 2.24.0
 BuildRequires: gettext-devel
-BuildRequires: glib2-devel >= 1:2.20.0
+BuildRequires: glib2-devel >= 1:2.26.0
 BuildRequires: gnome-common >= 2.24.0
 BuildRequires: gnome-desktop-devel >= 2.30.0
 BuildRequires: gnome-doc-utils >= 0.14.0
 BuildRequires: gnome-menus-devel >= 2.30.0
-BuildRequires: gtk+2-devel >= 2:2.18.0
+BuildRequires: gobject-introspection-devel >= 0.6.7
+BuildRequires: gtk+2-devel >= 2:2.20.0
 BuildRequires: gtk-doc >= 1.9
 BuildRequires: intltool >= 0.40.0
 BuildRequires: libbonoboui-devel >= 2.24.0
@@ -97,7 +99,7 @@ Summary(pl.UTF-8):    Pliki nagłówkowe biblioteki panelu GNOME
 Group:         X11/Development/Libraries
 Requires:      %{name}-libs = %{version}-%{release}
 Requires:      GConf2-devel >= 2.26.0
-Requires:      gtk+2-devel >= 2:2.18.0
+Requires:      gtk+2-devel >= 2:2.20.0
 Requires:      libbonoboui-devel >= 2.24.0
 
 %description devel
@@ -134,6 +136,7 @@ Dokumentacja API panel-applet.
 %setup -q
 %patch0 -p1
 %patch1 -p0
+%patch2 -p1
 sed -i s#^en@shaw## po/LINGUAS
 rm po/en@shaw.po
 
@@ -170,6 +173,7 @@ install -d $RPM_BUILD_ROOT{%{_pixmapsdir},%{_datadir}/%{name}}
 install %{name}/panel-default-setup.entries $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/panel-default-setup.entries
+rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-panel/modules/*.{a,la}
 
 %find_lang %{name} --with-gnome --with-omf --all-name
 
@@ -220,23 +224,26 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/gnome-desktop-item-edit
 %attr(755,root,root) %{_bindir}/gnome-panel
 %attr(755,root,root) %{_bindir}/panel-test-applets
+%attr(755,root,root) %{_bindir}/panel-test-applets-bonobo
 %attr(755,root,root) %{_libexecdir}/clock-applet
-%attr(755,root,root) %{_libexecdir}/fish-applet-2
-%attr(755,root,root) %{_libexecdir}/gnome-clock-applet-mechanism
+%attr(755,root,root) %{_libexecdir}/fish-applet
 %attr(755,root,root) %{_libexecdir}/gnome-panel-add
 %attr(755,root,root) %{_libexecdir}/notification-area-applet
 %attr(755,root,root) %{_libexecdir}/wnck-applet
-%{_datadir}/dbus-1/system-services/org.gnome.ClockApplet.Mechanism.service
+%dir %{_libdir}/gnome-panel
+%dir %{_libdir}/gnome-panel/modules
+%{_libdir}/gnome-panel/modules/libpanel-applets-bonobo.so
+%{_datadir}/dbus-1/services/org.gnome.panel.applet.ClockAppletFactory.service
+%{_datadir}/dbus-1/services/org.gnome.panel.applet.FishAppletFactory.service
+%{_datadir}/dbus-1/services/org.gnome.panel.applet.NotificationAreaAppletFactory.service
+%{_datadir}/dbus-1/services/org.gnome.panel.applet.WnckletFactory.service
 %{_datadir}/gnome-2.0/ui/*.xml
 %{_datadir}/gnome-panel
 %{_datadir}/gnome-panelrc
 %{_datadir}/idl/gnome-panel-2.0
-%{_datadir}/polkit-1/actions/org.gnome.clockapplet.mechanism.policy
 %{_desktopdir}/gnome-panel.desktop
 %{_iconsdir}/hicolor/*/apps/*
-%{_libdir}/bonobo/servers/*.server
 %{_mandir}/man1/*.1*
-/etc/dbus-1/system.d/org.gnome.ClockApplet.Mechanism.conf
 %{_sysconfdir}/gconf/schemas/clock.schemas
 %{_sysconfdir}/gconf/schemas/fish.schemas
 %{_sysconfdir}/gconf/schemas/panel-compatibility.schemas
@@ -251,17 +258,26 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libpanel-applet-2.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libpanel-applet-2.so.0
+%attr(755,root,root) %{_libdir}/libpanel-applet-3.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libpanel-applet-3.so.0
+%{_libdir}/girepository-1.0/*.typelib
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libpanel-applet-2.so
-%{_libdir}/libpanel-applet-2.la
+%attr(755,root,root) %{_libdir}/libpanel-applet-3.so
 %{_includedir}/panel-2.0
+%{_includedir}/gnome-panel-3.0
 %{_pkgconfigdir}/libpanelapplet-2.0.pc
+%{_pkgconfigdir}/libpanelapplet-3.0.pc
+%{_datadir}/gir-1.0/*.gir
 
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libpanel-applet-2.a
+%{_libdir}/libpanel-applet-2.la
+%{_libdir}/libpanel-applet-3.a
+%{_libdir}/libpanel-applet-3.la
 
 %files apidocs
 %defattr(644,root,root,755)