X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=gnome-control-center.spec;h=e059565f991aa6e593d803f90dc0120bdd515b13;hb=baa5e21;hp=a7277322c8eda996be0b54681fbcae88b36e1023;hpb=135841f86a508fbd3f7c6e28c864cf1b56bf7224;p=packages%2Fgnome-control-center.git

diff --git a/gnome-control-center.spec b/gnome-control-center.spec
index a727732..e059565 100644
--- a/gnome-control-center.spec
+++ b/gnome-control-center.spec
@@ -1,6 +1,7 @@
 #
 # Conditional build:
-%bcond_without	ibus	# ibus support
+%bcond_without	ibus	# IBus support
+%bcond_without	wayland	# Wayland support
 
 Summary:	GNOME Control Center
 Summary(es.UTF-8):	El centro de controle del GNOME
@@ -9,77 +10,107 @@ 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.14.0
+Version:	3.36.3
 Release:	1
 Epoch:		1
 License:	GPL v2+
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-control-center/3.14/%{name}-%{version}.tar.xz
-# Source0-md5:	8650a8975dabd6fbea256be4583f9bb3
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-control-center/3.36/%{name}-%{version}.tar.xz
+# Source0-md5:	fd99a8df0cc656e971415f2a1b310019
 Patch0:		krb5.patch
-URL:		http://www.gnome.org/
+URL:		https://www.gnome.org/
 BuildRequires:	ModemManager-devel >= 1.0.0
+BuildRequires:	NetworkManager-devel >= 1.12.0
 # use libnm-gtk - will use correct NM version
-BuildRequires:	NetworkManager-gtk-lib-devel >= 0.9.8
-BuildRequires:	OpenGL-devel
-BuildRequires:	accountsservice-devel >= 0.6.30
-BuildRequires:	autoconf
-BuildRequires:	automake >= 1:1.11
-BuildRequires:	cheese-devel >= 3.6.0
-BuildRequires:	clutter-gtk-devel
+BuildRequires:	NetworkManager-gtk-lib-devel >= 1.8.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:	cups-devel >= 1.4
-BuildRequires:	docbook-dtd412-xml
+BuildRequires:	docbook-dtd42-xml
+BuildRequires:	fontconfig-devel
 BuildRequires:	gdk-pixbuf2-devel >= 2.24.0
-BuildRequires:	gettext-devel >= 0.17
-BuildRequires:	glib2-devel >= 1:2.40.0
-BuildRequires:	gnome-bluetooth-devel >= 3.12.0
-BuildRequires:	gnome-common >= 2.24.0
-BuildRequires:	gnome-desktop-devel >= 3.12.0
+BuildRequires:	gettext-tools >= 0.17
+BuildRequires:	glib2-devel >= 1:2.56.0
+%ifnarch s390 s390x
+BuildRequires:	gnome-bluetooth-devel >= 3.18.2
+%endif
+BuildRequires:	gnome-desktop-devel >= 3.28.0
 BuildRequires:	gnome-menus-devel >= 3.4.0
-BuildRequires:	gnome-online-accounts-devel >= 3.10.0
-BuildRequires:	gnome-settings-daemon-devel >= 1:3.8.0
-BuildRequires:	grilo-devel >= 0.2.6
-BuildRequires:	gsettings-desktop-schemas-devel >= 3.14.0
-BuildRequires:	gstreamer-devel >= 1.0
-BuildRequires:	gtk+3-devel >= 3.14.0
+BuildRequires:	gnome-online-accounts-devel >= 3.26.0
+BuildRequires:	gnome-settings-daemon-devel >= 1:3.28.0
+BuildRequires:	grilo-devel >= 0.3.0
+BuildRequires:	gsettings-desktop-schemas-devel >= 3.31.0
+BuildRequires:	gsound-devel
+BuildRequires:	gtk+3-devel >= 3.22.20
 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
+BuildRequires:	libepoxy-devel
+BuildRequires:	libgtop-devel >= 2.0
+BuildRequires:	libgudev-devel >= 232
+BuildRequires:	libhandy-devel >= 0.0.9
 BuildRequires:	libpwquality-devel >= 1.2.2
+BuildRequires:	libsecret-devel
 BuildRequires:	libsmbclient-devel
-BuildRequires:	libsoup-devel
-BuildRequires:	libtool >= 2:2.2
+BuildRequires:	libsoup-devel >= 2.4
+%ifnarch s390 s390x
 BuildRequires:	libwacom-devel >= 0.7
+%endif
 BuildRequires:	libxml2-devel >= 1:2.6.31
+BuildRequires:	meson >= 0.50.0
+BuildRequires:	ninja >= 1.5
 BuildRequires:	pkgconfig
-BuildRequires:	polkit-devel >= 0.103
+BuildRequires:	polkit-devel >= 0.114
 BuildRequires:	pulseaudio-devel >= 2.0
 BuildRequires:	rpmbuild(find_lang) >= 1.23
-BuildRequires:	rpmbuild(macros) >= 1.311
+BuildRequires:	rpmbuild(macros) >= 1.736
 BuildRequires:	tar >= 1:1.22
-BuildRequires:	upower-devel >= 0.99.0
+BuildRequires:	udisks2-devel >= 2.1.8
+BuildRequires:	upower-devel >= 0.99.8
+BuildRequires:	xorg-lib-libX11-devel
 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.56.0
 Requires(post,postun):	gtk-update-icon-cache
-Requires:	accountsservice
+Requires:	accountsservice >= 0.6.39
+Requires:	cheese-libs >= 3.28.0
+Requires:	colord >= 0.1.34
+Requires:	colord-gtk >= 0.1.24
 Requires:	cups-pk-helper
 Requires:	desktop-file-utils
-Requires:	glib2 >= 1:2.40.0
-Requires:	gnome-desktop >= 3.12.0
-Requires:	gnome-settings-daemon >= 1:3.8.0
-Requires:	gsettings-desktop-schemas >= 3.14.0
-Requires:	gtk+3 >= 3.14.0
+Requires:	gdk-pixbuf2 >= 2.24.0
+Requires:	glib2 >= 1:2.56.0
+%ifnarch s390 s390x
+Requires:	gnome-bluetooth-libs >= 3.18.2
+%endif
+Requires:	gnome-desktop >= 3.28.0
+Requires:	gnome-online-accounts >= 3.26.0
+Requires:	gnome-settings-daemon >= 1:3.28.0
+Requires:	gsettings-desktop-schemas >= 3.31.0
+Requires:	gtk+3 >= 3.22.20
 Requires:	hicolor-icon-theme
+%{?with_ibus:Requires:	ibus-libs >= 1.5.2}
+Requires:	libgudev >= 232
+Requires:	libhandy >= 0.0.9
+Requires:	libpwquality >= 1.2.2
+%ifnarch s390 s390x
+Requires:	libwacom >= 0.7
+%endif
+Requires:	polkit >= 0.114
+Requires:	pulseaudio-libs >= 2.0
+Requires:	tzdata
+Requires:	udisks2-libs >= 2.1.8
+Requires:	upower-libs >= 0.99.8
+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
@@ -92,8 +123,6 @@ 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
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -132,6 +161,7 @@ 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
 
 %description devel
 GNOME Control Center development files.
@@ -144,7 +174,7 @@ 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"
+%if "%{_rpmversion}" >= "4.6"
 BuildArch:	noarch
 %endif
 
@@ -159,62 +189,79 @@ 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_wayland:-Dwayland=false}
+
+# -Dsnap=true R: snapd-glib >= 1.49
+
+%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
+
+%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
+%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}/polkit-1/actions/org.gnome.controlcenter.remote-login-helper.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/*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/symbolic/apps/org.gnome.Settings-symbolic.svg
+%{_desktopdir}/gnome-*-panel.desktop
+%{_desktopdir}/gnome-control-center.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
+%{_iconsdir}/hicolor/scalable/apps/org.gnome.Settings.Devel.svg
 
 %files -n bash-completion-gnome-control-center
 %defattr(644,root,root,755)
-%{_datadir}/bash-completion/completions/gnome-control-center
+%{bash_compdir}/gnome-control-center