-# TODO:
-# - NetworkManager bcond
-#
Summary: The core programs for the GNOME GUI desktop environment
Summary(pl.UTF-8): Podstawowe programy środowiska graficznego GNOME
Name: gnome-panel
-Version: 2.22.1.3
+Version: 3.2.1
Release: 1
License: LGPL
Group: X11/Applications
-Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-panel/2.22/%{name}-%{version}.tar.bz2
-# Source0-md5: af5e33b27c4b4a8f932baa8530dd79b9
-Patch0: %{name}-no_launchers_on_panel.patch
+Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-panel/3.2/%{name}-%{version}.tar.xz
+# Source0-md5: cc2c18e18396d728cc10c58596db2f9a
+# http://bugzilla.gnome.org/show_bug.cgi?id=552049
+Patch0: %{name}-use-sysconfig-timezone.patch
URL: http://www.gnome.org/
-BuildRequires: GConf2-devel >= 2.22.0
+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 > 1:1.9
+BuildRequires: automake >= 1:1.9
BuildRequires: dbus-devel >= 1.1.2
-BuildRequires: dbus-glib-devel >= 0.74
-BuildRequires: evolution-data-server-devel >= 2.22.0
+BuildRequires: dbus-glib-devel >= 0.80
+BuildRequires: dconf-devel
+BuildRequires: docbook-dtd412-xml
+BuildRequires: evolution-data-server-devel >= 3.2.0
BuildRequires: gettext-devel
-BuildRequires: glib2-devel >= 1:2.16.0
-BuildRequires: gnome-common >= 2.20.0
-BuildRequires: gnome-desktop-devel >= 2.22.0
-BuildRequires: gnome-doc-utils >= 0.12.0
-BuildRequires: gnome-menus-devel >= 2.22.0
-BuildRequires: gtk+2-devel >= 2:2.12.5
+BuildRequires: glib2-devel >= 1:2.28.0
+BuildRequires: gnome-common >= 2.24.0
+BuildRequires: gnome-desktop-devel >= 3.2.0
+BuildRequires: gnome-doc-utils >= 0.14.0
+BuildRequires: gnome-menus-devel >= 3.2.0
+BuildRequires: gobject-introspection-devel >= 0.10.0
+BuildRequires: gtk+3-devel >= 3.0.0
BuildRequires: gtk-doc >= 1.9
-BuildRequires: intltool >= 0.37.0
-BuildRequires: libglade2-devel >= 1:2.6.2
-BuildRequires: libgnomeui-devel >= 2.22.0
-BuildRequires: libgweather-devel >= 2.22.1.1
-BuildRequires: librsvg-devel >= 2.18.2
+BuildRequires: intltool >= 0.40.0
+BuildRequires: libgweather-devel >= 3.0.0
+BuildRequires: librsvg-devel >= 2.22.0
BuildRequires: libtool
-BuildRequires: libwnck-devel >= 2.22.0
-BuildRequires: libxml2-devel >= 1:2.6.31
+BuildRequires: libwnck-devel >= 3.0.0
BuildRequires: perl-base
BuildRequires: pkgconfig >= 1:0.15.0
BuildRequires: rpm-build >= 4.1-10
+BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(find_lang) >= 1.23
BuildRequires: rpmbuild(macros) >= 1.311
BuildRequires: scrollkeeper >= 0.3.11
-BuildRequires: sed >= 4.0
+BuildRequires: tar >= 1:1.22
+BuildRequires: telepathy-glib-devel >= 0.14.0
+BuildRequires: xorg-lib-libSM-devel
+BuildRequires: xz
BuildConflicts: GConf-devel < 1.0.9-7
-Requires(post,postun): gtk+2
-Requires(post,postun): hicolor-icon-theme
+Requires(post,postun): gtk-update-icon-cache
Requires(post,postun): scrollkeeper
Requires(post,preun): GConf2
Requires: %{name}-libs = %{version}-%{release}
-Requires: gnome-desktop >= 2.22.0
-Requires: gnome-icon-theme >= 2.22.0
-Requires: tzdata
+Requires: gnome-desktop >= 3.2.0
+Requires: gnome-icon-theme >= 3.0.0
+Requires: hicolor-icon-theme
+Requires: tzdata >= 2008b-4
Requires: xdg-menus
Suggests: gnome-utils-screenshot
Suggests: gnome-utils-search-tool
+Suggests: polkit-gnome >= 0.93
# sr@Latn vs. sr@latin
Conflicts: glibc-misc < 6:2.7
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
Summary: GNOME panel library
Summary(pl.UTF-8): Biblioteka panelu GNOME
Group: X11/Libraries
-Requires: libgnomeui >= 2.22.0
-Requires: librsvg >= 1:2.18.2
+Requires: librsvg >= 1:2.22.0
%description libs
GNOME panel library.
Summary(pl.UTF-8): Pliki nagłówkowe biblioteki panelu GNOME
Group: X11/Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
-Requires: libgnomeui-devel >= 2.22.0
+Requires: GConf2-devel >= 2.26.0
+Requires: glib2-devel >= 1:2.28.0
+Requires: gtk+3-devel >= 3.0.0
%description devel
Panel header files for creating GNOME panels.
%description devel -l pl.UTF-8
Pliki nagłówkowe bibliotek panelu GNOME.
-%package static
-Summary: GNOME panel static libraries
-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.UTF-8
-Statyczne biblioteki panelu GNOME.
-
%package apidocs
Summary: panel-applet API documentation
Summary(pl.UTF-8): Dokumentacja API panel-applet
%prep
%setup -q
-%patch0 -p1
-
-sed -i -e 's#sr@Latn#sr@latin#' po/LINGUAS
-mv po/sr@{Latn,latin}.po
+%patch0 -p0
# 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
+%{__gtkdocize}
%{__gnome_doc_prepare}
%{__gnome_doc_common}
%{__intltoolize}
%{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
%{__autoconf}
%{__autoheader}
%{__automake}
%configure \
--disable-schemas-install \
+ --disable-schemas-compile \
+ --disable-silent-rules \
+ --disable-static \
--enable-eds \
--enable-gtk-doc \
--with-html-dir=%{_gtkdocdir}
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pixmapsdir},%{_datadir}/%{name}}
+install -d $RPM_BUILD_ROOT%{_datadir}/%{name}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT \
GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-install %{name}/panel-default-setup.entries $RPM_BUILD_ROOT%{_datadir}/%{name}
-
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/panel-default-setup.entries
-
-rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/ps
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libpanel-applet-4.la
%find_lang %{name} --with-gnome --with-omf --all-name
%post
%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
+%glib_compile_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
-%{_bindir}/gconftool-2 --direct \
- --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
%scrollkeeper_update_postun
+%glib_compile_schemas
%update_icon_cache hicolor
%post libs -p /sbin/ldconfig
%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}/fish-applet-2
-%attr(755,root,root) %{_libdir}/gnome-clock-applet-mechanism
-%attr(755,root,root) %{_libdir}/notification-area-applet
-%attr(755,root,root) %{_libdir}/wnck-applet
-%{_datadir}/PolicyKit/policy/gnome-clock-applet-mechanism.policy
-%{_datadir}/dbus-1/system-services/org.gnome.ClockApplet.Mechanism.service
-%{_datadir}/gnome-2.0/ui/*.xml
+%attr(755,root,root) %{_libexecdir}/clock-applet
+%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/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-panel
-%{_datadir}/gnome-panelrc
-%{_datadir}/idl/gnome-panel-2.0
%{_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
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.applet.fish.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.applet.window-list.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.applet.workspace-switcher.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.enums.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.launcher.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.menu-button.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.object.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-panel.toplevel.gschema.xml
%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
+%attr(755,root,root) %{_libdir}/libpanel-applet-4.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libpanel-applet-4.so.0
+%{_libdir}/girepository-1.0/PanelApplet-4.0.typelib
%files devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libpanel-applet-2.so
-%{_libdir}/libpanel-applet-2.la
-%{_includedir}/panel-2.0
-%{_pkgconfigdir}/libpanelapplet-2.0.pc
-
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/libpanel-applet-2.a
+%attr(755,root,root) %{_libdir}/libpanel-applet-4.so
+%{_includedir}/gnome-panel-4.0
+%{_pkgconfigdir}/libpanelapplet-4.0.pc
+%{_datadir}/gir-1.0/PanelApplet-4.0.gir
%files apidocs
%defattr(644,root,root,755)
-%{_gtkdocdir}/panel-applet
+%{_gtkdocdir}/panel-applet-4.0