-#
-# TODO
-# - fix menu-stripe patch
-#
-# Conditional build:
-%bcond_with menu_stripe # build with menu-stripe.patch
-#
Summary: The core programs for the GNOME GUI desktop environment
-Summary(pl): Podstawowe programy ¶rodowiska graficznego GNOME
+Summary(pl.UTF-8): Podstawowe programy środowiska graficznego GNOME
Name: gnome-panel
-Version: 2.10.0
+Version: 2.26.2
Release: 2
License: LGPL
Group: X11/Applications
-Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-panel/2.10/%{name}-%{version}.tar.bz2
-# Source0-md5: 398e95097aeb7b8be2b6b47a0f9affe0
-Source1: pld-desktop-stripe.png
-# Source1-md5: 4b8b299a8aa7b95a606e7c4d8debd60c
+Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-panel/2.26/%{name}-%{version}.tar.bz2
+# Source0-md5: 07974105fec9a6bab8be8b20b9b956e9
Patch0: %{name}-no_launchers_on_panel.patch
-Patch1: %{name}-finalize-memleak.patch
-%{?with_menu_stripe:Patch2: %{name}-menu-stripe.patch}
-Patch3: %{name}-notification_area_applet.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=552049
+Patch1: %{name}-use-sysconfig-timezone.patch
+Patch2: %{name}-logout.patch
+Patch3: %{name}-logout-po.patch
URL: http://www.gnome.org/
-BuildRequires: GConf2-devel >= 2.10.0
-BuildRequires: ORBit2-devel >= 1:2.12.1
+BuildRequires: GConf2-devel >= 2.26.0
+BuildRequires: NetworkManager-devel >= 0.6
+BuildRequires: ORBit2-devel >= 1:2.14.9
+BuildRequires: PolicyKit-gnome-devel >= 0.7
BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: evolution-data-server-devel >= 1.2.0
-BuildRequires: gnome-common >= 2.8.0-2
-BuildRequires: gnome-desktop-devel >= 2.10.0-2
-BuildRequires: gnome-menus-devel >= 2.10.0
-BuildRequires: gnome-vfs2-devel >= 2.10.0-2
-BuildRequires: gtk+2-devel >= 2:2.6.2
-BuildRequires: gtk-doc >= 1.1
-BuildRequires: intltool >= 0.31
-BuildRequires: libart_lgpl-devel >= 2.3.15
-BuildRequires: libglade2-devel >= 1:2.5.0
-BuildRequires: libgnomeui-devel >= 2.10.0-2
+BuildRequires: automake > 1:1.9
+BuildRequires: dbus-devel >= 1.1.2
+BuildRequires: dbus-glib-devel >= 0.74
+BuildRequires: evolution-data-server-devel >= 2.24.0
+BuildRequires: gettext-devel
+BuildRequires: glib2-devel >= 1:2.19.7
+BuildRequires: gnome-common >= 2.24.0
+BuildRequires: gnome-desktop-devel >= 2.26.0
+BuildRequires: gnome-doc-utils >= 0.14.0
+BuildRequires: gnome-menus-devel >= 2.26.0
+BuildRequires: gtk+2-devel >= 2:2.16.0
+BuildRequires: gtk-doc >= 1.9
+BuildRequires: intltool >= 0.40.0
+BuildRequires: libbonoboui-devel >= 2.24.0
+BuildRequires: libglade2-devel >= 1:2.6.2
+BuildRequires: libgnomeui-devel >= 2.24.0
+BuildRequires: libgweather-devel >= 2.24.1
+BuildRequires: librsvg-devel >= 2.22.0
BuildRequires: libtool
-BuildRequires: libwnck-devel >= 2.10.0
-BuildRequires: pango-devel >= 1:1.8.0
+BuildRequires: libwnck-devel >= 2.26.0
BuildRequires: perl-base
BuildRequires: pkgconfig >= 1:0.15.0
BuildRequires: rpm-build >= 4.1-10
+BuildRequires: rpmbuild(find_lang) >= 1.23
+BuildRequires: rpmbuild(macros) >= 1.311
BuildRequires: scrollkeeper >= 0.3.11
BuildConflicts: GConf-devel < 1.0.9-7
-Requires(post,postun): /sbin/ldconfig
+Requires(post,postun): gtk+2
+Requires(post,postun): hicolor-icon-theme
Requires(post,postun): scrollkeeper
-Requires(post): GConf2 >= 2.10.0
-Requires: gnome-desktop >= 2.10.0-2
-Requires: gnome-icon-theme >= 2.10.0
-Requires: libgnomeui >= 2.10.0-2
-Requires: librsvg >= 1:2.9.5
+Requires(post,preun): GConf2
+Requires: %{name}-libs = %{version}-%{release}
+Requires: gnome-desktop >= 2.26.0
+Requires: gnome-icon-theme >= 2.26.0
+Requires: tzdata >= 2008b-4
+Requires: xdg-menus
+Suggests: PolicyKit-gnome >= 0.7
+Suggests: gnome-utils-screenshot
+Suggests: gnome-utils-search-tool
+# sr@Latn vs. sr@latin
+Conflicts: glibc-misc < 6:2.7
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
The gnome-panel packages provides the GNOME panel, menus and some
basic applets for the panel.
-%description -l pl
-GNOME (GNU Network Object Model Environment) to zestaw przyjaznych
-dla u¿ytkownika aplikacji i narzêdzi do u¿ywania w po³±czeniu z
-zarz±dc± okien pod X. GNOME ma podobny cel jak CDE i KDE, ale bazuje
-ca³kowicie na wolnym oprogramowaniu.
+%description -l pl.UTF-8
+GNOME (GNU Network Object Model Environment) to zestaw przyjaznych dla
+użytkownika aplikacji i narzędzi do używania w połączeniu z zarządcą
+okien pod X. GNOME ma podobny cel jak CDE i KDE, ale bazuje całkowicie
+na wolnym oprogramowaniu.
Ten pakiet dostarcza panel GNOME2, menu oraz podstawowe aplety dla
panelu GNOME2.
+%package libs
+Summary: GNOME panel library
+Summary(pl.UTF-8): Biblioteka panelu GNOME
+Group: X11/Libraries
+Requires: libgnomeui >= 2.24.0
+Requires: librsvg >= 1:2.22.0
+
+%description libs
+GNOME panel library.
+
+%description libs -l pl.UTF-8
+Biblioteka panelu GNOME.
+
%package devel
Summary: GNOME panel includes, and more
-Summary(pl): Pliki nag³ówkowe biblioteki panelu GNOME
+Summary(pl.UTF-8): Pliki nagłówkowe biblioteki panelu GNOME
Group: X11/Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: gtk-doc-common
-Requires: libgnomeui-devel >= 2.10.0-2
+Requires: %{name}-libs = %{version}-%{release}
+Requires: gtk+2-devel >= 2:2.16.0
+Requires: libbonoboui-devel >= 2.24.0
+Requires: libgnomeui-devel >= 2.24.0
%description devel
Panel header files for creating GNOME panels.
-%description devel -l pl
-Pliki nag³ówkowe bibliotek panelu GNOME.
+%description devel -l pl.UTF-8
+Pliki nagłówkowe bibliotek panelu GNOME.
%package static
Summary: GNOME panel static libraries
-Summary(pl): Statyczne biblioteki panelu GNOME
+Summary(pl.UTF-8): Statyczne biblioteki panelu GNOME
Group: X11/Development/Libraries
Requires: %{name}-devel = %{version}-%{release}
%description static
Panel static libraries.
-%description static -l pl
+%description static -l pl.UTF-8
Statyczne biblioteki panelu GNOME.
+%package apidocs
+Summary: panel-applet API documentation
+Summary(pl.UTF-8): Dokumentacja API panel-applet
+Group: Documentation
+Requires: gtk-doc-common
+
+%description apidocs
+panel-applet API documentation.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API panel-applet.
+
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
-%{?with_menu_stripe:%patch2 -p1}
-%patch3 -p1
+%patch1 -p0
+%patch2 -p1
+# needs update!
+#%patch3 -p1
+
+# short circuit stopper (fix me!)
+mv ChangeLog main-ChangeLog
+find . -name ChangeLog |awk '{src=$0; dst=$0;sub("^./","",dst);gsub("/","-",dst); print "cp " src " " dst}'|sh
%build
-cp /usr/share/gnome-common/data/omf.make .
-intltoolize --copy --force
+%{__gtkdocize}
+%{__gnome_doc_prepare}
+%{__gnome_doc_common}
+%{__intltoolize}
%{__libtoolize}
-glib-gettextize --copy --force
-%{__aclocal}
-%{__autoheader}
+%{__aclocal} -I m4
%{__autoconf}
+%{__autoheader}
%{__automake}
%configure \
- --enable-gtk-doc \
- --with-html-dir=%{_gtkdocdir} \
+ --disable-schemas-install \
--enable-eds \
- --disable-schemas-install
+ --enable-gtk-doc \
+ --with-html-dir=%{_gtkdocdir}
%{__make}
%install
install %{name}/panel-default-setup.entries $RPM_BUILD_ROOT%{_datadir}/%{name}
-install %{SOURCE1} $RPM_BUILD_ROOT%{_pixmapsdir}
-
-mv ChangeLog main-ChangeLog
-find . -name ChangeLog |awk '{src=$0; dst=$0;sub("^./","",dst);gsub("/","-",dst); print "cp " src " " dst}'|sh
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/panel-default-setup.entries
+rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/{ca@valencia,la}
-rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
-
-%find_lang %{name} --with-gnome --all-name
+%find_lang %{name} --with-gnome --with-omf --all-name
%clean
rm -rf $RPM_BUILD_ROOT
%post
-/sbin/ldconfig
-scrollkeeper-update
-%gconf_schema_install
+%scrollkeeper_update_post
+%gconf_schema_install clock.schemas
+%gconf_schema_install fish.schemas
+%gconf_schema_install panel-compatibility.schemas
+%gconf_schema_install panel-general.schemas
+%gconf_schema_install panel-global.schemas
+%gconf_schema_install panel-object.schemas
+%gconf_schema_install panel-toplevel.schemas
+%gconf_schema_install window-list.schemas
+%gconf_schema_install workspace-switcher.schemas
+%update_icon_cache hicolor
+
%{_bindir}/gconftool-2 --direct \
--config-source="`%{_bindir}/gconftool-2 --get-default-source`" \
--load %{_datadir}/%{name}/panel-default-setup.entries > /dev/null
--config-source="`%{_bindir}/gconftool-2 --get-default-source`" \
--load %{_datadir}/%{name}/panel-default-setup.entries /apps/panel/profiles/default > /dev/null
+%preun
+%gconf_schema_uninstall clock.schemas
+%gconf_schema_uninstall fish.schemas
+%gconf_schema_uninstall panel-compatibility.schemas
+%gconf_schema_uninstall panel-general.schemas
+%gconf_schema_uninstall panel-global.schemas
+%gconf_schema_uninstall panel-object.schemas
+%gconf_schema_uninstall panel-toplevel.schemas
+%gconf_schema_uninstall window-list.schemas
+%gconf_schema_uninstall workspace-switcher.schemas
+
%postun
-/sbin/ldconfig
-scrollkeeper-update
+%scrollkeeper_update_postun
+%update_icon_cache hicolor
+
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
%files -f %{name}.lang
%defattr(644,root,root,755)
-%doc AUTHORS NEWS README *ChangeLog
-%config %{_sysconfdir}/gconf/schemas/*
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/fish-applet-2
-%attr(755,root,root) %{_libdir}/libpanel-applet*.so.*.*
+%doc AUTHORS MAINTAINERS NEWS README *ChangeLog
+%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) %{_libdir}/clock-applet
-%attr(755,root,root) %{_libdir}/wnck-applet
+%attr(755,root,root) %{_libdir}/fish-applet-2
+%attr(755,root,root) %{_libdir}/gnome-clock-applet-mechanism
%attr(755,root,root) %{_libdir}/notification-area-applet
-%{_libdir}/bonobo/servers/*
-%{_datadir}/gnome/panel
-%{_datadir}/gnome-2.0/ui/*
+%attr(755,root,root) %{_libdir}/wnck-applet
+%{_datadir}/PolicyKit/policy/org.gnome.clockapplet.mechanism.policy
+%{_datadir}/dbus-1/system-services/org.gnome.ClockApplet.Mechanism.service
+%{_datadir}/gnome-2.0/ui/*.xml
%{_datadir}/gnome-panel
%{_datadir}/gnome-panelrc
%{_datadir}/idl/gnome-panel-2.0
-%{_pixmapsdir}/*
-%{_iconsdir}/*/*/apps/*.png
-%{_omf_dest_dir}/%{name}
-%{_mandir}/man1/*
+%{_desktopdir}/gnome-panel.desktop
+%{_iconsdir}/hicolor/*/apps/*
+%{_libdir}/bonobo/servers/*.server
+%{_mandir}/man1/*.1*
+%{_sysconfdir}/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
+%{_sysconfdir}/gconf/schemas/panel-general.schemas
+%{_sysconfdir}/gconf/schemas/panel-global.schemas
+%{_sysconfdir}/gconf/schemas/panel-object.schemas
+%{_sysconfdir}/gconf/schemas/panel-toplevel.schemas
+%{_sysconfdir}/gconf/schemas/window-list.schemas
+%{_sysconfdir}/gconf/schemas/workspace-switcher.schemas
+
+%files libs
+%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
%files devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libpanel-applet*.so
-%{_libdir}/*.la
-%{_gtkdocdir}/panel-applet
+%attr(755,root,root) %{_libdir}/libpanel-applet-2.so
+%{_libdir}/libpanel-applet-2.la
%{_includedir}/panel-2.0
-%{_pkgconfigdir}/*.pc
+%{_pkgconfigdir}/libpanelapplet-2.0.pc
%files static
%defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libpanel-applet-2.a
+
+%files apidocs
+%defattr(644,root,root,755)
+%{_gtkdocdir}/panel-applet