- updated to 3.0.0; merged from DEVEL

- removed Source1 (no longer used)

Changed files:
    gnome-desktop.spec -> 1.148

diff --git a/gnome-desktop.spec b/gnome-desktop.spec
index 855e68181c2852a2a77f61e76e5ba25fa44714f3..455d62b15cdf443f8d79a92b266c532a47dfb95f 100644 (file)
--- a/gnome-desktop.spec
+++ b/gnome-desktop.spec
@@ -1,38 +1,39 @@
-Summary:       The core programs for the GNOME GUI desktop environment
-Summary(pl.UTF-8):     Podstawowe programy środowiska graficznego GNOME
+Summary:       gnome-desktop library
+Summary(pl.UTF-8):     Biblioteka gnome-desktop
 Name:          gnome-desktop
-Version:       2.32.1
+Version:       3.0.0
 Release:       1
 License:       LGPL
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-desktop/2.32/%{name}-%{version}.tar.bz2
-# Source0-md5: 5c80d628a240eb9d9ff78913b31f2f67
-Source1:       pld-logo.svg
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-desktop/3.0/%{name}-%{version}.tar.bz2
+# Source0-md5: 6215d5fee0a3ab517830d3e6553685f2
 URL:           http://www.gnome.org/
-BuildRequires: GConf2-devel >= 2.26.0
 BuildRequires: autoconf
 BuildRequires: automake >= 1:1.9
 BuildRequires: docbook-dtd412-xml
+BuildRequires: gdk-pixbuf2-devel >= 2.22.0
 BuildRequires: gettext-devel
-BuildRequires: glib2-devel >= 1:2.20.0
+BuildRequires: glib2-devel >= 1:2.28.0
 BuildRequires: gnome-common >= 2.24.0
 BuildRequires: gnome-doc-utils >= 0.14.0
-BuildRequires: gtk+2-devel >= 2:2.18.0
+BuildRequires: gobject-introspection-devel >= 0.10.0
+BuildRequires: gsettings-desktop-schemas-devel >= 3.0.0
+BuildRequires: gtk+3-devel >= 3.0.0
 BuildRequires: gtk-doc >= 1.8
 BuildRequires: intltool >= 0.40.0
 BuildRequires: libtool
 BuildRequires: pkgconfig
-BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(find_lang) >= 1.23
 BuildRequires: rpmbuild(macros) >= 1.311
 BuildRequires: scrollkeeper
+BuildRequires: sed >= 4.0
 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
+Requires:      gsettings-desktop-schemas >= 3.0.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)
@@ -43,7 +44,7 @@ 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.
+This package contains gnome-desktop library.
 
 %description -l pl.UTF-8
 GNOME (GNU Network Object Model Environment) jest zestawem przyjaznych
@@ -52,50 +53,43 @@ 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.
-
-%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:       GNOME desktop includes
-Summary(pl.UTF-8):     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:      gtk+2-devel >= 2:2.18.0
+Requires:      %{name} = %{version}-%{release}
+Requires:      gsettings-desktop-schemas-devel >= 3.0.0
+Requires:      gtk+3-devel >= 3.0.0
 Requires:      startup-notification-devel >= 0.8
+Obsoletes:     gnome-desktop3-devel
 
 %description devel
 GNOME desktop header files.
 
 %description devel -l pl.UTF-8
-Pliki nagłówkowe bibliotek GNOME desktop.
+Pliki nagłówkowe biblioteki GNOME desktop.
 
 %package static
-Summary:       GNOME desktop static libraries
-Summary(pl.UTF-8):     Statyczne biblioteki GNOME desktop
+Summary:       GNOME desktop static library
+Summary(pl.UTF-8):     Statyczna biblioteka GNOME desktop
 Group:         X11/Development/Libraries
 Requires:      %{name} = %{version}-%{release}
+Obsoletes:     gnome-desktop3-static
 
 %description static
-GNOME desktop static libraries.
+GNOME desktop static library.
 
 %description static -l pl.UTF-8
-Statyczne biblioteki GNOME desktop.
+Statyczna biblioteka GNOME desktop.
 
 %package apidocs
 Summary:       gnome-desktop API documentation
 Summary(pl.UTF-8):     Dokumentacja API gnome-desktop
 Group:         Documentation
 Requires:      gtk-doc-common
+Obsoletes:     gnome-desktop3-apidocs
 
 %description apidocs
 gnome-desktop API documentation.
@@ -106,6 +100,9 @@ Dokumentacja API gnome-desktop.
 %prep
 %setup -q
 
+sed -i -e 's/^kg//' po/LINGUAS
+%{__rm} po/kg.po
+
 %build
 %{__gtkdocize}
 %{__intltoolize}
@@ -130,8 +127,6 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-%{__rm} $RPM_BUILD_ROOT%{_pixmapsdir}/gnome-logo-icon-transparent.png
-install %{SOURCE1} $RPM_BUILD_ROOT%{_pixmapsdir}/gnome-logo-icon-transparent.svg
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
 
 %find_lang %{name} --with-gnome --with-omf --all-name
@@ -140,39 +135,33 @@ install %{SOURCE1} $RPM_BUILD_ROOT%{_pixmapsdir}/gnome-logo-icon-transparent.svg
 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 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.17
+%attr(755,root,root) %{_libdir}/libgnome-desktop-3.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgnome-desktop-3.so.0
+%{_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}/libgnome-desktop-2.so
-%{_includedir}/gnome-desktop-2.0
-%{_pkgconfigdir}/gnome-desktop-2.0.pc
+%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 static
 %defattr(644,root,root,755)
-%{_libdir}/libgnome-desktop-2.a
+%{_libdir}/libgnome-desktop-3.a
 
 %files apidocs
 %defattr(644,root,root,755)
-%{_gtkdocdir}/gnome-desktop
+%{_gtkdocdir}/gnome-desktop3