- merged from DEVEL

Changed files:
    gnome-desktop-desktop.patch -> 1.3
    gnome-desktop.spec -> 1.89

diff --git a/gnome-desktop-desktop.patch b/gnome-desktop-desktop.patch
index bba7e8275e84efb1ab0dd1b7e9d6afecc002dc39..115fd53221381734be3bd79d1aa1abe2b153dac6 100644 (file)
--- a/gnome-desktop-desktop.patch
+++ b/gnome-desktop-desktop.patch
@@ -1,6 +1,6 @@
-diff -aurN gnome-desktop-2.12.3.orig/gnome-about/gnome-about.desktop.in.in gnome-desktop-2.12.3/gnome-about/gnome-about.desktop.in.in
---- gnome-desktop-2.12.3.orig/gnome-about/gnome-about.desktop.in.in    2006-02-06 17:32:44.000000000 +0100
-+++ gnome-desktop-2.12.3/gnome-about/gnome-about.desktop.in.in 2006-02-08 18:58:49.000000000 +0100
+diff -aurN gnome-desktop-2.13.5.orig/gnome-about/gnome-about.desktop.in.in gnome-desktop-2.13.5/gnome-about/gnome-about.desktop.in.in
+--- gnome-desktop-2.13.5.orig/gnome-about/gnome-about.desktop.in.in    2005-12-31 13:53:33.000000000 +0100
++++ gnome-desktop-2.13.5/gnome-about/gnome-about.desktop.in.in 2006-01-22 20:25:52.217051000 +0100
 @@ -6,7 +6,7 @@
  Icon=stock_about
  Terminal=false

diff --git a/gnome-desktop.spec b/gnome-desktop.spec
index a5f4f94e679e65cb36214acb293646b21ddf3b91..b8ba7f09778973314ec3c4803daa2a1224169647 100644 (file)
--- a/gnome-desktop.spec
+++ b/gnome-desktop.spec
@@ -1,14 +1,13 @@
-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):   Podstawowe programy ¶rodowiska graficznego GNOME
 Name:          gnome-desktop
-Version:       2.12.3
-Release:       1
+Version:       2.14.0
+Release:       3
 License:       LGPL
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/gnome/sources/gnome-desktop/2.12/%{name}-%{version}.tar.bz2
-# Source0-md5: 387efe89249c61e512812568047be654
+Source0:       http://ftp.gnome.org/pub/gnome/sources/gnome-desktop/2.14/%{name}-%{version}.tar.bz2
+# Source0-md5: b8daad3194f8d5d48546a9b4d4585503
 Source1:       pld-logo.svg
-# Source1-md5: 9fda4ca70a6e8e82e8e5bebe0e28db74
 Patch0:                %{name}-crystalsvg.patch
 Patch1:                %{name}-desktop.patch
 URL:           http://www.gnome.org/
@@ -25,55 +24,67 @@ BuildRequires:      pkgconfig
 BuildRequires: rpmbuild(macros) >= 1.197
 BuildRequires: scrollkeeper
 BuildRequires: startup-notification-devel >= 0.8
-Requires(post,postun): /sbin/ldconfig
+BuildRequires: scrollkeeper
 Requires(post,postun): scrollkeeper
-Requires:      libgnomeui >= 2.10.0-2
+Requires:      %{name}-libs = %{version}-%{release}
 Obsoletes:     gnome-core
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-GNOME2 (GNU Network Object Model Environment) is a user-friendly set
+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. GNOME2 is similar in purpose
-and scope to CDE and KDE, but GNOME2 is based completely on free
+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
+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. GNOME2 przypomina
-wygl±dem i zakresem funkcjonalno¶ci CDE i KDE, jednak GNOME2 opiera
+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):   Biblioteka gnome-desktop
+Group:         Development/Libraries
+Requires:      libgnomeui >= 2.10.0-2
+
+%description libs
+This package contains gnome-desktop library.
+
+%description libs -l pl
+Pakiet ten zawiera bibliotekê gnome-desktop.
 
 %package devel
-Summary:       GNOME2 desktop includes
-Summary(pl):   Pliki nag³ówkowe bibliotek GNOME2 desktop
+Summary:       GNOME desktop includes
+Summary(pl):   Pliki nag³ówkowe bibliotek GNOME desktop
 Group:         X11/Development/Libraries
-Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-libs = %{version}-%{release}
 Requires:      libgnomeui-devel >= 2.10.0-2
 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.
+Pliki nag³ówkowe bibliotek GNOME desktop.
 
 %package static
-Summary:       GNOME2 desktop static libraries
-Summary(pl):   Statyczne biblioteki GNOME2 desktop
+Summary:       GNOME desktop static libraries
+Summary(pl):   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
-Statyczne biblioteki GNOME2 desktop.
+Statyczne biblioteki GNOME desktop.
 
 %prep
 %setup -q
@@ -81,6 +92,7 @@ Statyczne biblioteki GNOME2 desktop.
 %patch1 -p1
 
 %build
+%{__intltoolize}
 gnome-doc-prepare --copy --force
 %{__gnome_doc_common}
 %{__intltoolize}
@@ -110,18 +122,18 @@ rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
 rm -fr $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}/*
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
 %doc %{_mandir}/man1/*
 %{_datadir}/gnome-about
 %{_pixmapsdir}/*
@@ -131,6 +143,10 @@ rm -fr $RPM_BUILD_ROOT
 %{_omf_dest_dir}/lgpl
 %{_desktopdir}/*.desktop
 
+%files libs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/lib*.so.*.*
+
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/lib*.so