packages: gnome-shell/gnome-shell.spec - updated to 3.4.0; merged from DEVE...

kiesiu kiesiu at pld-linux.org
Wed Mar 28 10:12:39 CEST 2012 

Author: kiesiu                       Date: Wed Mar 28 08:12:39 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 3.4.0; merged from DEVEL
- added systemd bcond (off by default)

---- Files affected:
packages/gnome-shell:
   gnome-shell.spec (1.39 -> 1.40) 

---- Diffs:

================================================================
Index: packages/gnome-shell/gnome-shell.spec
diff -u packages/gnome-shell/gnome-shell.spec:1.39 packages/gnome-shell/gnome-shell.spec:1.40
--- packages/gnome-shell/gnome-shell.spec:1.39	Tue Mar 27 07:08:19 2012
+++ packages/gnome-shell/gnome-shell.spec	Wed Mar 28 10:12:34 2012
@@ -1,24 +1,28 @@
 # $Revision$, $Date$
+#
+# 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
@@ -26,7 +30,7 @@
 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
@@ -35,33 +39,35 @@
 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
@@ -72,6 +78,18 @@
 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
@@ -102,9 +120,11 @@
 %{__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
@@ -117,7 +137,7 @@
 	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}
@@ -126,12 +146,8 @@
 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
@@ -148,23 +164,33 @@
 %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
@@ -175,8 +201,15 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.40  2012/03/28 08:12:34  kiesiu
+- updated to 3.4.0; merged from DEVEL
+- added systemd bcond (off by default)
+
 Revision 1.39  2012/03/27 05:08:19  arekm
 - release 2
+
+Revision 1.38.2.1  2012/03/21 21:12:43  megabajt
+- updated to 3.3.92
 
 Revision 1.38  2012/01/20 16:02:39  megabajt
 - updated to 3.2.2.1
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/gnome-shell/gnome-shell.spec?r1=1.39&r2=1.40

More information about the pld-cvs-commit mailing list