- updated to 3.4.0; merged from DEVEL

- added systemd bcond (off by default)

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

diff --git a/gnome-control-center.spec b/gnome-control-center.spec
index 13399c43030fbed5675d1e2dabe390d8c0a7862e..fb02e20d9d58c15e50abb5e8d96d9bef039c70b5 100644 (file)
--- a/gnome-control-center.spec
+++ b/gnome-control-center.spec
@@ -1,3 +1,7 @@
+#
+# Conditional build:
+%bcond_with    systemd # rely on systemd for session tracking instead of ConsoleKit
+#
 Summary:       GNOME Control Center
 Summary(es.UTF-8):     El centro de controle del GNOME
 Summary(pl.UTF-8):     Centrum Kontroli GNOME
@@ -5,40 +9,39 @@ 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.2.2
+Version:       3.4.0
 Release:       1
 Epoch:         1
 License:       GPL v2+
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-control-center/3.2/%{name}-%{version}.tar.xz
-# Source0-md5: 7da05b8b5d78535482e8f849ca0cf274
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-control-center/3.4/%{name}-%{version}.tar.xz
+# Source0-md5: 31163fa739846929043ae4963bd4f8fa
 # PLD-specific patches
 Patch0:                system-locale-archive-path.patch
 Patch1:                configure-gettext.patch
-Patch2:                territory_code.patch
 URL:           http://www.gnome.org/
-BuildRequires: GConf2-devel >= 2.26.0
 # 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: automake >= 1:1.11
+BuildRequires: cheese-devel >= 3.3.5
 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.29.14
+BuildRequires: glib2-devel >= 1:2.31.0
+BuildRequires: gnome-bluetooth-devel >= 3.3.4
 BuildRequires: gnome-common >= 2.24.0
-BuildRequires: gnome-desktop-devel >= 3.1.4
+BuildRequires: gnome-desktop-devel >= 3.1.91
 BuildRequires: gnome-doc-utils >= 0.12.1
 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: gnome-settings-daemon-devel >= 1:3.3.91
+BuildRequires: gsettings-desktop-schemas-devel >= 3.3.0
 BuildRequires: gstreamer-devel
-BuildRequires: gtk+3-devel >= 3.1.3
+BuildRequires: gtk+3-devel >= 3.3.5
 BuildRequires: gtk-doc >= 1.9
 BuildRequires: intltool >= 0.40.1
 BuildRequires: iso-codes
@@ -48,14 +51,15 @@ BuildRequires:      libgtop-devel
 BuildRequires: libnotify-devel >= 0.7.3
 BuildRequires: libsocialweb-devel
 BuildRequires: libtool >= 2:2.2
+BuildRequires: libwacom-devel >= 0.3
 BuildRequires: libxklavier-devel >= 5.1
 BuildRequires: libxml2-devel >= 1:2.6.31
 BuildRequires: pkgconfig
-BuildRequires: polkit-devel >= 0.97
+BuildRequires: polkit-devel >= 0.103
 BuildRequires: pulseaudio-devel >= 0.9.16
 BuildRequires: rpmbuild(find_lang) >= 1.23
 BuildRequires: rpmbuild(macros) >= 1.311
-BuildRequires: scrollkeeper
+%{?with_systemd:BuildRequires: systemd-devel}
 BuildRequires: tar >= 1:1.22
 BuildRequires: upower-devel >= 0.9.1
 BuildRequires: xorg-lib-libXxf86misc-devel
@@ -63,13 +67,11 @@ BuildRequires:      xorg-lib-libxkbfile-devel
 BuildRequires: xz
 Requires(post,postun): desktop-file-utils
 Requires(post,postun): gtk-update-icon-cache
-Requires(post,postun): scrollkeeper
 Requires(post,postun): shared-mime-info
-Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
 Requires:      accountsservice
 Requires:      desktop-file-utils
-Requires:      gnome-settings-daemon >= 1:3.1.4
-Requires:      gsettings-desktop-schemas >= 3.1.3
+Requires:      gnome-settings-daemon >= 1:3.3.91
+Requires:      gsettings-desktop-schemas >= 3.3.0
 Requires:      hicolor-icon-theme
 Requires:      libgnomekbd >= 3.0.0
 Suggests:      apg
@@ -78,8 +80,10 @@ 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
@@ -116,41 +120,23 @@ GNOME вашей системы (такие вещи как фон рабоче
 
 Цей пакет потрібний, якщо ви встановлюєте середовище GNOME.
 
-%package libs
-Summary:       GNOME Control Center gnome-window-settings library
-Summary(pl.UTF-8):     Biblioteka Control Center gnome-window-settings
-Group:         X11/Libraries
-Provides:      control-center-libs = %{epoch}:%{version}-%{release}
-Obsoletes:     control-center-libs
-
-%description libs
-This package contains gnome-window-settings library.
-
-%description libs -l pl.UTF-8
-Pakiet ten zawiera bibliotekę gnome-window-settings.
-
 %package devel
-Summary:       GNOME Control Center header files
-Summary(pl.UTF-8):     Pliki nagłówkowe bibliotek GNOME Control Center
+Summary:       GNOME Control Center development files
+Summary(pl.UTF-8):     Pliki programistyczne GNOME Control Center
 Group:         X11/Development/Libraries
-Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
-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
 
 %description devel
-GNOME Control-Center header files.
+GNOME Control Center development files.
 
 %description devel -l pl.UTF-8
-Pliki nagłówkowe bibliotek GNOME Control Center.
+Pliki programistyczne GNOME Control Center.
 
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 %{__gnome_doc_prepare}
@@ -166,6 +152,7 @@ Pliki nagłówkowe bibliotek GNOME Control Center.
        --disable-silent-rules \
        --disable-update-mimedb \
        --with-libsocialweb \
+       %{__enable_disable systemd systemd} \
        X_EXTRA_LIBS="-lXext"
 %{__make}
 
@@ -175,7 +162,6 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
 # no static modules - shut up check-files
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/control-center-1/panels/*.{a,la}
 
@@ -185,20 +171,15 @@ rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%scrollkeeper_update_post
 %update_mime_database
 %update_desktop_database_post
 %update_icon_cache hicolor
 
 %postun
-%scrollkeeper_update_postun
 %update_mime_database
 %update_desktop_database_postun
 %update_icon_cache hicolor
 
-%post  libs -p /sbin/ldconfig
-%postun        libs -p /sbin/ldconfig
-
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog MAINTAINERS NEWS README
@@ -207,6 +188,7 @@ 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/libbluetooth.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
@@ -217,7 +199,6 @@ rm -rf $RPM_BUILD_ROOT
 %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
 %attr(755,root,root) %{_libdir}/control-center-1/panels/libpower.so
 %attr(755,root,root) %{_libdir}/control-center-1/panels/libprinters.so
 %attr(755,root,root) %{_libdir}/control-center-1/panels/libscreen.so
@@ -226,6 +207,7 @@ rm -rf $RPM_BUILD_ROOT
 %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}/polkit-1/actions/org.gnome.controlcenter.datetime.policy
 %{_datadir}/gnome-control-center
 %{_datadir}/sounds/gnome
 %{_datadir}/desktop-directories/*.directory
@@ -234,12 +216,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_desktopdir}/*.desktop
 %{_pixmapsdir}/faces
 
-%files libs
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libgnome-control-center.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgnome-control-center.so.1
-
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libgnome-control-center.so
 %{_npkgconfigdir}/gnome-keybindings.pc