- updated to 3.0.0; merged from DEVEL

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

diff --git a/gnome-control-center.spec b/gnome-control-center.spec
index ae681b2e40e2a49353875a7bad34657067ed3403..a60ce5d4cba916a4fb19e8294bcc67cebdf95f4b 100644 (file)
--- a/gnome-control-center.spec
+++ b/gnome-control-center.spec
@@ -5,63 +5,76 @@ 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:       2.32.1
-Release:       2
+Version:       3.0.0
+Release:       1
 Epoch:         1
 License:       GPL v2+
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-control-center/2.32/%{name}-%{version}.tar.bz2
-# Source0-md5: b4e8ab5c7556ae07addbfcfb4fa2f761
-Patch0:                no_update_desktop.patch
-Patch1:                default-apps-chrome-chromium.patch
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-control-center/3.0/%{name}-%{version}.tar.bz2
+# Source0-md5: 696bf1bf5677356523348ec33110b2f7
+Patch0:                locale.patch
+# PLD-specific patches
+Patch1:                system-locale-archive-path.patch
 URL:           http://www.gnome.org/
 BuildRequires: GConf2-devel >= 2.26.0
+BuildRequires: NetworkManager-devel >= 0.8.996
 BuildRequires: autoconf
-BuildRequires: automake >= 1:1.9
+BuildRequires: automake >= 1:1.10
+BuildRequires: cheese-devel >= 3.0.0
+BuildRequires: cups-devel >= 1.4
 BuildRequires: dbus-glib-devel >= 0.74
 BuildRequires: docbook-dtd412-xml
-BuildRequires: evolution-data-server-devel >= 2.24.0
-BuildRequires: gettext-devel
-BuildRequires: glib2-devel >= 1:2.20.0
+BuildRequires: gdk-pixbuf2-devel >= 2.23.0
+BuildRequires: gettext-devel >= 0.17
+BuildRequires: glib2-devel >= 1:2.28.0
 BuildRequires: gnome-common >= 2.24.0
-BuildRequires: gnome-desktop-devel >= 2.30.0
+BuildRequires: gnome-desktop-devel >= 3.0.0
 BuildRequires: gnome-doc-utils >= 0.12.1
-BuildRequires: gnome-menus-devel >= 2.30.0
-BuildRequires: gnome-settings-daemon-devel >= 2.26.0
-BuildRequires: gtk+2-devel >= 2:2.18.0
-BuildRequires: intltool >= 0.40.0
-BuildRequires: libcanberra-gtk-devel >= 0.4
-BuildRequires: libgnomekbd-devel >= 2.32.0
-BuildRequires: librsvg-devel >= 2.22.0
-BuildRequires: libtool
-BuildRequires: libunique-devel >= 1.0.0
-BuildRequires: libxklavier-devel >= 4.0
+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: gstreamer-devel
+BuildRequires: gtk+3-devel >= 3.0.2
+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: libsocialweb-devel
+BuildRequires: libtool >= 2:2.2
+BuildRequires: libxklavier-devel >= 5.1
 BuildRequires: libxml2-devel >= 1:2.6.31
-BuildRequires: metacity-devel >= 2:2.26.0
 BuildRequires: pkgconfig
+BuildRequires: polkit-devel >= 0.97
+BuildRequires: pulseaudio-devel >= 0.9.16
 BuildRequires: rpmbuild(find_lang) >= 1.23
 BuildRequires: rpmbuild(macros) >= 1.311
 BuildRequires: scrollkeeper
-BuildRequires: xorg-lib-libXScrnSaver-devel
+BuildRequires: upower-devel >= 0.9.1
 BuildRequires: xorg-lib-libXxf86misc-devel
 BuildRequires: xorg-lib-libxkbfile-devel
 Requires(post,postun): desktop-file-utils
 Requires(post,postun): gtk-update-icon-cache
-Requires(post,postun): hicolor-icon-theme
 Requires(post,postun): scrollkeeper
 Requires(post,postun): shared-mime-info
 Requires(post,preun):  GConf2
 Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
+Requires:      accountsservice
 Requires:      desktop-file-utils
-Requires:      gnome-settings-daemon >= 2.26.0
-Requires:      libgnomekbd >= 2.32.0
+Requires:      gnome-settings-daemon >= 1:3.0.0
+Requires:      gsettings-desktop-schemas >= 3.0.0
+Requires:      hicolor-icon-theme
+Requires:      libgnomekbd >= 3.0.0
+Suggests:      apg
 Suggests:      libcanberra-gnome
-Suggests:      mousetweaks >= 2.24.0
+Suggests:      mousetweaks >= 3.0.0
 Provides:      control-center = %{epoch}:%{version}-%{release}
 Obsoletes:     acme
 Obsoletes:     control-center
 Obsoletes:     fontilus
 Obsoletes:     gnome
+Obsoletes:     gnome-media-volume-control
 Obsoletes:     themus
 # sr@Latn vs. sr@latin
 Conflicts:     glibc-misc < 6:2.7
@@ -101,7 +114,6 @@ GNOME вашей системы (такие вещи как фон рабоче
 Summary:       GNOME Control Center gnome-window-settings library
 Summary(pl.UTF-8):     Biblioteka Control Center gnome-window-settings
 Group:         X11/Libraries
-Requires:      gnome-desktop-libs >= 2.30.0
 Provides:      control-center-libs = %{epoch}:%{version}-%{release}
 Obsoletes:     control-center-libs
 
@@ -116,8 +128,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:      gnome-desktop-devel >= 2.30.0
-Requires:      gtk+2-devel >= 2:2.18.0
+Requires:      glib2-devel >= 1:2.28.0
+Requires:      gnome-desktop-devel >= 3.0.0
+Requires:      gtk+3-devel >= 3.0.2
 Provides:      control-center-devel = %{epoch}:%{version}-%{release}
 Obsoletes:     control-center-devel
 
@@ -127,20 +140,6 @@ GNOME Control-Center header files.
 %description devel -l pl.UTF-8
 Pliki nagłówkowe bibliotek GNOME Control Center.
 
-%package static
-Summary:       GNOME Control Center static libraries
-Summary(pl.UTF-8):     Statyczne biblioteki GNOME Control Center
-Group:         X11/Development/Libraries
-Requires:      %{name}-devel = %{epoch}:%{version}-%{release}
-Provides:      control-center-static = %{epoch}:%{version}-%{release}
-Obsoletes:     control-center-static
-
-%description static
-GNOME Control Center static libraries.
-
-%description static -l pl.UTF-8
-Statyczne biblioteki GNOME Control Center.
-
 %prep
 %setup -q
 %patch0 -p1
@@ -149,7 +148,7 @@ Statyczne biblioteki GNOME Control Center.
 %build
 %{__gnome_doc_prepare}
 %{__gnome_doc_common}
-%{__glib_gettextize}
+%{__gettextize}
 %{__intltoolize}
 %{__libtoolize}
 %{__aclocal}
@@ -160,8 +159,7 @@ Statyczne biblioteki GNOME Control Center.
        --disable-schemas-install \
        --disable-silent-rules \
        --disable-update-mimedb \
-       --disable-update-desktop \
-       --enable-aboutme \
+       --with-libsocialweb \
        X_EXTRA_LIBS="-lXext"
 %{__make}
 
@@ -173,7 +171,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
 # no static modules - shut up check-files
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/window-manager-settings/*.{a,la}
+%{__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
 
@@ -181,8 +182,6 @@ rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%gconf_schema_install control-center.schemas
-%gconf_schema_install fontilus.schemas
 %gconf_schema_install gnome-control-center.schemas
 %scrollkeeper_update_post
 %update_mime_database
@@ -190,8 +189,6 @@ rm -rf $RPM_BUILD_ROOT
 %update_icon_cache hicolor
 
 %preun
-%gconf_schema_uninstall        control-center.schemas
-%gconf_schema_uninstall fontilus.schemas
 %gconf_schema_uninstall gnome-control-center.schemas
 
 %postun
@@ -206,52 +203,44 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog MAINTAINERS NEWS README
-%attr(755,root,root) %{_bindir}/gnome-about-me
-%attr(755,root,root) %{_bindir}/gnome-appearance-properties
-%attr(755,root,root) %{_bindir}/gnome-at-mobility
-%attr(755,root,root) %{_bindir}/gnome-at-properties
-%attr(755,root,root) %{_bindir}/gnome-at-visual
 %attr(755,root,root) %{_bindir}/gnome-control-center
-%attr(755,root,root) %{_bindir}/gnome-default-applications-properties
-%attr(755,root,root) %{_bindir}/gnome-display-properties
-%attr(755,root,root) %{_bindir}/gnome-font-viewer
-%attr(755,root,root) %{_bindir}/gnome-keybinding-properties
-%attr(755,root,root) %{_bindir}/gnome-keyboard-properties
-%attr(755,root,root) %{_bindir}/gnome-mouse-properties
-%attr(755,root,root) %{_bindir}/gnome-network-properties
-%attr(755,root,root) %{_bindir}/gnome-thumbnail-font
-%attr(755,root,root) %{_bindir}/gnome-typing-monitor
-%attr(755,root,root) %{_bindir}/gnome-window-properties
-%attr(755,root,root) %{_sbindir}/gnome-display-properties-install-systemwide
-%dir %{_libdir}/window-manager-settings
-%attr(755,root,root) %{_libdir}/window-manager-settings/libmetacity.so
-%{_sysconfdir}/gconf/schemas/control-center.schemas
-%{_sysconfdir}/gconf/schemas/fontilus.schemas
+%attr(755,root,root) %{_bindir}/gnome-sound-applet
+%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/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/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
+%attr(755,root,root) %{_libdir}/control-center-1/panels/libuniversal-access.so
+%attr(755,root,root) %{_libdir}/control-center-1/panels/libuser-accounts.so
 %{_sysconfdir}/gconf/schemas/gnome-control-center.schemas
-%{_sysconfdir}/xdg/autostart/gnome-at-session.desktop
+%{_sysconfdir}/xdg/autostart/gnome-sound-applet.desktop
 %{_sysconfdir}/xdg/menus/gnomecc.menu
 %{_datadir}/gnome-control-center
+%{_datadir}/sounds/gnome
 %{_datadir}/desktop-directories/*.directory
-%{_datadir}/gnome/cursor-fonts
-%{_datadir}/mime/packages/gnome-theme-package.xml
-%{_datadir}/polkit-1/actions/org.gnome.randr.policy
 %{_iconsdir}/hicolor/*/*/*.png
 %{_iconsdir}/hicolor/*/*/*.svg
 %{_desktopdir}/*.desktop
+%{_pixmapsdir}/faces
 
 %files libs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libgnome-window-settings.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgnome-window-settings.so.1
+%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-window-settings.so
-%{_includedir}/gnome-window-settings-2.0
-%{_pkgconfigdir}/gnome-window-settings-2.0.pc
-%{_datadir}/pkgconfig/gnome-default-applications.pc
-%{_datadir}/pkgconfig/gnome-keybindings.pc
-
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/libgnome-window-settings.a
+%attr(755,root,root) %{_libdir}/libgnome-control-center.so
+%{_includedir}/gnome-control-center-1
+%{_npkgconfigdir}/gnome-keybindings.pc
+%{_pkgconfigdir}/libgnome-control-center.pc