-Summary: The core programs for the GNOME GUI desktop environment.
+Summary: The core programs for the GNOME GUI desktop environment
+Summary(pl): Podstawowe programy ¶rodowiska graficznego GNOME
Name: gnome-panel
-Version: 1.5.19
-Release: 0.1
+Version: 2.1.0
+Release: 1
License: LGPL
Group: X11/Applications
-Source0: ftp://ftp.gnome.org/pub/gnome/pre-gnome2/sources/%{name}/%{name}-%{version}.tar.bz2
-Patch0: %{name}-am.patch
-BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.1/%{name}-%{version}.tar.bz2
URL: http://www.gnome.org/
-BuildRequires: pkgconfig
-BuildRequires: ORBit2-devel
-BuildRequires: gtk+2-devel
-BuildRequires: libgnomeui-devel
-BuildRequires: libwnck-devel
-BuildRequires: gnome-desktop-devel >= 1.5.18
-BuildRequires: libglade2-devel
-BuildRequires: gnome-vfs2-devel
+BuildRequires: ORBit2-devel >= 2.4.3
+Buildrequires: gdk-pixbuf-devel >= 2.1.0
+BuildRequires: glib2-devel >= 2.1.0
+BuildRequires: gnome-desktop-devel >= 2.1.0
+BuildRequires: gtk-doc
+BuildRequires: gtk+2-devel >= 2.1.0
+BuildRequires: intltool >= 0.22
+BuildRequires: libglade2-devel >= 2.0.1
+BuildRequires: libgnomeui-devel >= 2.1.0
+BuildRequires: libwnck-devel >= 2.1.1
+BuildRequires: pkgconfig >= 0.12.0
+BuildRequires: scrollkeeper >= 0.3.11
+Requires(post,postun): scrollkeeper
+Requires(post,postun): /sbin/ldconfig
+Requires(post): GConf2
+Requires: gnome-desktop >= 2.1.0
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _prefix /usr/X11R6
%define _mandir %{_prefix}/man
%define _sysconfdir /etc/X11/GNOME2
+%define _gtkdocdir %{_defaultdocdir}/gtk-doc/html
%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-core package includes the basic programs and libraries that are
-needed to install GNOME.
+to CDE and KDE, but GNOME is based completely on free software.
-The GNOME panel packages provides the gnome panel, menu's 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.
+
+Ten pakiet dostarcza panel GNOME2, menu oraz podstawowe aplety dla
+panelu GNOME2.
+
%package devel
-Summary: GNOME panel libraries, includes, and more.
+Summary: GNOME panel includes, and more
+Summary(pl): Pliki nag³ówkowe biblioteki panelu GNOME
Group: X11/Development/Libraries
Requires: %{name} = %{version}
+Requires: gtk-doc-common
%description devel
-Panel libraries and header files for creating GNOME panels.
+Panel header files for creating GNOME panels.
+
+%description devel -l pl
+Pliki nag³ówkowe bibliotek panelu GNOME.
%package static
-Summary: GNOME panel libraries, includes, and more.
+Summary: GNOME panel static libraries
+Summary(pl): Statyczne biblioteki panelu GNOME
Group: X11/Development/Libraries
Requires: %{name} = %{version}-devel
%description static
-Panel libraries and header files for creating GNOME panels.
+Panel static libraries.
+
+%description static -l pl
+Statyczne biblioteki panelu GNOME.
%prep
%setup -q
-%patch0 -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
-%{__make}
+%{__libtoolize}
+glib-gettextize --copy --force
+%{__aclocal} -I %{_aclocaldir}/gnome2-macros
+%{__autoconf}
+%{__automake}
+%configure \
+ --enable-gtk-doc \
+ --with-html-path=%{_gtkdocdir}
+%{__make}
%install
rm -rf $RPM_BUILD_ROOT
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT \
omf_dest_dir=%{_omf_dest_dir}/%{name} \
- pkgconfigdir=%{_pkgconfigdir}
+ pkgconfigdir=%{_pkgconfigdir} \
+ HTML_DIR=%{_gtkdocdir}
-gzip -9nf AUTHORS ChangeLog NEWS README
+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
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-for SCHEMAS in `ls %{_sysconfdir}/gconf/schemas/*.schemas`; do
- /usr/X11R6/bin/gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$SCHEMAS > /dev/null 2>&1
-done
+scrollkeeper-update
+GCONF_CONFIG_SOURCE="`%{_bindir}/gconftool-2 --get-default-source`" \
+%{_bindir}/gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/*.schemas > /dev/null
-%postun -p /sbin/ldconfig
+%postun
+/sbin/ldconfig
+scrollkeeper-update
%files -f %{name}.lang
%defattr(644,root,root,755)
-%doc *.gz
+%doc AUTHORS *ChangeLog NEWS README
%config %{_sysconfdir}/gconf/schemas/*
%config %{_sysconfdir}/sound/events/*
%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
+%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}/libgen_util_applet*.la
%{_libdir}/bonobo/servers/*
-%{_datadir}/applications/*
%{_datadir}/control-center-2.0/capplets/*
%{_datadir}/gen_util
%{_datadir}/gnome/panel
-%{_datadir}/gnome-2.0
-%{_datadir}/gnome-panel
-%{_datadir}/gtk-doc/html/panel-applet
+%{_datadir}/gnome-2.0/ui/*
+%{_datadir}/gnome-panel*
%{_datadir}/idl/gnome-panel-2.0
-%{_datadir}/pixmaps/fish
-%{_datadir}/pixmaps/mailcheck
-%{_datadir}/pixmaps/*.png
+%{_datadir}/pixmaps/*
%{_omf_dest_dir}/%{name}
%{_mandir}/man1/*
%files devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.??
+%attr(755,root,root) %{_libdir}/libpanel-applet*.??
+%{_gtkdocdir}/panel-applet
%{_includedir}/panel-2.0
%{_pkgconfigdir}/*.pc
%files static
%defattr(644,root,root,755)
-%{_libdir}/*.a
+%{_libdir}/lib*.a