+#
+# 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
Name: gnome-panel
-Version: 2.3.6.1
-Release: 2
+Version: 2.10.1
+Release: 3
License: LGPL
Group: X11/Applications
-Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.3/%{name}-%{version}.tar.bz2
-# Source0-md5: 3a90cb8ab07b7f169e295a6774cc08ba
-Patch0: %{name}-clock.patch
+Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-panel/2.10/%{name}-%{version}.tar.bz2
+# Source0-md5: a2719f5c79a9e48bca086f08a77a6889
+Source1: pld-desktop-stripe.png
+# Source1-md5: 4b8b299a8aa7b95a606e7c4d8debd60c
+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
+Patch4: %{name}-no_mixer_applet.patch
URL: http://www.gnome.org/
-BuildRequires: GConf2-devel >= 2.3.3
-BuildRequires: ORBit2-devel >= 2.7.5-1
+BuildRequires: GConf2-devel >= 2.10.0
+BuildRequires: ORBit2-devel >= 1:2.12.1
BuildRequires: autoconf
BuildRequires: automake
-BuildRequires: glib2-devel >= 2.2.1
-BuildRequires: gnome-common >= 2.3.0
-BuildRequires: gnome-desktop-devel >= 2.3.6
-BuildRequires: gtk+2-devel >= 2.2.1
-BuildRequires: gtk-doc >= 1.0
-BuildRequires: intltool >= 0.23
-BuildRequires: libart_lgpl-devel >= 2.3.13
-BuildRequires: libglade2-devel >= 2.0.1
-BuildRequires: libgnomeui-devel >= 2.3.3.1-2
+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: libtool
-BuildRequires: libwnck-devel >= 2.3.0
-BuildRequires: pkgconfig >= 0.12.0
+BuildRequires: libwnck-devel >= 2.10.0
+BuildRequires: pango-devel >= 1:1.8.0
+BuildRequires: perl-base
+BuildRequires: pkgconfig >= 1:0.15.0
BuildRequires: rpm-build >= 4.1-10
+BuildRequires: rpmbuild(macros) >= 1.197
BuildRequires: scrollkeeper >= 0.3.11
BuildConflicts: GConf-devel < 1.0.9-7
-Requires(post,postun): /sbin/ldconfig
-Requires(post,postun): scrollkeeper
-Requires(post): GConf2 >= 2.3.3
-Requires: gnome-desktop >= 2.3.6
-Requires: libgnomeui >= 2.3.3.1-2
+Requires(post,postun): /sbin/ldconfig
+Requires(post,preun): GConf2 >= 2.10.0
+Requires(post,postun): scrollkeeper
+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: xdg-menus
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
manager for the X Window System. GNOME is similar in purpose and scope
to CDE and KDE, but GNOME is based completely on free software.
-The GNOME panel packages provides the gnome panel, menus and some
+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.
+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.
Summary: GNOME panel includes, and more
Summary(pl): Pliki nag³ówkowe biblioteki panelu GNOME
Group: X11/Development/Libraries
-Requires: %{name} = %{version}
-Requires: libgnomeui-devel >= 2.3.3.1-2
+Requires: %{name} = %{version}-%{release}
Requires: gtk-doc-common
+Requires: libgnomeui-devel >= 2.10.0-2
%description devel
Panel header files for creating GNOME panels.
Summary: GNOME panel static libraries
Summary(pl): Statyczne biblioteki panelu GNOME
Group: X11/Development/Libraries
-Requires: %{name}-devel = %{version}
+Requires: %{name}-devel = %{version}-%{release}
%description static
Panel static libraries.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
+%{?with_menu_stripe:%patch2 -p1}
+%patch3 -p1
+%patch4 -p1
%build
-intltoolize --copy --force
+cp /usr/share/gnome-common/data/omf.make .
+%{__intltoolize}
%{__libtoolize}
-glib-gettextize --copy --force
-%{__aclocal} -I %{_aclocaldir}/gnome2-macros
+%{__glib_gettextize}
+%{__aclocal}
%{__autoheader}
%{__autoconf}
%{__automake}
%configure \
--enable-gtk-doc \
- --with-html-dir=%{_gtkdocdir}
-
+ --with-html-dir=%{_gtkdocdir} \
+ --enable-eds \
+ --disable-schemas-install
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT{%{_pixmapsdir},%{_datadir}/%{name}}
%{__make} install \
- DESTDIR=$RPM_BUILD_ROOT
+ DESTDIR=$RPM_BUILD_ROOT \
+ GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
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 -r $RPM_BUILD_ROOT%{_datadir}/locale/no
+
%find_lang %{name} --with-gnome --all-name
%clean
%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
%{_bindir}/gconftool-2 --direct \
---config-source="`%{_bindir}/gconftool-2 --get-default-source`" \
---load %{_datadir}/%{name}/panel-default-setup.entries > /dev/null
-
-%postun
+ --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
+%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
+%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
%files -f %{name}.lang
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/*
%attr(755,root,root) %{_libdir}/fish-applet-2
%attr(755,root,root) %{_libdir}/libpanel-applet*.so.*.*
-%attr(755,root,root) %{_libdir}/libclock-applet*.so
+%attr(755,root,root) %{_libdir}/clock-applet
%attr(755,root,root) %{_libdir}/wnck-applet
%attr(755,root,root) %{_libdir}/notification-area-applet
%{_libdir}/bonobo/servers/*
-%{_datadir}/control-center-2.0/capplets/*
%{_datadir}/gnome/panel
%{_datadir}/gnome-2.0/ui/*
%{_datadir}/gnome-panel
%{_datadir}/gnome-panelrc
%{_datadir}/idl/gnome-panel-2.0
%{_pixmapsdir}/*
+%{_iconsdir}/*/*/apps/*.png
%{_omf_dest_dir}/%{name}
%{_mandir}/man1/*
projects / packages / gnome-panel.git / blobdiff