X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=gnome-shell.spec;h=5d0eaa521c18c8f079823057986ac180e7828d71;hb=aae42ff;hp=dc7c2a40a4db743d2bce0eaab8df94d6bf09fbcf;hpb=82ec18b4f06580d7e01eb154a937f6609eedeb45;p=packages%2Fgnome-shell.git

diff --git a/gnome-shell.spec b/gnome-shell.spec
index dc7c2a4..5d0eaa5 100644
--- a/gnome-shell.spec
+++ b/gnome-shell.spec
@@ -1,111 +1,121 @@
-# TODO: wayland support
 #
-%define		caribou_version 0.4.8
-%define		clutter_version 1.21.5
-%define		evolution_data_server_version 3.13.90
-%define		gcr_version 3.7.5
-%define		gjs_version 1.40.0
-%define		glib2_version 1:2.37.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.13.1
-%define		gtk_version 3.15.0
-%define		json_glib_version 0.13.90
-%define		libcroco_version 0.6.8
-%define		mutter_version 3.16.1
-%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
+# Conditional build:
+%bcond_without	apidocs	# API documentation
+
+%define		clutter_ver			1.21.5
+# max(ecal_req, eds_req)
+%define		evolution_data_server_ver	3.33.1
+%define		gcr_ver				3.7.5
+%define		gjs_ver				1.71.1
+%define		glib_ver			1:2.57.2
+%define		gnome_bluetooth_ver		3.9.0
+%define		gnome_desktop_ver		3.36.0
+%define		gsettings_desktop_schemas_ver	42
+%define		gtk_ver				3.15.0
+%define		ibus_ver			1.5.19
+%define		json_glib_ver			0.13.90
+%define		libsecret_ver			0.18
+%define		mutter_ver			42.0
+%define		NetworkManager_ver		1.10.4
+%define		polkit_ver			0.100
+%define		pulseaudio_ver			13
+%define		startup_notification_ver	0.11
 
 Summary:	Window manager and application launcher for GNOME
+Summary(pl.UTF-8):	Zarządca okien i uruchamiania aplikacji dla GNOME
 Name:		gnome-shell
-Version:	3.16.3
+Version:	42.4
 Release:	1
 License:	GPL v2+
 Group:		X11/Window Managers
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-shell/3.16/%{name}-%{version}.tar.xz
-# Source0-md5:	5360c9ee7c178dd37f302b4d332f88e7
-Patch0:		link.patch
-URL:		http://live.gnome.org/GnomeShell
-BuildRequires:	NetworkManager-devel >= %{networkmanager_version}
-BuildRequires:	NetworkManager-gtk-lib-devel >= %{networkmanager_version}
-BuildRequires:	autoconf >= 2.63
-BuildRequires:	automake >= 1:1.11
-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.17
-BuildRequires:	gjs-devel >= %{gjs_version}
-BuildRequires:	glib2-devel >= %{glib2_version}
-BuildRequires:	gnome-bluetooth-devel >= %{gnome_bluetooth_version}
-BuildRequires:	gnome-common
+Source0:	https://download.gnome.org/sources/gnome-shell/42/%{name}-%{version}.tar.xz
+# Source0-md5:	cefa5c78071f885d1298e1e949afbf7d
+Patch0:		%{name}-no-update.patch
+URL:		https://wiki.gnome.org/Projects/GnomeShell
+BuildRequires:	NetworkManager-devel >= %{NetworkManager_ver}
+BuildRequires:	asciidoc
+BuildRequires:	at-spi2-atk-devel
+BuildRequires:	bash-completion-devel >= 2.0
+BuildRequires:	clutter-devel >= %{clutter_ver}
+BuildRequires:	evolution-data-server-devel >= %{evolution_data_server_ver}
+BuildRequires:	gcr-devel >= %{gcr_ver}
+BuildRequires:	gdk-pixbuf2-devel >= 2.0
+BuildRequires:	gettext-tools >= 0.19.6
+BuildRequires:	gjs-devel >= %{gjs_ver}
+BuildRequires:	glib2-devel >= %{glib_ver}
+BuildRequires:	gnome-autoar-devel
+BuildRequires:	gnome-bluetooth3-devel >= %{gnome_bluetooth_ver}
 BuildRequires:	gnome-control-center-devel
-BuildRequires:	gnome-desktop-devel >= %{gnome_desktop_version}
-BuildRequires:	gnome-menus-devel >= %{gnome_menus_version}
-BuildRequires:	gobject-introspection-devel >= 0.10.1
-BuildRequires:	gsettings-desktop-schemas-devel >= %{gsettings_desktop_schemas_version}
+BuildRequires:	gnome-desktop-devel >= %{gnome_desktop_ver}
+BuildRequires:	gobject-introspection-devel >= 1.50.0
+BuildRequires:	gsettings-desktop-schemas-devel >= %{gsettings_desktop_schemas_ver}
 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:	intltool >= 0.40
-BuildRequires:	json-glib-devel >= %{json_glib_version}
+BuildRequires:	gtk+3-devel >= %{gtk_ver}
+BuildRequires:	gtk4-devel >= 4
+%{?with_apidocs:BuildRequires:	gtk-doc >= 1.15}
+BuildRequires:	ibus-devel >= %{ibus_ver}
+BuildRequires:	json-glib-devel >= %{json_glib_ver}
 BuildRequires:	libcanberra-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:	libsecret-devel >= %{libsecret_ver}
+# or libsoup3 with -Dsoup2=false, must be in sync with libgweather
+BuildRequires:	libsoup-devel >= 2.4
+BuildRequires:	libxml2-devel >= 2.0
 BuildRequires:	libxslt-progs
-BuildRequires:	mutter-devel >= %{mutter_version}
+BuildRequires:	meson >= 0.58.0
+BuildRequires:	mutter-devel >= %{mutter_ver}
+BuildRequires:	ninja >= 1.5
+BuildRequires:	pipewire-devel >= 0.3
 BuildRequires:	pkgconfig >= 1:0.22
-BuildRequires:	polkit-devel >= %{polkit_version}
-BuildRequires:	pulseaudio-devel >= %{pulseaudio_version}
-BuildRequires:	python3
+BuildRequires:	polkit-devel >= %{polkit_ver}
+BuildRequires:	pulseaudio-devel >= %{pulseaudio_ver}
+BuildRequires:	python3 >= 1:3
+BuildRequires:	python3-pygobject3 >= 3
+BuildRequires:	rpm-build >= 4.6
 BuildRequires:	rpm-pythonprov
-BuildRequires:	rpmbuild(macros) >= 1.601
-BuildRequires:	ruby-sass
-BuildRequires:	startup-notification-devel >= %{startup_notification_version}
+BuildRequires:	rpmbuild(macros) >= 1.752
+BuildRequires:	sassc
+BuildRequires:	sed >= 4.0
+BuildRequires:	startup-notification-devel >= %{startup_notification_ver}
 BuildRequires:	systemd-devel
+BuildRequires:	systemd-units
 BuildRequires:	tar >= 1:1.22
-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(post,postun):	glib2 >= %{glib_ver}
+# gjs->gi->NMA.gir
+Requires:	NetworkManager-libs >= %{NetworkManager_ver}
+Requires:	adwaita-icon-theme
 Requires:	at-spi2-atk >= 2.4.0
-Requires:	caribou >= %{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:	clutter >= %{clutter_ver}
+Requires:	evolution-data-server >= %{evolution_data_server_ver}
+Requires:	gcr >= %{gcr_ver}
+Requires:	gjs >= %{gjs_ver}
+Requires:	glib2 >= %{glib_ver}
+Requires:	gnome-bluetooth3-libs >= %{gnome_bluetooth_ver}
+Requires:	gnome-desktop >= %{gnome_desktop_ver}
 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:	gsettings-desktop-schemas >= %{gsettings_desktop_schemas_ver}
+Requires:	gtk+3 >= %{gtk_ver}
+Requires:	ibus >= %{ibus_ver}
+Requires:	json-glib >= %{json_glib_ver}
+Requires:	libsecret >= %{libsecret_ver}
+Requires:	mutter >= %{mutter_ver}
 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:	polkit >= %{polkit_ver}
+Requires:	pulseaudio-libs >= %{pulseaudio_ver}
+Requires:	startup-notification >= %{startup_notification_ver}
+# gjs->gir->TelepathyGLib
+Requires:	telepathy-glib >= 0.17.5
+# gjs->gir->TelepathyLogger
 Requires:	telepathy-logger-libs >= 0.2
 Requires:	telepathy-mission-control
 Suggests:	gnome-contacts >= 3.2.0
 Suggests:	gnome-icon-theme-symbolic >= 3.8.0
 Provides:	gdm-wm = 3.8.0
+Obsoletes:	browser-plugin-gnome-shell < 3.32.2-1
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -116,10 +126,33 @@ capabilities of modern graphics hardware and introduces innovative
 user interface concepts to provide a delightful and easy to use
 experience.
 
+%description -l pl.UTF-8
+GNOME Shell to technologia definiująca doznania użytkownika środowiska
+graficznego GNOME 3. Zapewnia podstawowe funkcje interfejsu, takie jak
+przełączanie między oknami czy uruchamianie aplikacji. GNOME Shell
+wykorzystuje mozliwości współczesnego sprzętu graficznego i wprowadza
+innowacyjne koncepcje interfejsu użytkownika, zapewniające przyjemne
+doznania i łatwość użycia.
+
+%package -n bash-completion-gnome-shell
+Summary:	Bash completion for GNOME Shell commands
+Summary(pl.UTF-8):	Bashowe dopełnianie parametrów poleceń GNOME Shell
+Group:		Applications/Shells
+Requires:	%{name} = %{version}-%{release}
+Requires:	bash-completion >= 2.0
+BuildArch:	noarch
+
+%description -n bash-completion-gnome-shell
+Bash completion for GNOME Shell commands.
+
+%description -n bash-completion-gnome-shell -l pl.UTF-8
+Bashowe dopełnianie parametrów poleceń GNOME Shell.
+
 %package devel
 Summary:	Development files for GNOME Shell
 Summary(pl.UTF-8):	Pliki programistyczne dla GNOME Shell
 Group:		Development/Libraries
+BuildArch:	noarch
 
 %description devel
 This package provides development files for GNOME Shell.
@@ -132,9 +165,7 @@ 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.
@@ -142,53 +173,30 @@ 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
-Group:		X11/Libraries
-Requires:	%{name} = %{version}-%{release}
-Requires:	browser-plugins >= 2.0
-Requires:	browser-plugins(%{_target_base_arch})
-
-%description -n browser-plugin-%{name}
-gnome-shell plugin for WWW browsers.
-
-%description -n browser-plugin-%{name} -l pl.UTF-8
-Wtyczka gnome-shell do przeglądarek WWW.
-
 %prep
 %setup -q
 %patch0 -p1
 
+%{__sed} -i -e '/^libshew =/ s/ library/ shared_library/' subprojects/shew/src/meson.build
+
 %build
-%{__intltoolize}
-%{__libtoolize}
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
-	--enable-gtk-doc \
-	--disable-silent-rules \
-	--disable-static \
-	--with-html-dir=%{_gtkdocdir}
-%{__make} -j1
+%meson build \
+	%{?with_apidocs:-Dgtk_doc=true} \
+	-Dtests=false
+
+%meson_build -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_datadir}/gnome-shell/{extensions,search-providers}
 
-%{__make} install \
-	INSTALL="install -p" \
-	install_sh="install -p" \
-	DESTDIR=$RPM_BUILD_ROOT \
-	mozillalibdir=%{_browserpluginsdir}
+%meson_install -C build
 
-%{__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
 
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/gnome-shell/libgnome-shell*.a
+
 %find_lang %{name}
 
 %clean
@@ -202,58 +210,79 @@ if [ "$1" = "0" ]; then
 	%glib_compile_schemas
 fi
 
-%post -n browser-plugin-%{name}
-%update_browser_plugins
-
-%postun -n browser-plugin-%{name}
-if [ "$1" = 0 ]; then
-	%update_browser_plugins
-fi
-
 %files -f %{name}.lang
 %defattr(644,root,root,755)
+%doc NEWS README.md
+%attr(755,root,root) %{_bindir}/gnome-extensions
+%attr(755,root,root) %{_bindir}/gnome-extensions-app
 %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-overrides-migration.sh
 %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
+%attr(755,root,root) %{_libdir}/gnome-shell/libgvc.so
+%attr(755,root,root) %{_libdir}/gnome-shell/libshew-0.so
+%attr(755,root,root) %{_libdir}/gnome-shell/libst-1.0.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
+%dir %{_libdir}/gnome-shell/girepository-1.0
+%{_libdir}/gnome-shell/girepository-1.0/Shew-0.typelib
+%{_datadir}/dbus-1/interfaces/org.gnome.Shell.Introspect.xml
+%{_datadir}/dbus-1/services/org.gnome.Extensions.service
+%{_datadir}/dbus-1/services/org.gnome.ScreenSaver.service
 %{_datadir}/dbus-1/services/org.gnome.Shell.CalendarServer.service
+%{_datadir}/dbus-1/services/org.gnome.Shell.Extensions.service
 %{_datadir}/dbus-1/services/org.gnome.Shell.HotplugSniffer.service
+%{_datadir}/dbus-1/services/org.gnome.Shell.Notifications.service
 %{_datadir}/dbus-1/services/org.gnome.Shell.PortalHelper.service
+%{_datadir}/dbus-1/services/org.gnome.Shell.Screencast.service
+%{_datadir}/glib-2.0/schemas/00_org.gnome.shell.gschema.override
 %{_datadir}/glib-2.0/schemas/org.gnome.shell.gschema.xml
 %{_datadir}/gnome-control-center/keybindings/*.xml
 %{_datadir}/gnome-shell
-%{_desktopdir}/gnome-shell.desktop
-%{_desktopdir}/gnome-shell-extension-prefs.desktop
-%{_desktopdir}/gnome-shell-wayland.desktop
+%{_datadir}/metainfo/org.gnome.Extensions.metainfo.xml
+%{_datadir}/xdg-desktop-portal/portals/gnome-shell.portal
+%{_desktopdir}/org.gnome.Extensions.desktop
+%{_desktopdir}/org.gnome.Shell.desktop
+%{_desktopdir}/org.gnome.Shell.Extensions.desktop
 %{_desktopdir}/org.gnome.Shell.PortalHelper.desktop
+%{_iconsdir}/hicolor/scalable/apps/org.gnome.Extensions.Devel.svg
+%{_iconsdir}/hicolor/scalable/apps/org.gnome.Extensions.svg
+%{_iconsdir}/hicolor/scalable/apps/org.gnome.Shell.Extensions.svg
+%{_iconsdir}/hicolor/symbolic/apps/org.gnome.Extensions-symbolic.svg
+%{_iconsdir}/hicolor/symbolic/apps/org.gnome.Shell.Extensions-symbolic.svg
+%{_mandir}/man1/gnome-extensions.1*
 %{_mandir}/man1/gnome-shell.1*
+%{_sysconfdir}/xdg/autostart/gnome-shell-overrides-migration.desktop
+%{systemduserunitdir}/org.gnome.Shell.target
+%{systemduserunitdir}/org.gnome.Shell-disable-extensions.service
+%{systemduserunitdir}/org.gnome.Shell@wayland.service
+%{systemduserunitdir}/org.gnome.Shell@x11.service
+
+%files -n bash-completion-gnome-shell
+%defattr(644,root,root,755)
+%{bash_compdir}/gnome-extensions
 
 %files devel
 %defattr(644,root,root,755)
+%{_datadir}/dbus-1/interfaces/org.gnome.Shell.Extensions.xml
+%{_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
 
+%if %{with apidocs}
 %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
+%endif