packages: gnome-control-center/gnome-control-center.spec - updated to 3.0.0...
megabajt
megabajt at pld-linux.org
Tue Apr 5 23:05:06 CEST 2011
Author: megabajt Date: Tue Apr 5 21:05:06 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 3.0.0; merged from DEVEL
---- Files affected:
packages/gnome-control-center:
gnome-control-center.spec (1.45 -> 1.46)
---- Diffs:
================================================================
Index: packages/gnome-control-center/gnome-control-center.spec
diff -u packages/gnome-control-center/gnome-control-center.spec:1.45 packages/gnome-control-center/gnome-control-center.spec:1.46
--- packages/gnome-control-center/gnome-control-center.spec:1.45 Sun Mar 27 14:27:05 2011
+++ packages/gnome-control-center/gnome-control-center.spec Tue Apr 5 23:05:01 2011
@@ -6,63 +6,76 @@
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 at Latn vs. sr at latin
Conflicts: glibc-misc < 6:2.7
@@ -102,7 +115,6 @@
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
@@ -117,8 +129,9 @@
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
@@ -128,20 +141,6 @@
%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
@@ -150,7 +149,7 @@
%build
%{__gnome_doc_prepare}
%{__gnome_doc_common}
-%{__glib_gettextize}
+%{__gettextize}
%{__intltoolize}
%{__libtoolize}
%{__aclocal}
@@ -161,8 +160,7 @@
--disable-schemas-install \
--disable-silent-rules \
--disable-update-mimedb \
- --disable-update-desktop \
- --enable-aboutme \
+ --with-libsocialweb \
X_EXTRA_LIBS="-lXext"
%{__make}
@@ -174,7 +172,10 @@
%{__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
@@ -182,8 +183,6 @@
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
@@ -191,8 +190,6 @@
%update_icon_cache hicolor
%preun
-%gconf_schema_uninstall control-center.schemas
-%gconf_schema_uninstall fontilus.schemas
%gconf_schema_uninstall gnome-control-center.schemas
%postun
@@ -207,55 +204,47 @@
%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
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -263,12 +252,71 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.46 2011/04/05 21:05:01 megabajt
+- updated to 3.0.0; merged from DEVEL
+
+Revision 1.43.2.17 2011/03/30 09:57:23 kiesiu
+- up to 2.91.93
+- faces dir was moved from GDM to gnome-control-center
+
+Revision 1.43.2.16 2011/03/28 18:53:16 patrys
+- really get rid of gnome-desktop3
+
+Revision 1.43.2.15 2011/03/28 14:20:08 wiget
+- rename gnome-desktop3 to gnome-desktop
+
Revision 1.45 2011/03/27 12:27:05 qboosh
- en at shaw locale is now supported (via LANGUAGE)
- __rm macro WITHOUT -f, so it actually makes sense)
+Revision 1.43.2.14 2011/03/21 17:19:17 megabajt
+- updated to 2.91.92
+
+Revision 1.43.2.13 2011/03/16 19:58:41 megabajt
+- more Rs (for user accounts dialog)
+
+Revision 1.43.2.12 2011/03/14 22:09:15 megabajt
+- fixed path to locale-archive on x86_64 (system-locale-archive-path.patch)
+
+Revision 1.43.2.11 2011/03/12 15:18:18 patrys
+- R: newer g-s-d
+
+Revision 1.43.2.10 2011/03/12 13:35:01 patrys
+- reenable NM
+
+Revision 1.43.2.9 2011/03/10 19:58:31 wiget
+- BR cheese-devel
+- fix building without localedb-src
+
+Revision 1.43.2.8 2011/03/09 17:33:53 megabajt
+- updated to 2.91.91
+
+Revision 1.43.2.7 2011/02/26 17:49:41 megabajt
+- updated deps
+- removed no locale (nb already exists)
+
+Revision 1.43.2.6 2011/02/26 13:21:55 wiget
+- 2.91.90
+
+Revision 1.43.2.5 2011/02/12 23:47:26 wiget
+- %files cleanup
+
+Revision 1.43.2.4 2011/02/12 23:46:53 wiget
+- updated to 2.91.6
+- BR stable gtk+
+
Revision 1.44 2011/02/04 18:23:47 wiget
- Requires(post,postun): gtk-update-icon-cache
+
+Revision 1.43.2.3 2010/12/02 21:45:19 wiget
+- 2.91.3.1
+- dropped all patches (obsoleted)
+
+Revision 1.43.2.2 2010/11/22 15:00:54 megabajt
+- revised deps
+
+Revision 1.43.2.1 2010/11/21 17:39:01 wiget
+- 2.91.2
Revision 1.43 2010/11/20 11:51:31 caleb
- Up to 2.32.1
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gnome-control-center/gnome-control-center.spec?r1=1.45&r2=1.46&f=u
More information about the pld-cvs-commit
mailing list