From 8a58cfa67ff943df1b6d9db93c5ce021dac687ea Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Thu, 23 May 2019 05:30:01 +0200 Subject: [PATCH] - updated to 3.32.1 --- gnome-control-center.spec | 63 ++++++++++++++++++++++++++------------- krb5.patch | 5 ++-- 2 files changed, 44 insertions(+), 24 deletions(-) diff --git a/gnome-control-center.spec b/gnome-control-center.spec index c751804..a8a7044 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,21 +10,22 @@ 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.30.2 +Version: 3.32.1 Release: 1 Epoch: 1 License: GPL v2+ Group: X11/Applications -Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-control-center/3.30/%{name}-%{version}.tar.xz -# Source0-md5: a1c5eb83cad50db3f54c03c8d1be02f8 +Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-control-center/3.32/%{name}-%{version}.tar.xz +# Source0-md5: 307d87113d66a9b0cfe15d7b7888ca7e Patch0: krb5.patch URL: http://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.2.0 +BuildRequires: NetworkManager-gtk-lib-devel >= 1.8.0 BuildRequires: OpenGL-devel BuildRequires: accountsservice-devel >= 0.6.39 -BuildRequires: cheese-devel >= 3.6.0 +BuildRequires: cheese-devel >= 3.28.0 BuildRequires: clutter-devel >= 1.12.0 BuildRequires: clutter-gtk-devel BuildRequires: colord-devel >= 0.1.34 @@ -40,48 +42,53 @@ 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.28.0 +BuildRequires: gsettings-desktop-schemas-devel >= 3.31.0 BuildRequires: gstreamer-devel >= 1.0 BuildRequires: gtk+3-devel >= 3.22.20 BuildRequires: heimdal-devel %{?with_ibus:BuildRequires: ibus-devel >= 1.5.2} BuildRequires: libcanberra-gtk3-devel >= 0.26 BuildRequires: libgtop-devel +BuildRequires: libhandy-devel >= 0.0.9 BuildRequires: libnotify-devel >= 0.7.3 BuildRequires: libpwquality-devel >= 1.2.2 BuildRequires: libsmbclient-devel BuildRequires: libsoup-devel BuildRequires: libwacom-devel >= 0.7 BuildRequires: libxml2-devel >= 1:2.6.31 -BuildRequires: meson >= 0.43.0 +BuildRequires: meson >= 0.48.0 BuildRequires: pkgconfig BuildRequires: polkit-devel >= 0.103 BuildRequires: pulseaudio-devel >= 2.0 BuildRequires: rpmbuild(find_lang) >= 1.23 BuildRequires: rpmbuild(macros) >= 1.311 BuildRequires: tar >= 1:1.22 -BuildRequires: udev-glib-devel -BuildRequires: upower-devel >= 0.99.0 +%{?with_wayland:BuildRequires: udev-glib-devel} +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.54.0 Requires(post,postun): gtk-update-icon-cache -Requires: accountsservice +Requires: accountsservice >= 0.6.39 +Requires: cheese-libs >= 3.28.0 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.28.0 +Requires: gsettings-desktop-schemas >= 3.31.0 Requires: gtk+3 >= 3.22.20 Requires: hicolor-icon-theme +Requires: libhandy >= 0.0.9 +Requires: libwacom >= 0.7 Requires: polkit >= 0.103 Requires: tzdata +Requires: upower-libs >= 0.99.8 Suggests: NetworkManager-applet Suggests: cups Suggests: gnome-color-manager @@ -167,7 +174,9 @@ Bashowe uzupełnianie nazw dla gnome-control-center. %build %meson build \ - -Dibus=%{?with_ibus:true}%{!?with_ibus:false} + -Ddocumentation=true \ + %{!?with_ibus:-Dibus=false} \ + %{!?with_wayland:-Dwayland=false} %meson_build -C build @@ -176,7 +185,7 @@ rm -rf $RPM_BUILD_ROOT %meson_install -C build -%find_lang %{name} --with-gnome --with-omf --all-name +%find_lang %{name} --with-gnome --all-name %clean rm -rf $RPM_BUILD_ROOT @@ -193,25 +202,37 @@ rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(644,root,root,755) -%doc NEWS +%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-search-provider -%{_datadir}/metainfo/gnome-control-center.appdata.xml %{_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) diff --git a/krb5.patch b/krb5.patch index 260e9aa..4686f59 100644 --- a/krb5.patch +++ b/krb5.patch @@ -1,6 +1,5 @@ -diff -uNr gnome-control-center-3.6.0/panels/user-accounts/um-realm-manager.c gnome-control-center-3.6.0.new/panels/user-accounts/um-realm-manager.c ---- gnome-control-center-3.6.0/panels/user-accounts/um-realm-manager.c 2012-09-24 17:39:34.000000000 +0200 -+++ gnome-control-center-3.6.0.new/panels/user-accounts/um-realm-manager.c 2012-10-05 14:30:29.557805038 +0200 +--- gnome-control-center-3.32.1/panels/user-accounts/cc-realm-manager.c 2012-09-24 17:39:34.000000000 +0200 ++++ gnome-control-center-3.32.1.new/panels/user-accounts/cc-realm-manager.c 2012-10-05 14:30:29.557805038 +0200 @@ -23,7 +23,7 @@ #include "um-realm-manager.h" -- 2.44.0