X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=gnome-desktop.spec;h=d8f98d70ad1dcd50e6b189a256bc9f25008ac6d8;hb=2266d9e751fdcbc84f9823c47fc17e9628da3ae1;hp=6874583265cbda3b1e1e66809ec519668d170e4f;hpb=d493a4e67d3b2382a06595c2fc16b05e4f886e83;p=packages%2Fgnome-desktop.git

diff --git a/gnome-desktop.spec b/gnome-desktop.spec
index 6874583..d8f98d7 100644
--- a/gnome-desktop.spec
+++ b/gnome-desktop.spec
@@ -1,105 +1,117 @@
 Summary:	The core programs for the GNOME GUI desktop environment
-Summary(pl):	Podstawowe programy ¶rodowiska graficznego GNOME
+Summary(pl.UTF-8):	Podstawowe programy środowiska graficznego GNOME
 Name:		gnome-desktop
-Version:	2.15.2
-Release:	3
+Version:	2.28.1
+Release:	2
 License:	LGPL
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/gnome/sources/gnome-desktop/2.15/%{name}-%{version}.tar.bz2
-# Source0-md5:	60d3c4f5977d6ef903e109a6de2c79c7
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-desktop/2.28/%{name}-%{version}.tar.bz2
+# Source0-md5:	6870b71b564dc902af65ddee176e603f
 Source1:	pld-logo.svg
-Patch0:		%{name}-crystalsvg.patch
-Patch1:		%{name}-desktop.patch
 URL:		http://www.gnome.org/
+BuildRequires:	GConf2-devel >= 2.26.0
 BuildRequires:	autoconf
-BuildRequires:	automake
-BuildRequires:	gnome-common >= 2.8.0
-BuildRequires:	gnome-doc-utils >= 0.3.1-2
-BuildRequires:	gnome-vfs2-devel >= 2.15.1
-BuildRequires:	gtk+2-devel >= 2:2.9.2
-BuildRequires:	gtk-doc >= 1.4
-BuildRequires:	intltool
-BuildRequires:	libgnomeui-devel >= 2.15.1
+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:	pkgconfig
-BuildRequires:	rpmbuild(macros) >= 1.197
+BuildRequires:	rpmbuild(find_lang) >= 1.23
+BuildRequires:	rpmbuild(macros) >= 1.311
 BuildRequires:	scrollkeeper
 BuildRequires:	startup-notification-devel >= 0.8
-BuildRequires:	scrollkeeper
+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
-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.
+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.
+%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 GNOME.
+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.1
+Summary(pl.UTF-8):	Biblioteka gnome-desktop
+Group:		X11/Libraries
 
 %description libs
 This package contains gnome-desktop library.
 
-%description libs -l pl
-Pakiet ten zawiera bibliotekê gnome-desktop.
+%description libs -l pl.UTF-8
+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 bibliotek GNOME desktop
 Group:		X11/Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
-Requires:	libgnomeui-devel >= 2.15.1
+Requires:	gtk+2-devel >= 2:2.16.0
 Requires:	startup-notification-devel >= 0.8
 
 %description devel
 GNOME desktop header files.
 
-%description devel -l pl
-Pliki nag³ówkowe bibliotek GNOME desktop.
+%description devel -l pl.UTF-8
+Pliki nagłówkowe bibliotek GNOME desktop.
 
 %package static
 Summary:	GNOME desktop static libraries
-Summary(pl):	Statyczne biblioteki GNOME desktop
+Summary(pl.UTF-8):	Statyczne biblioteki GNOME desktop
 Group:		X11/Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 
 %description static
 GNOME desktop static libraries.
 
-%description static -l pl
+%description static -l pl.UTF-8
 Statyczne biblioteki GNOME 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
-%patch1 -p1
 
 %build
 %{__gtkdocize}
 %{__intltoolize}
-gnome-doc-prepare --copy --force
+%{__gnome_doc_prepare}
 %{__gnome_doc_common}
 %{__intltoolize}
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
@@ -116,9 +128,8 @@ rm -rf $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}
 
-%find_lang %{name} --with-gnome --all-name
+%find_lang %{name} --with-gnome --with-omf --all-name
 
 %clean
 rm -fr $RPM_BUILD_ROOT
@@ -134,29 +145,30 @@ rm -fr $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README
-%attr(755,root,root) %{_bindir}/*
-%doc %{_mandir}/man1/*
+%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}/*
-%{_omf_dest_dir}/fdl
-%{_omf_dest_dir}/gnome-feedback
-%{_omf_dest_dir}/gpl
-%{_omf_dest_dir}/lgpl
-%{_desktopdir}/*.desktop
+%{_desktopdir}/gnome-about.desktop
 
 %files libs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
+%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
-%{_gtkdocdir}/*
+%{_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