Summary: The core programs for the GNOME GUI desktop environment
Summary(pl): Podstawowe programy ¶rodowiska graficznego GNOME
Name: gnome-panel
-Version: 1.5.21
-Release: 1
+Version: 2.4.0
+Release: 5
License: LGPL
Group: X11/Applications
-Source0: ftp://ftp.gnome.org/pub/gnome/pre-gnome2/sources/%{name}/%{name}-%{version}.tar.bz2
-Patch0: %{name}-am.patch
+Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.4/%{name}-%{version}.tar.bz2
+# Source0-md5: 9a81f7ebbb450611a28783900f5f2cbc
+Patch0: %{name}-clock.patch
+Patch1: %{name}-no_launchers_on_panel.patch
+Patch2: %{name}-focus.patch
URL: http://www.gnome.org/
-BuildRequires: ORBit2-devel >= 2.3.108
-BuildRequires: gnome-desktop-devel >= 1.5.18
-BuildRequires: gnome-vfs2-devel >= 1.9.14
-BuildRequires: gtk+2-devel >= 2.0.2
-BuildRequires: libglade2-devel >= 1.99.12
-BuildRequires: libgnomeui-devel >= 1.116.1
-BuildRequires: libwnck-devel >= 0.9
-BuildRequires: pkgconfig >= 0.12.0
+BuildRequires: GConf2-devel >= 2.4.0
+BuildRequires: ORBit2-devel >= 2.8.1
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: glib2-devel >= 2.2.3
+BuildRequires: gnome-common >= 2.3.0
+BuildRequires: gnome-desktop-devel >= 2.4.0
+BuildRequires: gtk+2-devel >= 2.2.4
+BuildRequires: gtk-doc >= 1.1
+BuildRequires: intltool >= 0.27.2
+BuildRequires: libart_lgpl-devel >= 2.3.15
+BuildRequires: libglade2-devel >= 2.0.1
+BuildRequires: libgnomeui-devel >= 2.4.0.1
+BuildRequires: libtool
+BuildRequires: libwnck-devel >= 2.4.0
+BuildRequires: pkgconfig >= 0.15.0
+BuildRequires: rpm-build >= 4.1-10
+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.4.0
+#Requires: gnome-applets >= 2.4.1
+Requires: gnome-desktop >= 2.4.0
+Requires: gnome-icon-theme >= 1.0.9
+Requires: libgnomeui >= 2.4.0.1
+Requires: librsvg >= 2.4.0-3
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define _prefix /usr/X11R6
-%define _mandir %{_prefix}/man
-%define _sysconfdir /etc/X11/GNOME2
-%define _omf_dest_dir %(scrollkeeper-config --omfdir)
-
%description
GNOME (GNU Network Object Model Environment) is a user-friendly set of
applications and desktop tools to be used in conjunction with a window
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
Summary(pl): Pliki nag³ówkowe biblioteki panelu GNOME
Group: X11/Development/Libraries
Requires: %{name} = %{version}
+Requires: gtk-doc-common
+Requires: libgnomeui-devel >= 2.4.0.1
%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} = %{version}-devel
+Requires: %{name}-devel = %{version}
%description static
Panel static libraries.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
+%patch2 -p1
%build
intltoolize --copy --force
-libtoolize --copy --force
-gettextize --copy --force
-aclocal
-autoconf
-automake -a -c -f
-if [ -f %{_pkgconfigdir}/libpng12.pc ] ; then
- CPPFLAGS="`pkg-config libpng12 --cflags`"
-fi
-%configure CPPFLAGS="$CPPFLAGS" \
- --enable-gtk-doc=no
+%{__libtoolize}
+glib-gettextize --copy --force
+%{__aclocal} -I %{_aclocaldir}/gnome2-macros
+%{__autoheader}
+%{__autoconf}
+%{__automake}
+%configure \
+ --enable-gtk-doc \
+ --with-html-dir=%{_gtkdocdir}
+
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
%{__make} install \
- DESTDIR=$RPM_BUILD_ROOT \
- omf_dest_dir=%{_omf_dest_dir}/%{name} \
- pkgconfigdir=%{_pkgconfigdir}
+ DESTDIR=$RPM_BUILD_ROOT
-gzip -9nf AUTHORS ChangeLog NEWS README
+install %{name}/panel-default-setup.entries $RPM_BUILD_ROOT%{_datadir}/%{name}
+
+mv ChangeLog main-ChangeLog
+find . -name ChangeLog |awk '{src=$0; dst=$0;sub("^./","",dst);gsub("/","-",dst); print "cp " src " " dst}'|sh
%find_lang %{name} --with-gnome --all-name
%post
/sbin/ldconfig
-GCONF_CONFIG_SOURCE=`%{_bindir}/gconftool-2 --get-default-source`; export GCONF_CONFIG_SOURCE
-%{_bindir}/gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/*.schemas > /dev/null
+scrollkeeper-update
+%gconf_schema_install
+%{_bindir}/gconftool-2 --direct \
+--config-source="`%{_bindir}/gconftool-2 --get-default-source`" \
+--load %{_datadir}/%{name}/panel-default-setup.entries > /dev/null
-%postun -p /sbin/ldconfig
+%postun
+/sbin/ldconfig
+scrollkeeper-update
%files -f %{name}.lang
%defattr(644,root,root,755)
-%doc *.gz
+%doc AUTHORS NEWS README *ChangeLog
%config %{_sysconfdir}/gconf/schemas/*
-%config %{_sysconfdir}/sound/events/*
%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}/libgen_util_applet*.so
+%attr(755,root,root) %{_libdir}/libclock-applet*.so
+%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}/gen_util
%{_datadir}/gnome/panel
%{_datadir}/gnome-2.0/ui/*
%{_datadir}/gnome-panel
-%{_datadir}/gtk-doc/html/panel-applet
+%{_datadir}/gnome-panelrc
%{_datadir}/idl/gnome-panel-2.0
-%{_datadir}/pixmaps/*
+%{_pixmapsdir}/*
%{_omf_dest_dir}/%{name}
%{_mandir}/man1/*
%files devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libpanel-applet*.??
+%attr(755,root,root) %{_libdir}/libpanel-applet*.so
+%{_libdir}/*.la
+%{_gtkdocdir}/panel-applet
%{_includedir}/panel-2.0
%{_pkgconfigdir}/*.pc
%files static
%defattr(644,root,root,755)
-%{_libdir}/libpanel-applet*.a
+%{_libdir}/lib*.a