X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=gnome-shell.spec;h=bde392ac4a3e9655ca8af1dec08481bb656de545;hb=d95992d6f4948243477dc9b33633ee4bafb5fc41;hp=22fcfb76fcc07cdc23cce5b5e02399b21beae0cc;hpb=223614d7351327e07a18133db5c6e7c550477f97;p=packages%2Fgnome-shell.git

diff --git a/gnome-shell.spec b/gnome-shell.spec
index 22fcfb7..bde392a 100644
--- a/gnome-shell.spec
+++ b/gnome-shell.spec
@@ -1,74 +1,108 @@
-#
-# Conditional build:
-%bcond_without  systemd # by default use systemd for session tracking instead of ConsoleKit (fallback to ConsoleKit on runtime)
-#
+%define		caribou_version 0.4.8
+%define		clutter_version 1.21.5
+%define		evolution_data_server_version 3.18.0
+%define		gcr_version 3.7.5
+%define		gjs_version 1.47.0
+%define		glib2_version 1:2.46.0
+%define		gnome_bluetooth_version 3.9.0
+%define		gnome_desktop_version 3.7.90
+%define		gnome_menus_version 3.5.3
+%define		gsettings_desktop_schemas_version 3.22.0
+%define		gtk_version 3.15.0
+%define		json_glib_version 0.13.90
+%define		libcroco_version 0.6.8
+%define		mutter_version 3.24.0
+%define		networkmanager_version 0.9.8
+%define		polkit_version 0.100
+%define		pulseaudio_version 2.0
+%define		startup_notification_version 0.11
+%define		telepathy_glib_version 0.17.5
+
 Summary:	Window manager and application launcher for GNOME
 Name:		gnome-shell
-Version:	3.4.1
+Version:	3.24.1
 Release:	1
 License:	GPL v2+
 Group:		X11/Window Managers
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-shell/3.4/%{name}-%{version}.tar.xz
-# Source0-md5:	82a7dae5d0aa3de2afe317d882c79ee9
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-shell/3.24/%{name}-%{version}.tar.xz
+# Source0-md5:	ba84d4100e77cbda8eccd0eca1e12c39
+Patch0:		link.patch
 URL:		http://live.gnome.org/GnomeShell
-BuildRequires:	NetworkManager-devel >= 0.8.999
+BuildRequires:	NetworkManager-devel >= %{networkmanager_version}
+BuildRequires:	NetworkManager-gtk-lib-devel >= %{networkmanager_version}
 BuildRequires:	autoconf >= 2.63
 BuildRequires:	automake >= 1:1.11
-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.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
-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.3.9
-BuildRequires:	intltool >= 0.40
-BuildRequires:	json-glib-devel >= 0.13.90
+BuildRequires:	clutter-devel >= %{clutter_version}
+BuildRequires:	evolution-data-server-devel >= %{evolution_data_server_version}
+BuildRequires:	gcr-devel >= %{gcr_version}
+BuildRequires:	gdk-pixbuf2-devel
+BuildRequires:	gettext-tools >= 0.19.6
+BuildRequires:	gjs-devel >= %{gjs_version}
+BuildRequires:	glib2-devel >= %{glib2_version}
+BuildRequires:	gnome-bluetooth-devel >= %{gnome_bluetooth_version}
+BuildRequires:	gnome-common
+BuildRequires:	gnome-control-center-devel
+BuildRequires:	gnome-desktop-devel >= %{gnome_desktop_version}
+BuildRequires:	gnome-menus-devel >= %{gnome_menus_version}
+BuildRequires:	gobject-introspection-devel >= 1.50.0
+BuildRequires:	gsettings-desktop-schemas-devel >= %{gsettings_desktop_schemas_version}
+BuildRequires:	gstreamer-devel >= 1.0.0
+BuildRequires:	gstreamer-plugins-base-devel >= 1.0.0
+BuildRequires:	gtk+3-devel >= %{gtk_version}
+BuildRequires:	gtk-doc >= 1.15
+BuildRequires:	json-glib-devel >= %{json_glib_version}
 BuildRequires:	libcanberra-devel
-BuildRequires:	libcroco-devel >= 0.6.2
-BuildRequires:	libgnome-keyring-devel
+BuildRequires:	libcanberra-gtk3-devel
+BuildRequires:	libcroco-devel >= 0.6.8
+BuildRequires:	libsecret-devel
 BuildRequires:	libsoup-devel
 BuildRequires:	libtool >= 2:2.2.6
 BuildRequires:	libxml2-devel
-BuildRequires:	mutter-devel >= 3.4.0
+BuildRequires:	libxslt-progs
+BuildRequires:	mutter-devel >= %{mutter_version}
 BuildRequires:	pkgconfig >= 1:0.22
-BuildRequires:	polkit-devel >= 0.100
-BuildRequires:	pulseaudio-devel
+BuildRequires:	polkit-devel >= %{polkit_version}
+BuildRequires:	pulseaudio-devel >= %{pulseaudio_version}
+BuildRequires:	python3
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.601
-BuildRequires:	startup-notification-devel >= 0.11
-%{?with_systemd:BuildRequires:	systemd-devel}
+BuildRequires:	ruby-sass
+BuildRequires:	startup-notification-devel >= %{startup_notification_version}
+BuildRequires:	systemd-devel
 BuildRequires:	tar >= 1:1.22
-BuildRequires:	telepathy-glib-devel >= 0.17.5
-BuildRequires:	telepathy-logger-devel >= 0.2.4
+BuildRequires:	telepathy-glib-devel >= %{telepathy_glib_version}
+BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	xorg-lib-libXfixes-devel
 BuildRequires:	xz
 Requires(post,postun):	glib2 >= 1:2.26.0
+Requires:	NetworkManager-libs >= %{networkmanager_version}
 Requires:	at-spi2-atk >= 2.4.0
-Requires:	caribou >= 0.3.5
-Requires:	evolution-data-server >= 3.1.90
-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:	gtk+3 >= 3.3.9
-Requires:	mutter >= 3.4.0
-Requires:	nautilus >= 3.2.0
-Requires:	telepathy-logger >= 0.2.4
+Requires:	caribou-libs >= %{caribou_version}
+Requires:	clutter >= %{clutter_version}
+Requires:	evolution-data-server >= %{evolution_data_server_version}
+Requires:	gcr >= %{gcr_version}
+Requires:	gjs >= %{gjs_version}
+Requires:	glib2 >= %{glib2_version}
+Requires:	gnome-bluetooth-libs >= %{gnome_bluetooth_version}
+Requires:	gnome-desktop >= %{gnome_desktop_version}
+Requires:	gnome-menus >= %{gnome_menus_version}
+Requires:	gnome-settings-daemon >= 3.8.0
+Requires:	gnome-themes-standard
+Requires:	gsettings-desktop-schemas >= %{gsettings_desktop_schemas_version}
+Requires:	gtk+3 >= %{gtk_version}
+Requires:	json-glib >= %{json_glib_version}
+Requires:	libcroco >= %{libcroco_version}
+Requires:	mutter >= %{mutter_version}
+Requires:	nautilus >= 3.8.0
+Requires:	polkit >= %{polkit_version}
+Requires:	pulseaudio-libs >= %{pulseaudio_version}
+Requires:	startup-notification >= %{startup_notification_version}
+Requires:	telepathy-glib >= %{telepathy_glib_version}
+Requires:	telepathy-logger-libs >= 0.2
 Requires:	telepathy-mission-control
 Suggests:	gnome-contacts >= 3.2.0
-Suggests:	gnome-icon-theme-symbolic >= 3.0.0
-Provides:	gdm-wm = 3.4.0
+Suggests:	gnome-icon-theme-symbolic >= 3.8.0
+Provides:	gdm-wm = 3.8.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -79,11 +113,25 @@ capabilities of modern graphics hardware and introduces innovative
 user interface concepts to provide a delightful and easy to use
 experience.
 
+%package devel
+Summary:	Development files for GNOME Shell
+Summary(pl.UTF-8):	Pliki programistyczne dla GNOME Shell
+Group:		Development/Libraries
+
+%description devel
+This package provides development files for GNOME Shell.
+
+%description devel -l pl.UTF-8
+Ten pakiet dostarcza pliki programistyczne dla GNOME Shell.
+
 %package apidocs
 Summary:	GNOME Shell API documentation
 Summary(pl.UTF-8):	Dokumentacja API GNOME Shell
 Group:		Documentation
 Requires:	gtk-doc-common
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
 
 %description apidocs
 This package provides GNOME Shell API documentation.
@@ -98,10 +146,6 @@ Group:		X11/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	browser-plugins >= 2.0
 Requires:	browser-plugins(%{_target_base_arch})
-Provides:	mozilla-firefox-plugin-gnome-shell = %{version}-%{release}
-Provides:	mozilla-plugin-gnome-shell = %{version}-%{release}
-Obsoletes:	mozilla-firefox-plugin-gnome-shell < %{version}-%{release}
-Obsoletes:	mozilla-plugin-gnome-shell < %{version}-%{release}
 
 %description -n browser-plugin-%{name}
 gnome-shell plugin for WWW browsers.
@@ -111,20 +155,18 @@ Wtyczka gnome-shell do przeglądarek WWW.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
-%{__intltoolize}
 %{__libtoolize}
 %{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
 %configure \
-	--with-ca-certificates=/etc/certs/ca-certificates.crt \
 	--enable-gtk-doc \
 	--disable-silent-rules \
 	--disable-static \
-	%{__enable_disable systemd systemd} \
 	--with-html-dir=%{_gtkdocdir}
 %{__make} -j1
 
@@ -140,6 +182,8 @@ install -d $RPM_BUILD_ROOT%{_datadir}/gnome-shell/{extensions,search-providers}
 
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/gnome-shell/*.la \
 	$RPM_BUILD_ROOT%{_browserpluginsdir}/*.la
+# evolution already ships this file
+%{__rm} $RPM_BUILD_ROOT%{_desktopdir}/evolution-calendar.desktop
 
 %find_lang %{name}
 
@@ -167,26 +211,39 @@ fi
 %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) %{_bindir}/gnome-shell-perf-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
+%attr(755,root,root) %{_libexecdir}/gnome-shell-portal-helper
 %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
+%attr(755,root,root) %{_libdir}/gnome-shell/libgnome-shell-menu.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
+%{_libdir}/gnome-shell/ShellMenu-0.1.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}/dbus-1/services/org.gnome.Shell.PortalHelper.service
 %{_datadir}/glib-2.0/schemas/org.gnome.shell.gschema.xml
+%{_datadir}/gnome-control-center/keybindings/*.xml
 %{_datadir}/gnome-shell
-%{_desktopdir}/gnome-shell.desktop
+%{_datadir}/xdg-desktop-portal/portals/gnome-shell.portal
 %{_desktopdir}/gnome-shell-extension-prefs.desktop
+%{_desktopdir}/org.gnome.Shell.desktop
+%{_desktopdir}/org.gnome.Shell.PortalHelper.desktop
 %{_mandir}/man1/gnome-shell.1*
 
+%files devel
+%defattr(644,root,root,755)
+%{_datadir}/dbus-1/interfaces/org.gnome.Shell.PadOsd.xml
+%{_datadir}/dbus-1/interfaces/org.gnome.Shell.Screencast.xml
+%{_datadir}/dbus-1/interfaces/org.gnome.Shell.Screenshot.xml
+%{_datadir}/dbus-1/interfaces/org.gnome.ShellSearchProvider.xml
+%{_datadir}/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml
+
 %files apidocs
 %defattr(644,root,root,755)
 %{_gtkdocdir}/shell