-Summary: The core programs for the GNOME GUI desktop environment
-Summary(pl): Podstawowe programy ¶rodowiska graficznego GNOME
+Summary: gnome-desktop library
+Summary(pl.UTF-8): Biblioteka gnome-desktop
Name: gnome-desktop
-Version: 2.15.92
+Version: 3.6.0.1
Release: 1
License: LGPL
Group: X11/Applications
-Source0: http://ftp.gnome.org/pub/gnome/sources/gnome-desktop/2.15/%{name}-%{version}.tar.bz2
-# Source0-md5: 93c5edd6c047777263e6fcaf05fc9e59
-Source1: pld-logo.svg
-Patch0: %{name}-crystalsvg.patch
-Patch1: %{name}-desktop.patch
-Patch2: %{name}-recently-used-apps.patch
+Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-desktop/3.6/%{name}-%{version}.tar.xz
+# Source0-md5: 48e8c2e0c86553f1b7e6088ab8c292c1
URL: http://www.gnome.org/
BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: gnome-common >= 2.12.0
-BuildRequires: gnome-doc-utils >= 0.7.2
-BuildRequires: gnome-vfs2-devel >= 2.15.92
-BuildRequires: gtk+2-devel >= 2:2.10.2
-BuildRequires: gtk-doc >= 1.7
-BuildRequires: intltool
-BuildRequires: libgnomeui-devel >= 2.15.91
-BuildRequires: libtool
+BuildRequires: automake >= 1:1.11
+BuildRequires: docbook-dtd412-xml
+BuildRequires: gdk-pixbuf2-devel >= 2.22.0
+BuildRequires: gettext-devel
+BuildRequires: glib2-devel >= 1:2.33.3
+BuildRequires: gnome-common >= 2.24.0
+BuildRequires: gnome-doc-utils >= 0.14.0
+BuildRequires: gobject-introspection-devel >= 0.10.0
+BuildRequires: gsettings-desktop-schemas-devel >= 3.5.91
+BuildRequires: gtk+3-devel >= 3.4.0
+BuildRequires: gtk-doc >= 1.8
+BuildRequires: intltool >= 0.40.6
+BuildRequires: libtool >= 2:2.2.6
BuildRequires: pkgconfig
+BuildRequires: rpmbuild(find_lang) >= 1.23
BuildRequires: rpmbuild(macros) >= 1.311
-BuildRequires: scrollkeeper
-BuildRequires: startup-notification-devel >= 0.8
-BuildRequires: scrollkeeper
+BuildRequires: tar >= 1:1.22
+BuildRequires: xorg-lib-libXext-devel
+BuildRequires: xorg-lib-libXrandr-devel >= 1.3
+BuildRequires: xorg-lib-libxkbfile-devel
+BuildRequires: xz
Requires(post,postun): scrollkeeper
-Requires: %{name}-libs = %{version}-%{release}
-Obsoletes: gnome-core
+Requires: gsettings-desktop-schemas >= 3.5.91
+Requires: gtk+3 >= 3.4.0
+Obsoletes: gnome-desktop-libs
+Obsoletes: gnome-desktop3
+Obsoletes: gnome-desktop3-libs
+# sr@Latn vs. sr@latin
+Conflicts: glibc-misc < 6:2.7
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%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.
-
-This package contains applications related to GNOME desktop.
-
-%description -l pl
-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.
+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.
-Ten pakiet zawiera aplikacje zwi±zane w desktopem GNOME.
-
-%package libs
-Summary: gnome-desktop library
-Summary(pl): Biblioteka gnome-desktop
-Group: Development/Libraries
-Requires: libgnomeui >= 2.15.91
-
-%description libs
This package contains gnome-desktop library.
-%description libs -l pl
-Pakiet ten zawiera bibliotekê gnome-desktop.
+%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.
+
+Pakiet ten zawiera bibliotekę gnome-desktop.
%package devel
Summary: GNOME desktop includes
-Summary(pl): Pliki nag³ówkowe bibliotek GNOME desktop
+Summary(pl.UTF-8): Pliki nagłówkowe biblioteki GNOME desktop
Group: X11/Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}
-Requires: libgnomeui-devel >= 2.15.91
-Requires: startup-notification-devel >= 0.8
+Requires: %{name} = %{version}-%{release}
+Requires: gsettings-desktop-schemas-devel >= 3.5.91
+Requires: gtk+3-devel >= 3.4.0
+Obsoletes: gnome-desktop3-devel
%description devel
GNOME desktop header files.
-%description devel -l pl
-Pliki nag³ówkowe bibliotek GNOME desktop.
-
-%package static
-Summary: GNOME desktop static libraries
-Summary(pl): Statyczne biblioteki GNOME desktop
-Group: X11/Development/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description static
-GNOME desktop static libraries.
-
-%description static -l pl
-Statyczne biblioteki GNOME desktop.
+%description devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki GNOME desktop.
%package apidocs
Summary: gnome-desktop API documentation
-Summary(pl): Dokumentacja API gnome-desktop
+Summary(pl.UTF-8): Dokumentacja API gnome-desktop
Group: Documentation
Requires: gtk-doc-common
+Obsoletes: gnome-desktop3-apidocs
%description apidocs
gnome-desktop API documentation.
-%description apidocs -l pl
+%description apidocs -l pl.UTF-8
Dokumentacja API gnome-desktop.
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
%build
%{__gtkdocize}
%{__gnome_doc_common}
%{__intltoolize}
%{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
%{__autoconf}
%{__autoheader}
%{__automake}
%configure \
--with-gnome-distributor="PLD Linux Distribution" \
- --with-html-dir=%{_gtkdocdir}
+ --enable-gtk-doc \
+ --with-html-dir=%{_gtkdocdir} \
+ --disable-silent-rules
%{__make}
%install
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-rm -rf $RPM_BUILD_ROOT%{_pixmapsdir}/gnome-logo-icon-transparent.png
-install %{SOURCE1} $RPM_BUILD_ROOT%{_pixmapsdir}/gnome-logo-icon-transparent.svg
-rm -r $RPM_BUILD_ROOT%{_datadir}/locale/{tk,ug,yo}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
-%find_lang %{name} --with-gnome --all-name
+%find_lang %{name} --with-gnome --with-omf --all-name
%clean
-rm -fr $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
%post
+/sbin/ldconfig
%scrollkeeper_update_post
%postun
+/sbin/ldconfig
%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}/*
-%doc %{_mandir}/man1/*
-%{_datadir}/gnome-about
-%{_pixmapsdir}/*
-%{_omf_dest_dir}/fdl
-%{_omf_dest_dir}/gnome-feedback
-%{_omf_dest_dir}/gpl
-%{_omf_dest_dir}/lgpl
-%{_desktopdir}/*.desktop
-
-%files libs
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
+%doc AUTHORS ChangeLog MAINTAINERS NEWS README
+%attr(755,root,root) %{_libdir}/libgnome-desktop-3.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgnome-desktop-3.so.4
+%attr(755,root,root) %{_libdir}/gnome-rr-debug
+%{_datadir}/gnome/gnome-version.xml
+%{_datadir}/libgnome-desktop-3.0
+%{_libdir}/girepository-1.0/GnomeDesktop-3.0.typelib
%files devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
-%{_includedir}/gnome-desktop-2.0
-%{_pkgconfigdir}/*.pc
-%{_gtkdocdir}/*
-
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/*.a
+%attr(755,root,root) %{_libdir}/libgnome-desktop-3.so
+%{_includedir}/gnome-desktop-3.0
+%{_pkgconfigdir}/gnome-desktop-3.0.pc
+%{_datadir}/gir-1.0/GnomeDesktop-3.0.gir
%files apidocs
%defattr(644,root,root,755)
-%{_gtkdocdir}/*
+%{_gtkdocdir}/gnome-desktop3