- updated to 3.2.0; merged from DEVEL

Changed files:
    gnome-control-center.spec -> 1.56

diff --git a/gnome-control-center.spec b/gnome-control-center.spec
index 97c4e52488754d769ecda4bc3c377f37f17926d9..1a4f4b79c654c16cc0d991a3e5bd891cb9a83b35 100644 (file)
--- a/gnome-control-center.spec
+++ b/gnome-control-center.spec
@@ -5,42 +5,46 @@ 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.0.2
+Version:       3.2.0
 Release:       1
 Epoch:         1
 License:       GPL v2+
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-control-center/3.0/%{name}-%{version}.tar.bz2
-# Source0-md5: 5b5601fbae8be38a313a169b0fb4d9bf
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-control-center/3.2/%{name}-%{version}.tar.xz
+# Source0-md5: a17a52a8f8e8e52d0dc86e791ab6a907
 # PLD-specific patches
 Patch0:                system-locale-archive-path.patch
 Patch1:                configure-gettext.patch
 URL:           http://www.gnome.org/
 BuildRequires: GConf2-devel >= 2.26.0
-BuildRequires: NetworkManager-devel >= 0.8.996
+# use libnm-gtk - will use correct NM version
+BuildRequires: NetworkManager-gtk-lib-devel >= 0.9.1.90-2
 BuildRequires: autoconf
 BuildRequires: automake >= 1:1.10
 BuildRequires: cheese-devel >= 3.0.1
+BuildRequires: colord-devel >= 0.1.8
 BuildRequires: cups-devel >= 1.4
 BuildRequires: dbus-glib-devel >= 0.74
 BuildRequires: docbook-dtd412-xml
 BuildRequires: gdk-pixbuf2-devel >= 2.23.0
 BuildRequires: gettext-devel >= 0.17
-BuildRequires: glib2-devel >= 1:2.28.0
+BuildRequires: glib2-devel >= 1:2.29.14
 BuildRequires: gnome-common >= 2.24.0
-BuildRequires: gnome-desktop-devel >= 3.0.0
+BuildRequires: gnome-desktop-devel >= 3.1.4
 BuildRequires: gnome-doc-utils >= 0.12.1
-BuildRequires: gnome-menus-devel >= 3.0.0
-BuildRequires: gnome-settings-daemon-devel >= 1:3.0.0
-BuildRequires: gsettings-desktop-schemas-devel >= 3.0.0
+BuildRequires: gnome-menus-devel >= 3.1.90
+BuildRequires: gnome-online-accounts-devel >= 3.1.1
+BuildRequires: gnome-settings-daemon-devel >= 1:3.1.4
+BuildRequires: gsettings-desktop-schemas-devel >= 3.1.3
 BuildRequires: gstreamer-devel
-BuildRequires: gtk+3-devel >= 3.0.2
+BuildRequires: gtk+3-devel >= 3.1.3
 BuildRequires: gtk-doc >= 1.9
 BuildRequires: intltool >= 0.40.1
 BuildRequires: iso-codes
 BuildRequires: libcanberra-gtk3-devel >= 0.26
 BuildRequires: libgnomekbd-devel >= 3.0.0
 BuildRequires: libgtop-devel
+BuildRequires: libnotify-devel >= 0.7.3
 BuildRequires: libsocialweb-devel
 BuildRequires: libtool >= 2:2.2
 BuildRequires: libxklavier-devel >= 5.1
@@ -51,9 +55,11 @@ BuildRequires:       pulseaudio-devel >= 0.9.16
 BuildRequires: rpmbuild(find_lang) >= 1.23
 BuildRequires: rpmbuild(macros) >= 1.311
 BuildRequires: scrollkeeper
+BuildRequires: tar >= 1:1.22
 BuildRequires: upower-devel >= 0.9.1
 BuildRequires: xorg-lib-libXxf86misc-devel
 BuildRequires: xorg-lib-libxkbfile-devel
+BuildRequires: xz
 Requires(post,postun): desktop-file-utils
 Requires(post,postun): gtk-update-icon-cache
 Requires(post,postun): scrollkeeper
@@ -61,8 +67,8 @@ Requires(post,postun):        shared-mime-info
 Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
 Requires:      accountsservice
 Requires:      desktop-file-utils
-Requires:      gnome-settings-daemon >= 1:3.0.0
-Requires:      gsettings-desktop-schemas >= 3.0.0
+Requires:      gnome-settings-daemon >= 1:3.1.4
+Requires:      gsettings-desktop-schemas >= 3.1.3
 Requires:      hicolor-icon-theme
 Requires:      libgnomekbd >= 3.0.0
 Suggests:      apg
@@ -127,9 +133,9 @@ Summary:    GNOME Control Center header files
 Summary(pl.UTF-8):     Pliki nagłówkowe bibliotek GNOME Control Center
 Group:         X11/Development/Libraries
 Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
-Requires:      glib2-devel >= 1:2.28.0
-Requires:      gnome-desktop-devel >= 3.0.0
-Requires:      gtk+3-devel >= 3.0.2
+Requires:      glib2-devel >= 1:2.29.14
+Requires:      gnome-desktop-devel >= 3.1.4
+Requires:      gtk+3-devel >= 3.1.3
 Provides:      control-center-devel = %{epoch}:%{version}-%{release}
 Obsoletes:     control-center-devel
 
@@ -155,7 +161,6 @@ Pliki nagłówkowe bibliotek GNOME Control Center.
 %{__autoheader}
 %{__automake}
 %configure \
-       --disable-schemas-install \
        --disable-silent-rules \
        --disable-update-mimedb \
        --with-libsocialweb \
@@ -172,9 +177,6 @@ rm -rf $RPM_BUILD_ROOT
 # no static modules - shut up check-files
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/control-center-1/panels/*.{a,la}
 
-# obsolete locales (nb already exists)
-%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/no
-
 %find_lang %{name} --with-gnome --with-omf --all-name
 
 %clean
@@ -203,12 +205,14 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/control-center-1
 %dir %{_libdir}/control-center-1/panels
 %attr(755,root,root) %{_libdir}/control-center-1/panels/libbackground.so
+%attr(755,root,root) %{_libdir}/control-center-1/panels/libcolor.so
 %attr(755,root,root) %{_libdir}/control-center-1/panels/libdate_time.so
 %attr(755,root,root) %{_libdir}/control-center-1/panels/libdisplay.so
 %attr(755,root,root) %{_libdir}/control-center-1/panels/libinfo.so
 %attr(755,root,root) %{_libdir}/control-center-1/panels/libkeyboard.so
 %attr(755,root,root) %{_libdir}/control-center-1/panels/libmouse-properties.so
 %attr(755,root,root) %{_libdir}/control-center-1/panels/libnetwork.so
+%attr(755,root,root) %{_libdir}/control-center-1/panels/libonline-accounts.so
 %attr(755,root,root) %{_libdir}/control-center-1/panels/libregion.so
 %attr(755,root,root) %{_libdir}/control-center-1/panels/libsound.so
 %attr(755,root,root) %{_libdir}/control-center-1/panels/libmedia.so
@@ -217,6 +221,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/control-center-1/panels/libscreen.so
 %attr(755,root,root) %{_libdir}/control-center-1/panels/libuniversal-access.so
 %attr(755,root,root) %{_libdir}/control-center-1/panels/libuser-accounts.so
+%attr(755,root,root) %{_libdir}/control-center-1/panels/libwacom-properties.so
 %{_sysconfdir}/xdg/autostart/gnome-sound-applet.desktop
 %{_sysconfdir}/xdg/menus/gnomecc.menu
 %{_datadir}/gnome-control-center
@@ -235,6 +240,4 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libgnome-control-center.so
-%{_includedir}/gnome-control-center-1
 %{_npkgconfigdir}/gnome-keybindings.pc
-%{_pkgconfigdir}/libgnome-control-center.pc