Author: megabajt Date: Wed Sep 29 21:24:18 2010 GMT Module: packages Tag: HEAD ---- Log message: - merged from DEVEL
---- Files affected: packages/gnome-panel: gnome-panel.spec (1.239 -> 1.240) , gnome-panel-no_launchers_on_panel.patch (1.6 -> 1.7) ---- Diffs: ================================================================ Index: packages/gnome-panel/gnome-panel.spec diff -u packages/gnome-panel/gnome-panel.spec:1.239 packages/gnome-panel/gnome-panel.spec:1.240 --- packages/gnome-panel/gnome-panel.spec:1.239 Wed Jun 23 09:43:09 2010 +++ packages/gnome-panel/gnome-panel.spec Wed Sep 29 23:24:13 2010 @@ -2,15 +2,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 @@ -18,16 +19,17 @@ 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 @@ -98,7 +100,7 @@ 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 @@ -135,6 +137,7 @@ %setup -q %patch0 -p1 %patch1 -p0 +%patch2 -p1 sed -i s#...@shaw## po/LINGUAS rm po/e...@shaw.po @@ -171,6 +174,7 @@ 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 @@ -221,23 +225,26 @@ %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 @@ -252,17 +259,26 @@ %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) @@ -274,6 +290,20 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.240 2010/09/29 21:24:13 megabajt +- merged from DEVEL + +Revision 1.239.2.3 2010/09/29 21:17:40 megabajt +- added -link.patch +- release 1 + +Revision 1.239.2.2 2010/09/29 18:13:11 patrys +- 2.32.0.2 +- build failure imminent + +Revision 1.239.2.1 2010/08/31 15:24:18 patrys +- 2.31.90 + Revision 1.239 2010/06/23 07:43:09 megabajt - updated to 2.30.2 ================================================================ Index: packages/gnome-panel/gnome-panel-no_launchers_on_panel.patch diff -u packages/gnome-panel/gnome-panel-no_launchers_on_panel.patch:1.6 packages/gnome-panel/gnome-panel-no_launchers_on_panel.patch:1.7 --- packages/gnome-panel/gnome-panel-no_launchers_on_panel.patch:1.6 Sat Sep 27 14:02:02 2008 +++ packages/gnome-panel/gnome-panel-no_launchers_on_panel.patch Wed Sep 29 23:24:13 2010 @@ -96,7 +96,7 @@ - </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 @@ - </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> ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gnome-panel/gnome-panel.spec?r1=1.239&r2=1.240&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gnome-panel/gnome-panel-no_launchers_on_panel.patch?r1=1.6&r2=1.7&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
