packages: gnome-control-center/gnome-control-center.spec - updated to 3.4.0...
kiesiu
kiesiu at pld-linux.org
Wed Mar 28 09:29:31 CEST 2012
Author: kiesiu Date: Wed Mar 28 07:29:31 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 3.4.0; merged from DEVEL
- added systemd bcond (off by default)
---- Files affected:
packages/gnome-control-center:
gnome-control-center.spec (1.59 -> 1.60)
---- Diffs:
================================================================
Index: packages/gnome-control-center/gnome-control-center.spec
diff -u packages/gnome-control-center/gnome-control-center.spec:1.59 packages/gnome-control-center/gnome-control-center.spec:1.60
--- packages/gnome-control-center/gnome-control-center.spec:1.59 Sun Nov 13 21:26:39 2011
+++ packages/gnome-control-center/gnome-control-center.spec Wed Mar 28 09:29:26 2012
@@ -1,4 +1,8 @@
# $Revision$, $Date$
+#
+# 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
@@ -6,40 +10,39 @@
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
@@ -49,14 +52,15 @@
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
@@ -64,13 +68,11 @@
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
@@ -79,8 +81,10 @@
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 at Latn vs. sr at latin
@@ -117,41 +121,23 @@
Цей пакет потрібний, якщо ви встановлюєте середовище 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}
@@ -167,6 +153,7 @@
--disable-silent-rules \
--disable-update-mimedb \
--with-libsocialweb \
+ %{__enable_disable systemd systemd} \
X_EXTRA_LIBS="-lXext"
%{__make}
@@ -176,7 +163,6 @@
%{__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}
@@ -186,20 +172,15 @@
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
@@ -208,6 +189,7 @@
%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
@@ -218,7 +200,6 @@
%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
@@ -227,6 +208,7 @@
%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
@@ -235,14 +217,8 @@
%{_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
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -251,6 +227,17 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.60 2012/03/28 07:29:26 kiesiu
+- updated to 3.4.0; merged from DEVEL
+- added systemd bcond (off by default)
+
+Revision 1.59.2.2 2012/03/07 20:31:51 megabajt
+- updated to 3.3.91
+- removed territory_code.patch (fixed upstream)
+
+Revision 1.59.2.1 2012/02/24 19:26:30 megabajt
+- updated to 3.3.90
+
Revision 1.59 2011/11/13 20:26:39 kiesiu
- updated to 3.2.2
================================================================
---- CVS-web:
http://cvs.pld-linux.org/packages/gnome-control-center/gnome-control-center.spec?r1=1.59&r2=1.60
More information about the pld-cvs-commit
mailing list