X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=gnome-control-center.spec;h=80400478f5207bbac38136dc29e4871cdb410de3;hb=HEAD;hp=a1da42364e8cdfff689790cec5127998b4a2a92b;hpb=79fe181264a03e497b5af4e0f1e8c4b6cf17a1cc;p=packages%2Fgnome-control-center.git

diff --git a/gnome-control-center.spec b/gnome-control-center.spec
index a1da423..046195a 100644
--- a/gnome-control-center.spec
+++ b/gnome-control-center.spec
@@ -1,7 +1,9 @@
 #
 # Conditional build:
-%bcond_without	ibus	# IBus support
-%bcond_without	wayland	# Wayland support
+%bcond_without	ibus		# IBus support
+%bcond_with	malcontent	# Malcontent support
+%bcond_with	snap		# snap support
+%bcond_without	wayland		# Wayland support
 
 Summary:	GNOME Control Center
 Summary(es.UTF-8):	El centro de controle del GNOME
@@ -10,103 +12,127 @@ Summary(pt_BR.UTF-8):	O Centro de Controle do GNOME
 Summary(ru.UTF-8):	Центр управления GNOME
 Summary(uk.UTF-8):	Центр керування GNOME
 Name:		gnome-control-center
-Version:	3.34.1
+Version:	46.2
 Release:	1
 Epoch:		1
 License:	GPL v2+
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-control-center/3.34/%{name}-%{version}.tar.xz
-# Source0-md5:	8b0f0baea34fbe937efd0ad1be4b451b
+Source0:	https://download.gnome.org/sources/gnome-control-center/46/%{name}-%{version}.tar.xz
+# Source0-md5:	1dfed305c69d4ba018924c9de6881d2f
 Patch0:		krb5.patch
-URL:		http://www.gnome.org/
+URL:		https://www.gnome.org/
 BuildRequires:	ModemManager-devel >= 1.0.0
-BuildRequires:	NetworkManager-devel >= 1.10.0
-# use libnm-gtk - will use correct NM version
-BuildRequires:	NetworkManager-gtk-lib-devel >= 1.8.0
+BuildRequires:	NetworkManager-devel >= 2:1.24.0
 BuildRequires:	accountsservice-devel >= 0.6.39
 BuildRequires:	cairo-gobject-devel
-BuildRequires:	cheese-devel >= 3.28.0
 BuildRequires:	colord-devel >= 0.1.34
-BuildRequires:	colord-gtk-devel >= 0.1.24
+BuildRequires:	colord-gtk4-devel >= 0.1.24
 BuildRequires:	cups-devel >= 1.4
 BuildRequires:	docbook-dtd42-xml
+BuildRequires:	fontconfig-devel
+BuildRequires:	gcr4-devel >= 4.1.0
 BuildRequires:	gdk-pixbuf2-devel >= 2.24.0
 BuildRequires:	gettext-tools >= 0.17
-BuildRequires:	glib2-devel >= 1:2.54.0
-BuildRequires:	gnome-bluetooth-devel >= 3.18.2
-BuildRequires:	gnome-desktop-devel >= 3.28.0
-BuildRequires:	gnome-menus-devel >= 3.4.0
-BuildRequires:	gnome-online-accounts-devel >= 3.26.0
-BuildRequires:	gnome-settings-daemon-devel >= 1:3.26.0
-BuildRequires:	grilo-devel >= 0.3.0
-BuildRequires:	gsettings-desktop-schemas-devel >= 3.31.0
+BuildRequires:	glib2-devel >= 1:2.76.6
+%ifnarch s390 s390x
+BuildRequires:	gnome-bluetooth3-ui-devel >= 42
+%endif
+BuildRequires:	gnome-desktop4-devel >= 42
+BuildRequires:	gnome-online-accounts-devel >= 3.49.1
+BuildRequires:	gnome-settings-daemon-devel >= 1:41.0
+BuildRequires:	gnutls-devel
+BuildRequires:	gsettings-desktop-schemas-devel >= 46
 BuildRequires:	gsound-devel
-BuildRequires:	gtk+3-devel >= 3.22.20
+# X11 and Wayland checks in panels/online-accounts/meson.build (subject to update?)
+BuildRequires:	gtk+3-devel >= 3.0
+BuildRequires:	gtk4-devel >= 4.11.2
 BuildRequires:	heimdal-devel
 %{?with_ibus:BuildRequires:	ibus-devel >= 1.5.2}
-BuildRequires:	libcanberra-gtk3-devel >= 0.26
+%{?with_snap:BuildRequires:	json-glib-devel}
+BuildRequires:	libadwaita-devel >= 1.4
+BuildRequires:	libepoxy-devel
 BuildRequires:	libgtop-devel >= 2.0
-BuildRequires:	libhandy-devel >= 0.0.9
+BuildRequires:	libgudev-devel >= 232
+%{?with_malcontent:BuildRequires:	libmalcontent-devel >= 0.10.0}
+BuildRequires:	libnma-gtk4-devel >= 1.10.2
 BuildRequires:	libpwquality-devel >= 1.2.2
 BuildRequires:	libsecret-devel
 BuildRequires:	libsmbclient-devel
-BuildRequires:	libsoup-devel >= 2.4
-BuildRequires:	libwacom-devel >= 0.7
+%ifnarch s390 s390x
+BuildRequires:	libwacom-devel >= 0.27
+%endif
 BuildRequires:	libxml2-devel >= 1:2.6.31
-BuildRequires:	meson >= 0.48.0
+BuildRequires:	meson >= 0.58.0
+BuildRequires:	ninja >= 1.5
 BuildRequires:	pkgconfig
-BuildRequires:	polkit-devel >= 0.103
+BuildRequires:	polkit-devel >= 0.114
 BuildRequires:	pulseaudio-devel >= 2.0
+BuildRequires:	python3 >= 1:3
+BuildRequires:	rpm-build >= 4.6
 BuildRequires:	rpmbuild(find_lang) >= 1.23
-BuildRequires:	rpmbuild(macros) >= 1.311
+BuildRequires:	rpmbuild(macros) >= 1.752
+%{?with_snap:BuildRequires:	snapd-glib-devel >= 1.57}
 BuildRequires:	tar >= 1:1.22
-%{?with_wayland:BuildRequires:	udev-glib-devel}
-BuildRequires:	udisks2-devel >= 2.1.8
+BuildRequires:	tecla-devel
+BuildRequires:	udisks2-devel >= 2.8.2
 BuildRequires:	upower-devel >= 0.99.8
-BuildRequires:	xorg-lib-libX11-devel
+BuildRequires:	xorg-lib-libX11-devel >= 1.8
 BuildRequires:	xorg-lib-libXi-devel >= 1.2
 BuildRequires:	xz
 BuildRequires:	yelp-tools
 Requires(post,postun):	desktop-file-utils
-Requires(post,postun):	glib2 >= 1:2.54.0
+Requires(post,postun):	glib2 >= 1:2.76.6
 Requires(post,postun):	gtk-update-icon-cache
+Requires:	NetworkManager >= 2:1.24.0
 Requires:	accountsservice >= 0.6.39
-Requires:	cheese-libs >= 3.28.0
+Requires:	colord >= 0.1.34
+Requires:	colord-gtk4 >= 0.1.24
 Requires:	cups-pk-helper
 Requires:	desktop-file-utils
-Requires:	glib2 >= 1:2.54.0
-Requires:	gnome-bluetooth-libs >= 3.18.2
-Requires:	gnome-desktop >= 3.28.0
-Requires:	gnome-online-accounts >= 3.26.0
-Requires:	gnome-settings-daemon >= 1:3.26.0
-Requires:	gsettings-desktop-schemas >= 3.31.0
-Requires:	gtk+3 >= 3.22.20
+Requires:	gcr4-devel >= 4.1.0
+Requires:	gdk-pixbuf2 >= 2.24.0
+Requires:	glib2 >= 1:2.76.6
+%ifnarch s390 s390x
+Requires:	gnome-bluetooth3-ui-libs >= 42
+%endif
+Requires:	gnome-desktop4 >= 42
+Requires:	gnome-online-accounts >= 3.49.1
+Requires:	gnome-settings-daemon >= 1:41.0
+Requires:	gsettings-desktop-schemas >= 46
+Requires:	gtk4 >= 4.11.2
 Requires:	hicolor-icon-theme
-Requires:	libhandy >= 0.0.9
-Requires:	libwacom >= 0.7
-Requires:	polkit >= 0.103
+%{?with_ibus:Requires:	ibus-libs >= 1.5.2}
+Requires:	libadwaita >= 1.4
+Requires:	libgudev >= 232
+%{?with_malcontent:Requires:	libmalcontent >= 0.10.0}
+Requires:	libnma-gtk4 >= 1.10.2
+Requires:	libpwquality >= 1.2.2
+%ifnarch s390 s390x
+Requires:	libwacom >= 0.27
+%endif
+Requires:	polkit >= 0.114
+Requires:	pulseaudio-libs >= 2.0
 Requires:	tzdata
-Requires:	udisks2-libs >= 2.1.8
+Requires:	udisks2-libs >= 2.8.2
 Requires:	upower-libs >= 0.99.8
-Suggests:	NetworkManager-applet
-Suggests:	cups
+Requires:	xorg-lib-libX11 >= 1.8
+Requires:	xorg-lib-libXi >= 1.2
+Suggests:	NetworkManager-applet >= 1.8.0
+Suggests:	cups >= 1.4
 Suggests:	gnome-color-manager
-Suggests:	libcanberra-gnome
 Suggests:	libgnomekbd
 # info panel needs glxinfo
 Suggests:	mesa-utils
 Suggests:	mousetweaks >= 3.0.0
 Provides:	control-center = %{epoch}:%{version}-%{release}
-Obsoletes:	acme
-Obsoletes:	control-center
-Obsoletes:	control-center-libs
-Obsoletes:	fontilus
-Obsoletes:	gnome
-Obsoletes:	gnome-control-center-libs
-Obsoletes:	gnome-media-volume-control
-Obsoletes:	themus
-# sr@Latn vs. sr@latin
-Conflicts:	glibc-misc < 6:2.7
+Obsoletes:	acme < 2.5
+Obsoletes:	control-center < 1:2.19
+Obsoletes:	control-center-libs < 1:2.19
+Obsoletes:	fontilus < 0.5
+Obsoletes:	gnome < 2
+Obsoletes:	gnome-control-center-libs < 1:3.4
+Obsoletes:	gnome-media-volume-control < 2.21
+Obsoletes:	themus < 0.2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -144,8 +170,9 @@ Summary:	GNOME Control Center development files
 Summary(pl.UTF-8):	Pliki programistyczne GNOME Control Center
 Group:		X11/Development/Libraries
 Provides:	control-center-devel = %{epoch}:%{version}-%{release}
-Obsoletes:	control-center-devel
-Obsoletes:	gnome-control-center-static
+Obsoletes:	control-center-devel < 1:2.19
+Obsoletes:	gnome-control-center-static < 1:3
+BuildArch:	noarch
 
 %description devel
 GNOME Control Center development files.
@@ -157,10 +184,8 @@ Pliki programistyczne GNOME Control Center.
 Summary:	bash-completion for gnome-control-center
 Summary(pl.UTF-8):	Bashowe uzupełnianie nazw dla gnome-control-center
 Group:		Applications/Shells
-Requires:	bash-completion >= 2.0
-%if "%{_rpmversion}" >= "5"
+Requires:	bash-completion >= 1:2.0
 BuildArch:	noarch
-%endif
 
 %description -n bash-completion-gnome-control-center
 bash-completion for gnome-control-center.
@@ -176,6 +201,9 @@ Bashowe uzupełnianie nazw dla gnome-control-center.
 %meson build \
 	-Ddocumentation=true \
 	%{!?with_ibus:-Dibus=false} \
+	%{?with_malcontent:-Dmalcontent=true} \
+	%{?with_snap:-Dsnap=true} \
+	-Dtests=false \
 	%{!?with_wayland:-Dwayland=false}
 
 %meson_build -C build
@@ -185,6 +213,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %meson_install -C build
 
+# not supported by glibc (as of 2.37)
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/ie
+
 %find_lang %{name} --with-gnome --all-name
 
 %clean
@@ -204,33 +235,29 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc NEWS README.md
 %attr(755,root,root) %{_bindir}/gnome-control-center
-%attr(755,root,root) %{_libexecdir}/cc-remote-login-helper
+%attr(755,root,root) %{_libexecdir}/gnome-control-center-print-renderer
 %attr(755,root,root) %{_libexecdir}/gnome-control-center-search-provider
-%{_datadir}/dbus-1/services/org.gnome.ControlCenter.service
-%{_datadir}/dbus-1/services/org.gnome.ControlCenter.SearchProvider.service
-%{_datadir}/glib-2.0/schemas/org.gnome.ControlCenter.gschema.xml
-%{_datadir}/gnome-shell/search-providers/gnome-control-center-search-provider.ini
-%{_datadir}/metainfo/gnome-control-center.appdata.xml
-%{_datadir}/polkit-1/actions/org.gnome.controlcenter.datetime.policy
+%{_datadir}/dbus-1/services/org.gnome.Settings.service
+%{_datadir}/dbus-1/services/org.gnome.Settings.SearchProvider.service
+%{_datadir}/glib-2.0/schemas/org.gnome.Settings.gschema.xml
+%{_datadir}/gnome-shell/search-providers/org.gnome.Settings.search-provider.ini
+%{_datadir}/metainfo/org.gnome.Settings.appdata.xml
 %{_datadir}/polkit-1/actions/org.gnome.controlcenter.remote-login-helper.policy
+%{_datadir}/polkit-1/actions/org.gnome.controlcenter.remote-session-helper.policy
+%{_datadir}/polkit-1/actions/org.gnome.controlcenter.system.policy
 %{_datadir}/polkit-1/actions/org.gnome.controlcenter.user-accounts.policy
 %{_datadir}/polkit-1/rules.d/gnome-control-center.rules
 %{_datadir}/gnome-control-center
 %{_datadir}/sounds/gnome
-%{_iconsdir}/hicolor/*x*/apps/gnome-power-manager.png
-%{_iconsdir}/hicolor/*x*/apps/goa-panel.png
-%{_iconsdir}/hicolor/*x*/apps/preferences-color.png
-%{_iconsdir}/hicolor/*x*/apps/preferences-desktop-display.png
-%{_iconsdir}/hicolor/*x*/apps/preferences-system-time.png
 %{_iconsdir}/hicolor/scalable/apps/org.gnome.Settings.svg
-%{_iconsdir}/hicolor/scalable/apps/preferences-color.svg
-%{_iconsdir}/hicolor/scalable/apps/preferences-desktop-display.svg
-%{_iconsdir}/hicolor/scalable/apps/preferences-system-time.svg
-%{_iconsdir}/hicolor/scalable/categories/slideshow-symbolic.svg
-%{_iconsdir}/hicolor/scalable/emblems/slideshow-emblem.svg
+%{_iconsdir}/hicolor/scalable/apps/org.gnome.Settings-*.svg
+%{_iconsdir}/hicolor/scalable/apps/org.gnome.Settings.Devel.svg
 %{_iconsdir}/hicolor/symbolic/apps/org.gnome.Settings-symbolic.svg
+# FIXME: wrong location (move to pixmapsdir or hicolor/scalable/...?)
+%{_iconsdir}/gnome-logo-text.svg
+%{_iconsdir}/gnome-logo-text-dark.svg
 %{_desktopdir}/gnome-*-panel.desktop
-%{_desktopdir}/gnome-control-center.desktop
+%{_desktopdir}/org.gnome.Settings.desktop
 %{_pixmapsdir}/faces
 %{_mandir}/man1/gnome-control-center.1*