- updated to 3.4.0; merged from DEVEL

- added systemd bcond (off by default)

Changed files:
    gnome-shell.spec -> 1.40

diff --git a/gnome-shell.spec b/gnome-shell.spec
index 8686550d723cbc6707eaa19d6b8e456e4550d297..687855d09edd0be9fb5cb540244c90f5fed327ea 100644 (file)
--- a/gnome-shell.spec
+++ b/gnome-shell.spec
@@ -1,23 +1,27 @@
+#
+# Conditional build:
+%bcond_with    systemd # rely on systemd for session tracking instead of ConsoleKit
+#
 Summary:       Window manager and application launcher for GNOME
 Name:          gnome-shell
-Version:       3.2.2.1
-Release:       2
+Version:       3.4.0
+Release:       1
 License:       GPL v2+
 Group:         X11/Window Managers
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-shell/3.2/%{name}-%{version}.tar.xz
-# Source0-md5: 44b79ba7c3f204b697d8a96417cc2b4a
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-shell/3.4/%{name}-%{version}.tar.xz
+# Source0-md5: 0f0a063dfe10a399b4280396cd79ae80
 URL:           http://live.gnome.org/GnomeShell
-BuildRequires: GConf2-devel
 BuildRequires: NetworkManager-devel >= 0.8.999
 BuildRequires: autoconf >= 2.63
 BuildRequires: automake >= 1:1.11
-BuildRequires: clutter-devel >= 1.7.5
+BuildRequires: clutter-devel >= 1.9.16
 BuildRequires: dbus-glib-devel
 BuildRequires: evolution-data-server-devel >= 3.1.90
 BuildRequires: folks-devel >= 0.6.1
+BuildRequires: gcr-devel >= 3.3.90
 BuildRequires: gettext-devel >= 0.17
-BuildRequires: gjs-devel >= 1.30.1
-BuildRequires: glib2-devel >= 1:2.29.10
+BuildRequires: gjs-devel >= 1.31.10
+BuildRequires: glib2-devel >= 1:2.31.6
 BuildRequires: gnome-bluetooth-devel >= 3.1.0
 BuildRequires: gnome-desktop-devel >= 3.1.90
 BuildRequires: gnome-menus-devel >= 3.1.90
@@ -25,7 +29,7 @@ BuildRequires:        gobject-introspection-devel >= 0.10.1
 BuildRequires: gsettings-desktop-schemas-devel >= 3.1.90
 BuildRequires: gstreamer-devel >= 0.10.21
 BuildRequires: gstreamer-plugins-base-devel >= 0.10.21
-BuildRequires: gtk+3-devel >= 3.0.0
+BuildRequires: gtk+3-devel >= 3.3.9
 BuildRequires: intltool >= 0.40
 BuildRequires: json-glib-devel >= 0.13.90
 BuildRequires: libcanberra-devel
@@ -34,33 +38,35 @@ BuildRequires:      libgnome-keyring-devel
 BuildRequires: libsoup-devel
 BuildRequires: libtool >= 2:2.2.6
 BuildRequires: libxml2-devel
-BuildRequires: mutter-devel >= 3.2.1
+BuildRequires: mutter-devel >= 3.4.0
 BuildRequires: pkgconfig >= 1:0.22
 BuildRequires: polkit-devel >= 0.100
 BuildRequires: pulseaudio-devel
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.601
 BuildRequires: startup-notification-devel >= 0.11
+%{?with_systemd:BuildRequires: systemd-devel}
 BuildRequires: tar >= 1:1.22
-BuildRequires: telepathy-glib-devel >= 0.15.5
+BuildRequires: telepathy-glib-devel >= 0.17.5
 BuildRequires: telepathy-logger-devel >= 0.2.4
 BuildRequires: xorg-lib-libXfixes-devel
 BuildRequires: xz
 Requires(post,postun): glib2 >= 1:2.26.0
-Requires(post,preun):  GConf2
 Requires:      caribou >= 0.3.5
 Requires:      evolution-data-server >= 3.1.90
-Requires:      gjs >= 1.30.1
+Requires:      gjs >= 1.31.10
+Requires:      glib2 >= 1:2.31.6
 Requires:      gnome-bluetooth-libs >= 3.1.0
 Requires:      gnome-menus >= 3.1.90
 Requires:      gnome-settings-daemon >= 3.1.90
 Requires:      gsettings-desktop-schemas >= 3.1.90
-Requires:      mutter >= 3.2.1
+Requires:      gtk+3 >= 3.3.9
+Requires:      mutter >= 3.4.0
 Requires:      nautilus >= 3.2.0
 Requires:      telepathy-logger >= 0.2.4
 Suggests:      gnome-contacts >= 3.2.0
 Suggests:      gnome-icon-theme-symbolic >= 3.0.0
-Provides:      gdm-wm = 3.2.1-1
+Provides:      gdm-wm = 3.4.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -71,6 +77,18 @@ capabilities of modern graphics hardware and introduces innovative
 user interface concepts to provide a delightful and easy to use
 experience.
 
+%package apidocs
+Summary:       GNOME Shell API documentation
+Summary(pl.UTF-8):     Dokumentacja API GNOME Shell
+Group:         Documentation
+Requires:      gtk-doc-common
+
+%description apidocs
+This package provides GNOME Shell API documentation.
+
+%description apidocs -l pl.UTF-8
+Ten pakiet dostarcza dokumentację API GNOME Shell.
+
 %package -n browser-plugin-%{name}
 Summary:       gnome-shell plugin for WWW browsers
 Summary(pl.UTF-8):     Wtyczka gnome-shell do przeglądarek WWW
@@ -101,9 +119,11 @@ Wtyczka gnome-shell do przeglądarek WWW.
 %{__automake}
 %configure \
        --with-ca-certificates=/etc/certs/ca-certificates.crt \
-       --disable-schemas-install \
+       --enable-gtk-doc \
        --disable-silent-rules \
-       --disable-static
+       --disable-static \
+       %{__enable_disable systemd systemd} \
+       --with-html-dir=%{_gtkdocdir}
 %{__make} -j1
 
 %install
@@ -116,7 +136,7 @@ install -d $RPM_BUILD_ROOT%{_datadir}/gnome-shell/extensions
        DESTDIR=$RPM_BUILD_ROOT \
        mozillalibdir=%{_browserpluginsdir}
 
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/gnome-shell/libgnome-shell.la \
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/gnome-shell/*.la \
        $RPM_BUILD_ROOT%{_browserpluginsdir}/*.la
 
 %find_lang %{name}
@@ -125,12 +145,8 @@ install -d $RPM_BUILD_ROOT%{_datadir}/gnome-shell/extensions
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%gconf_schema_install gnome-shell.schemas
 %glib_compile_schemas
 
-%preun
-%gconf_schema_uninstall gnome-shell.schemas
-
 %postun
 if [ "$1" = "0" ]; then
        %glib_compile_schemas
@@ -147,23 +163,33 @@ fi
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/gnome-shell
+%attr(755,root,root) %{_bindir}/gnome-shell-extension-prefs
 %attr(755,root,root) %{_bindir}/gnome-shell-extension-tool
 %attr(755,root,root) %{_libexecdir}/gnome-shell-calendar-server
 %attr(755,root,root) %{_libexecdir}/gnome-shell-hotplug-sniffer
 %attr(755,root,root) %{_libexecdir}/gnome-shell-perf-helper
-%{_sysconfdir}/gconf/schemas/gnome-shell.schemas
 %dir %{_libdir}/gnome-shell
 %attr(755,root,root) %{_libdir}/gnome-shell/libgnome-shell.so
+%attr(755,root,root) %{_libdir}/gnome-shell/libgnome-shell-js.so
 %{_libdir}/gnome-shell/Gvc-1.0.typelib
 %{_libdir}/gnome-shell/Shell-0.1.typelib
+%{_libdir}/gnome-shell/ShellJS-0.1.typelib
 %{_libdir}/gnome-shell/St-1.0.typelib
+%{_datadir}/GConf/gsettings/gnome-shell-overrides.convert
+%{_datadir}/dbus-1/interfaces/org.gnome.ShellSearchProvider.xml
 %{_datadir}/dbus-1/services/org.gnome.Shell.CalendarServer.service
 %{_datadir}/dbus-1/services/org.gnome.Shell.HotplugSniffer.service
 %{_datadir}/glib-2.0/schemas/org.gnome.shell.gschema.xml
 %{_datadir}/gnome-shell
 %{_desktopdir}/gnome-shell.desktop
+%{_desktopdir}/gnome-shell-extension-prefs.desktop
 %{_mandir}/man1/gnome-shell.1*
 
+%files apidocs
+%defattr(644,root,root,755)
+%{_gtkdocdir}/shell
+%{_gtkdocdir}/st
+
 %files -n browser-plugin-%{name}
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_browserpluginsdir}/libgnome-shell-browser-plugin.so