-# TODO:
-# play with --with-kde-datadir
-Summary: The core programs for the GNOME2 GUI desktop environment
-Summary(pl): Podstawowe programy ¶rodowiska graficznego GNOME2
+Summary: The core programs for the GNOME GUI desktop environment
+Summary(pl.UTF-8): Podstawowe programy środowiska graficznego GNOME
Name: gnome-desktop
-Version: 2.3.4
-Release: 1
+Version: 2.28.1
+Release: 2
License: LGPL
Group: X11/Applications
-Source0: http://ftp.gnome.org/pub/gnome/sources/%{name}/2.3/%{name}-%{version}.tar.bz2
-# Source0-md5: ee30d752d4a0245603b9c152b37eb6e0
-#Patch0: %{name}-locale-sr.patch
+Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-desktop/2.28/%{name}-%{version}.tar.bz2
+# Source0-md5: 6870b71b564dc902af65ddee176e603f
+Source1: pld-logo.svg
URL: http://www.gnome.org/
+BuildRequires: GConf2-devel >= 2.26.0
BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: gnome-vfs2-devel >= 2.3.5
-BuildRequires: gtk+2-devel >= 2.2.1
-BuildRequires: libgnomeui-devel >= 2.3.3.1
-BuildRequires: libgnomecanvas-devel >= 2.3.0
+BuildRequires: automake >= 1:1.9
+BuildRequires: gettext-devel
+BuildRequires: glib2-devel >= 1:2.20.0
+BuildRequires: gnome-common >= 2.24.0
+BuildRequires: gnome-doc-utils >= 0.14.0
+BuildRequires: gtk+2-devel >= 2:2.16.0
+BuildRequires: gtk-doc >= 1.8
+BuildRequires: intltool >= 0.40.0
BuildRequires: libtool
-BuildRequires: startup-notification-devel >= 0.5
-Requires: libgnomeui >= 2.3.3.1
-Conflicts: gnome-core
+BuildRequires: pkgconfig
+BuildRequires: rpmbuild(find_lang) >= 1.23
+BuildRequires: rpmbuild(macros) >= 1.311
+BuildRequires: scrollkeeper
+BuildRequires: startup-notification-devel >= 0.8
+BuildRequires: xorg-lib-libXrandr-devel >= 1.2
+Requires(post,postun): scrollkeeper
+Requires: %{name}-libs = %{version}-%{release}
+Requires: python-gnome
+Requires: python-pygtk-gtk
+Obsoletes: gnome-core
+# sr@Latn vs. sr@latin
+Conflicts: glibc-misc < 6:2.7
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
-GNOME2 (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. GNOME2 is similar in purpose
-and scope to CDE and KDE, but GNOME2 is based completely on free
-software.
+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.
-This package contains applications related to GNOME2 desktop.
+This package contains applications related to GNOME desktop.
-%description -l pl
-GNOME2 (GNU Network Object Model Environment) jest zestawem
-przyjaznych dla u¿ytkownika programów i narzêdzi biurkowych, których
-u¿ywa siê wraz z zarz±dc± okien systemu X Window. GNOME2 przypomina
-wygl±dem i zakresem funkcjonalno¶ci CDE i KDE, jednak GNOME2 opiera
-siê w ca³o¶ci na wolnym oprogramowaniu.
+%description -l pl.UTF-8
+GNOME (GNU Network Object Model Environment) jest zestawem przyjaznych
+dla użytkownika programów i narzędzi biurkowych, których używa się
+wraz z zarządcą okien systemu X Window. GNOME przypomina wyglądem i
+zakresem funkcjonalności CDE i KDE, jednak GNOME opiera się w całości
+na wolnym oprogramowaniu.
-Ten pakiet zawiera aplikacje zwi±zane w desktopem GNOME2.
+Ten pakiet zawiera aplikacje związane w desktopem GNOME.
+
+%package libs
+Summary: gnome-desktop library
+Summary(pl.UTF-8): Biblioteka gnome-desktop
+Group: X11/Libraries
+
+%description libs
+This package contains gnome-desktop library.
+
+%description libs -l pl.UTF-8
+Pakiet ten zawiera bibliotekę gnome-desktop.
%package devel
-Summary: GNOME2 desktop includes
-Summary(pl): Pliki nag³ówkowe bibliotek GNOME2 desktop
-Group: X11/Development/Libraries
-Requires: %{name} = %{version}
-Requires: startup-notification-devel
-Requires: libgnomeui-devel >= 2.3.0
+Summary: GNOME desktop includes
+Summary(pl.UTF-8): Pliki nagłówkowe bibliotek GNOME desktop
+Group: X11/Development/Libraries
+Requires: %{name}-libs = %{version}-%{release}
+Requires: gtk+2-devel >= 2:2.16.0
+Requires: startup-notification-devel >= 0.8
%description devel
-GNOME2 desktop header files.
+GNOME desktop header files.
-%description devel -l pl
-Pliki nag³ówkowe bibliotek GNOME2 desktop.
+%description devel -l pl.UTF-8
+Pliki nagłówkowe bibliotek GNOME desktop.
%package static
-Summary: GNOME2 desktop static libraries
-Summary(pl): Statyczne biblioteki GNOME2 desktop
-Group: X11/Development/Libraries
-Requires: %{name} = %{version}
+Summary: GNOME desktop static libraries
+Summary(pl.UTF-8): Statyczne biblioteki GNOME desktop
+Group: X11/Development/Libraries
+Requires: %{name} = %{version}-%{release}
%description static
-GNOME2 desktop static libraries.
+GNOME desktop static libraries.
+
+%description static -l pl.UTF-8
+Statyczne biblioteki GNOME desktop.
-%description static -l pl
-Statyczne biblioteki GNOME2 desktop.
+%package apidocs
+Summary: gnome-desktop API documentation
+Summary(pl.UTF-8): Dokumentacja API gnome-desktop
+Group: Documentation
+Requires: gtk-doc-common
+
+%description apidocs
+gnome-desktop API documentation.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API gnome-desktop.
%prep
%setup -q
-#%patch0 -p1
-
-# sr_YU is latin2, sr_YU@cyrillic is cyrillic in glibc
-#mv -f po/{sr.po,sr@cyrillic.po}
-#mv -f po/{sr@Latn.po,sr.po}
%build
+%{__gtkdocize}
+%{__intltoolize}
+%{__gnome_doc_prepare}
+%{__gnome_doc_common}
+%{__intltoolize}
%{__libtoolize}
-%{__aclocal} -I %{_aclocaldir}/gnome2-macros
+%{__aclocal} -I m4
%{__autoconf}
%{__autoheader}
%{__automake}
%configure \
- --with-gnome-distributor="PLD Linux Distribution"
-
+ --with-gnome-distributor="PLD Linux Distribution" \
+ --with-html-dir=%{_gtkdocdir}
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
%{__make} install \
- DESTDIR=$RPM_BUILD_ROOT
+ DESTDIR=$RPM_BUILD_ROOT
-%find_lang %{name} --with-gnome --all-name
+rm -rf $RPM_BUILD_ROOT%{_pixmapsdir}/gnome-logo-icon-transparent.png
+install %{SOURCE1} $RPM_BUILD_ROOT%{_pixmapsdir}/gnome-logo-icon-transparent.svg
+
+%find_lang %{name} --with-gnome --with-omf --all-name
%clean
rm -fr $RPM_BUILD_ROOT
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post
+%scrollkeeper_update_post
+
+%postun
+%scrollkeeper_update_postun
+
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
%files -f %{name}.lang
%defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
-%doc %{_mandir}/man1/*
-%{_datadir}/gnome/vfolders
+%doc AUTHORS ChangeLog MAINTAINERS NEWS README
+%attr(755,root,root) %{_bindir}/gnome-about
+%{_mandir}/man1/gnome-about.1*
%{_datadir}/gnome-about
+%{_datadir}/libgnome-desktop
%{_pixmapsdir}/*
+%{_desktopdir}/gnome-about.desktop
+
+%files libs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libgnome-desktop-2.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgnome-desktop-2.so.11
%files devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
+%attr(755,root,root) %{_libdir}/libgnome-desktop-2.so
+%{_libdir}/libgnome-desktop-2.la
%{_includedir}/gnome-desktop-2.0
-%{_pkgconfigdir}/*.pc
+%{_pkgconfigdir}/gnome-desktop-2.0.pc
%files static
%defattr(644,root,root,755)
-%{_libdir}/*.a
+%{_libdir}/libgnome-desktop-2.a
+
+%files apidocs
+%defattr(644,root,root,755)
+%{_gtkdocdir}/gnome-desktop