+# 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.18.2
+Version: 2.24.1
Release: 1
License: LGPL
Group: X11/Applications
-Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-panel/2.18/%{name}-%{version}.tar.bz2
-# Source0-md5: 5db34402d672afd41870946c38092b7f
-Patch0: %{name}-finalize-memleak.patch
-Patch1: %{name}-no_launchers_on_panel.patch
+Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-panel/2.24/%{name}-%{version}.tar.bz2
+# Source0-md5: 37742d8fcb909965d5e18f351a7c4578
+Patch0: %{name}-no_launchers_on_panel.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=552049
+Patch1: %{name}-use-sysconfig-timezone.patch
URL: http://www.gnome.org/
-BuildRequires: GConf2-devel >= 2.18.0.1
-BuildRequires: ORBit2-devel >= 1:2.14.7
+BuildRequires: GConf2-devel >= 2.24.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.10.2
-BuildRequires: gnome-common >= 2.18.0
-BuildRequires: gnome-desktop-devel >= 2.18.2
-BuildRequires: gnome-doc-utils >= 0.10.3
-BuildRequires: gnome-menus-devel >= 2.18.2
-BuildRequires: gnome-vfs2-devel >= 2.18.1
-BuildRequires: gtk+2-devel >= 2:2.10.10
-BuildRequires: gtk-doc >= 1.8
-BuildRequires: intltool >= 0.35.5
-BuildRequires: libart_lgpl-devel >= 2.3.19
-BuildRequires: libglade2-devel >= 1:2.6.0
-BuildRequires: libgnomeui-devel >= 2.18.1
+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.18.0
+BuildRequires: gnome-common >= 2.24.0
+BuildRequires: gnome-desktop-devel >= 2.24.0
+BuildRequires: gnome-doc-utils >= 0.14.0
+BuildRequires: gnome-menus-devel >= 2.24.0
+BuildRequires: gtk+2-devel >= 2:2.14.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.18.0
-BuildRequires: pango-devel >= 1:1.16.0
+BuildRequires: libwnck-devel >= 2.24.0
BuildRequires: perl-base
BuildRequires: pkgconfig >= 1:0.15.0
-BuildRequires: python-libxml2 >= 1:2.6.27
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): gtk+2
Requires(post,postun): hicolor-icon-theme
Requires(post,postun): scrollkeeper
Requires(post,preun): GConf2
Requires: %{name}-libs = %{version}-%{release}
-Requires: gnome-desktop >= 2.18.2
-Requires: gnome-icon-theme >= 2.18.0
+Requires: gnome-desktop >= 2.24.0
+Requires: gnome-icon-theme >= 2.24.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
Summary: GNOME panel library
Summary(pl.UTF-8): Biblioteka panelu GNOME
Group: X11/Libraries
-Requires: libgnomeui >= 2.18.1
-Requires: librsvg >= 1:2.16.1
+Requires: libgnomeui >= 2.24.0
+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.18.1
+Requires: gtk+2-devel >= 2:2.14.0
+Requires: libbonoboui-devel >= 2.24.0
+Requires: libgnomeui-devel >= 2.24.0
%description devel
Panel header files for creating GNOME panels.
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
+%patch1 -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
%{__gnome_doc_prepare}
%{__intltoolize}
%{__libtoolize}
%{__aclocal}
-%{__autoheader}
%{__autoconf}
+%{__autoheader}
%{__automake}
%configure \
--disable-schemas-install \
install %{name}/panel-default-setup.entries $RPM_BUILD_ROOT%{_datadir}/%{name}
-# 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
-
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/panel-default-setup.entries
-%find_lang %{name} --with-gnome --all-name
+%find_lang %{name} --with-gnome --with-omf --all-name
%clean
rm -rf $RPM_BUILD_ROOT
--config-source="`%{_bindir}/gconftool-2 --get-default-source`" \
--load %{_datadir}/%{name}/panel-default-setup.entries /apps/panel/profiles/default > /dev/null
-%banner %{name} -e << EOF
-For full functionality, you need to install
-gnome-utils-screenshot and gnome-utils-search-tool.
-EOF
-
%preun
%gconf_schema_uninstall clock.schemas
%gconf_schema_uninstall fish.schemas
%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}/gnome-2.0/ui/*
+%{_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/panel
%{_datadir}/gnome-panelrc
%{_datadir}/idl/gnome-panel-2.0
%{_desktopdir}/gnome-panel.desktop
%{_iconsdir}/hicolor/*/apps/*
-%{_libdir}/bonobo/servers/*
-%{_mandir}/man1/*
-%{_omf_dest_dir}/clock
-%{_omf_dest_dir}/fish
-%{_omf_dest_dir}/gnome-panel
-%{_omf_dest_dir}/window-list
-%{_omf_dest_dir}/workspace-switcher
+%{_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
%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)
projects / packages / gnome-panel.git / blobdiff