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

diff --git a/gnome-control-center.spec b/gnome-control-center.spec
index e893815..046195a 100644
--- a/gnome-control-center.spec
+++ b/gnome-control-center.spec
@@ -1,6 +1,9 @@
 #
 # Conditional build:
-%bcond_without	ibus	# ibus 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
@@ -9,100 +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.20.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.20/%{name}-%{version}.tar.xz
-# Source0-md5:	0f2297bc4eebfaccf8898dd3d1e38f15
+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
-# use libnm-gtk - will use correct NM version
-BuildRequires:	NetworkManager-gtk-lib-devel >= 0.9.8
-BuildRequires:	OpenGL-devel
+BuildRequires:	NetworkManager-devel >= 2:1.24.0
 BuildRequires:	accountsservice-devel >= 0.6.39
-BuildRequires:	autoconf
-BuildRequires:	automake >= 1:1.11
-BuildRequires:	cheese-devel >= 3.6.0
-BuildRequires:	clutter-devel >= 1.12.0
-BuildRequires:	clutter-gtk-devel
+BuildRequires:	cairo-gobject-devel
 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-dtd412-xml
+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.44.0
-BuildRequires:	gnome-bluetooth-devel >= 3.18.2
-BuildRequires:	gnome-common >= 2.24.0
-BuildRequires:	gnome-desktop-devel >= 3.20.0
-BuildRequires:	gnome-menus-devel >= 3.4.0
-BuildRequires:	gnome-online-accounts-devel >= 3.16.0
-BuildRequires:	gnome-settings-daemon-devel >= 1:3.20.0
-BuildRequires:	grilo-devel >= 0.3.0
-BuildRequires:	gsettings-desktop-schemas-devel >= 3.20.0
-BuildRequires:	gstreamer-devel >= 1.0
-BuildRequires:	gtk+3-devel >= 3.20.3
+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
+# 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:	intltool >= 0.40.1
-BuildRequires:	libcanberra-gtk3-devel >= 0.26
-BuildRequires:	libgtop-devel
-BuildRequires:	libnotify-devel >= 0.7.3
+%{?with_snap:BuildRequires:	json-glib-devel}
+BuildRequires:	libadwaita-devel >= 1.4
+BuildRequires:	libepoxy-devel
+BuildRequires:	libgtop-devel >= 2.0
+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
-BuildRequires:	libtool >= 2:2.2
-BuildRequires:	libwacom-devel >= 0.7
+%ifnarch s390 s390x
+BuildRequires:	libwacom-devel >= 0.27
+%endif
 BuildRequires:	libxml2-devel >= 1:2.6.31
+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
-BuildRequires:	udev-glib-devel
-BuildRequires:	upower-devel >= 0.99.0
+BuildRequires:	tecla-devel
+BuildRequires:	udisks2-devel >= 2.8.2
+BuildRequires:	upower-devel >= 0.99.8
+BuildRequires:	xorg-lib-libX11-devel >= 1.8
 BuildRequires:	xorg-lib-libXi-devel >= 1.2
-BuildRequires:	xorg-lib-libXxf86misc-devel
-BuildRequires:	xorg-lib-libxkbfile-devel
 BuildRequires:	xz
 BuildRequires:	yelp-tools
 Requires(post,postun):	desktop-file-utils
+Requires(post,postun):	glib2 >= 1:2.76.6
 Requires(post,postun):	gtk-update-icon-cache
-Requires:	accountsservice
+Requires:	NetworkManager >= 2:1.24.0
+Requires:	accountsservice >= 0.6.39
+Requires:	colord >= 0.1.34
+Requires:	colord-gtk4 >= 0.1.24
 Requires:	cups-pk-helper
 Requires:	desktop-file-utils
-Requires:	glib2 >= 1:2.44.0
-Requires:	gnome-desktop >= 3.20.0
-Requires:	gnome-online-accounts >= 3.16.0
-Requires:	gnome-settings-daemon >= 1:3.20.0
-Requires:	gsettings-desktop-schemas >= 3.20.0
-Requires:	gtk+3 >= 3.20.3
+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:	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
-Suggests:	NetworkManager-applet
-Suggests:	cups
+Requires:	udisks2-libs >= 2.8.2
+Requires:	upower-libs >= 0.99.8
+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
@@ -140,7 +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:	control-center-devel < 1:2.19
+Obsoletes:	gnome-control-center-static < 1:3
+BuildArch:	noarch
 
 %description devel
 GNOME Control Center development files.
@@ -152,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.
@@ -168,61 +198,75 @@ Bashowe uzupełnianie nazw dla gnome-control-center.
 %patch0 -p1
 
 %build
-%{__intltoolize}
-%{__libtoolize}
-%{__aclocal} -I m4 -I libgd
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
-	--disable-silent-rules \
-	--disable-update-mimedb \
-	%{__enable_disable ibus ibus} \
-	X_EXTRA_LIBS="-lXext"
-%{__make}
+%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
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
 
-%find_lang %{name} --with-gnome --with-omf --all-name
+%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
 rm -rf $RPM_BUILD_ROOT
 
 %post
+%glib_compile_schemas
 %update_desktop_database_post
 %update_icon_cache hicolor
 
 %postun
+%glib_compile_schemas
 %update_desktop_database_postun
 %update_icon_cache hicolor
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog MAINTAINERS NEWS README
+%doc NEWS README.md
 %attr(755,root,root) %{_bindir}/gnome-control-center
-%attr(755,root,root) %{_libdir}/cc-remote-login-helper
-%attr(755,root,root) %{_libdir}/gnome-control-center-search-provider
-%{_datadir}/appdata/gnome-control-center.appdata.xml
-%{_datadir}/dbus-1/services/org.gnome.ControlCenter.service
-%{_datadir}/dbus-1/services/org.gnome.ControlCenter.SearchProvider.service
-%{_datadir}/gnome-shell/search-providers/gnome-control-center-search-provider.ini
-%{_datadir}/polkit-1/actions/org.gnome.controlcenter.datetime.policy
+%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.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/*/*/*.png
-%{_iconsdir}/hicolor/*/*/*.svg
-%{_desktopdir}/*.desktop
+%{_iconsdir}/hicolor/scalable/apps/org.gnome.Settings.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}/org.gnome.Settings.desktop
 %{_pixmapsdir}/faces
 %{_mandir}/man1/gnome-control-center.1*
 
 %files devel
 %defattr(644,root,root,755)
+%{_datadir}/gettext/its/gnome-keybindings.its
+%{_datadir}/gettext/its/gnome-keybindings.loc
+%{_datadir}/gettext/its/sounds.its
+%{_datadir}/gettext/its/sounds.loc
 %{_npkgconfigdir}/gnome-keybindings.pc
 
 %files -n bash-completion-gnome-control-center