packages (DEVEL): gnome-control-center/default-apps-chrome-chromium.patch, ...
wiget
wiget at pld-linux.org
Sun Nov 21 18:39:06 CET 2010
Author: wiget Date: Sun Nov 21 17:39:06 2010 GMT
Module: packages Tag: DEVEL
---- Log message:
- 2.91.2
---- Files affected:
packages/gnome-control-center:
default-apps-chrome-chromium.patch (1.1 -> 1.1.2.1) , gnome-control-center.spec (1.43 -> 1.43.2.1) , gnome-desktop3.patch (NONE -> 1.1.2.1) (NEW)
---- Diffs:
================================================================
Index: packages/gnome-control-center/default-apps-chrome-chromium.patch
diff -u packages/gnome-control-center/default-apps-chrome-chromium.patch:1.1 packages/gnome-control-center/default-apps-chrome-chromium.patch:1.1.2.1
--- packages/gnome-control-center/default-apps-chrome-chromium.patch:1.1 Tue Mar 9 21:35:28 2010
+++ packages/gnome-control-center/default-apps-chrome-chromium.patch Sun Nov 21 18:39:01 2010
@@ -1,5 +1,5 @@
---- gnome-control-center-2.28.1/capplets/default-applications/gnome-default-applications.xml.in~ 2009-05-03 21:30:56.000000000 +0300
-+++ gnome-control-center-2.28.1/capplets/default-applications/gnome-default-applications.xml.in 2010-03-09 22:29:32.991354516 +0200
+--- gnome-control-center-2.28.1/panels/default-applications/gnome-default-applications.xml.in~ 2009-05-03 21:30:56.000000000 +0300
++++ gnome-control-center-2.28.1/panels/default-applications/gnome-default-applications.xml.in 2010-03-09 22:29:32.991354516 +0200
@@ -147,6 +147,22 @@
<run-in-terminal>false</run-in-terminal>
<netscape-remote>false</netscape-remote>
================================================================
Index: packages/gnome-control-center/gnome-control-center.spec
diff -u packages/gnome-control-center/gnome-control-center.spec:1.43 packages/gnome-control-center/gnome-control-center.spec:1.43.2.1
--- packages/gnome-control-center/gnome-control-center.spec:1.43 Sat Nov 20 12:51:31 2010
+++ packages/gnome-control-center/gnome-control-center.spec Sun Nov 21 18:39:01 2010
@@ -6,14 +6,14 @@
Summary(ru.UTF-8): Центр управления GNOME
Summary(uk.UTF-8): Центр керування GNOME
Name: gnome-control-center
-Version: 2.32.1
-Release: 1
+Version: 2.91.2
+Release: 0.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
+Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-control-center/2.91/%{name}-%{version}.tar.bz2
+# Source0-md5: 2bd94f06e66eba6554a1c5808dc0e1d1
+Patch0: gnome-desktop3.patch
Patch1: default-apps-chrome-chromium.patch
URL: http://www.gnome.org/
BuildRequires: GConf2-devel >= 2.26.0
@@ -25,14 +25,14 @@
BuildRequires: gettext-devel
BuildRequires: glib2-devel >= 1:2.20.0
BuildRequires: gnome-common >= 2.24.0
-BuildRequires: gnome-desktop-devel >= 2.30.0
+BuildRequires: gnome-desktop3-devel >= 2.91.2
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: gnome-settings-daemon-devel >= 2.91.0
+BuildRequires: gtk+3-devel >= 2.91.0
BuildRequires: intltool >= 0.40.0
-BuildRequires: libcanberra-gtk-devel >= 0.4
-BuildRequires: libgnomekbd-devel >= 2.32.0
+BuildRequires: libcanberra-gtk3-devel >= 0.26
+BuildRequires: libgnomekbd-devel >= 2.91.0
BuildRequires: librsvg-devel >= 2.22.0
BuildRequires: libtool
BuildRequires: libunique-devel >= 1.0.0
@@ -53,8 +53,8 @@
Requires(post,preun): GConf2
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Requires: desktop-file-utils
-Requires: gnome-settings-daemon >= 2.26.0
-Requires: libgnomekbd >= 2.32.0
+Requires: gnome-settings-daemon >= 2.91.0
+Requires: libgnomekbd >= 2.91.0
Suggests: libcanberra-gnome
Suggests: mousetweaks >= 2.24.0
Provides: control-center = %{epoch}:%{version}-%{release}
@@ -62,6 +62,7 @@
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
@@ -101,7 +102,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
@@ -116,8 +116,8 @@
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: gnome-desktop3-devel >= 2.91.2
+Requires: gtk+3-devel >= 2.91.0
Provides: control-center-devel = %{epoch}:%{version}-%{release}
Obsoletes: control-center-devel
@@ -151,7 +151,7 @@
%build
%{__gnome_doc_prepare}
%{__gnome_doc_common}
-%{__glib_gettextize}
+%{__gettextize}
%{__intltoolize}
%{__libtoolize}
%{__aclocal}
@@ -162,8 +162,7 @@
--disable-schemas-install \
--disable-silent-rules \
--disable-update-mimedb \
- --disable-update-desktop \
- --enable-aboutme \
+ --with-html-dir=%{_gtkdocdir} \
X_EXTRA_LIBS="-lXext"
%{__make}
@@ -173,9 +172,9 @@
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/*.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
# no static modules - shut up check-files
-%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/window-manager-settings/*.{a,la}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/control-center-1/panels/*.{a,la}
%find_lang %{name} --with-gnome --with-omf --all-name
@@ -208,55 +207,51 @@
%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/libdefault-applications.so
+%attr(755,root,root) %{_libdir}/control-center-1/panels/libdisplay.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/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
%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
+%{_gtkdocdir}/libgnome-control-center
+%attr(755,root,root) %{_libdir}/libgnome-control-center.so
+%{_includedir}/gnome-control-center-1
%{_datadir}/pkgconfig/gnome-default-applications.pc
%{_datadir}/pkgconfig/gnome-keybindings.pc
+%{_pkgconfigdir}/libgnome-control-center.pc
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/libgnome-window-settings.a
+#%files static
+#%defattr(644,root,root,755)
+#%{_libdir}/libgnome-window-settings.a
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -264,6 +259,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+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
================================================================
Index: packages/gnome-control-center/gnome-desktop3.patch
diff -u /dev/null packages/gnome-control-center/gnome-desktop3.patch:1.1.2.1
--- /dev/null Sun Nov 21 18:39:06 2010
+++ packages/gnome-control-center/gnome-desktop3.patch Sun Nov 21 18:39:01 2010
@@ -0,0 +1,105 @@
+commit 32f59e6df5589952233c2b573a83065b0048adb0
+Author: Andreas Proschofsky <suka at gentoo.org>
+Date: Sun Nov 14 22:12:59 2010 +0000
+
+ all: Fix build for latest gnome-desktop changes
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=634859
+
+diff --git a/panels/background/bg-pictures-source.c b/panels/background/bg-pictures-source.c
+index 43024e8..c26605c 100644
+--- a/panels/background/bg-pictures-source.c
++++ b/panels/background/bg-pictures-source.c
+@@ -26,7 +26,7 @@
+
+ #include <string.h>
+ #include <gio/gio.h>
+-#include <libgnomeui/gnome-desktop-thumbnail.h>
++#include <libgnome-desktop/gnome-desktop-thumbnail.h>
+
+
+ G_DEFINE_TYPE (BgPicturesSource, bg_pictures_source, BG_TYPE_SOURCE)
+diff --git a/panels/background/bg-wallpapers-source.c b/panels/background/bg-wallpapers-source.c
+index 1d2dfc4..cc6e81e 100644
+--- a/panels/background/bg-wallpapers-source.c
++++ b/panels/background/bg-wallpapers-source.c
+@@ -26,7 +26,7 @@
+ #include "gnome-wp-item.h"
+ #include "gnome-wp-xml.h"
+
+-#include <libgnomeui/gnome-desktop-thumbnail.h>
++#include <libgnome-desktop/gnome-desktop-thumbnail.h>
+ #include <gio/gio.h>
+
+ G_DEFINE_TYPE (BgWallpapersSource, bg_wallpapers_source, BG_TYPE_SOURCE)
+diff --git a/panels/background/gnome-wp-info.h b/panels/background/gnome-wp-info.h
+index ea1051e..b65ec79 100644
+--- a/panels/background/gnome-wp-info.h
++++ b/panels/background/gnome-wp-info.h
+@@ -22,7 +22,7 @@
+ #define _GNOME_WP_INFO_H_
+
+ #include <glib.h>
+-#include <libgnomeui/gnome-desktop-thumbnail.h>
++#include <libgnome-desktop/gnome-desktop-thumbnail.h>
+
+ typedef struct _GnomeWPInfo GnomeWPInfo;
+
+diff --git a/panels/background/gnome-wp-item.h b/panels/background/gnome-wp-item.h
+index 70f48c9..12281c8 100644
+--- a/panels/background/gnome-wp-item.h
++++ b/panels/background/gnome-wp-item.h
+@@ -21,8 +21,8 @@
+ #include <gio/gio.h>
+ #include <gdk-pixbuf/gdk-pixbuf.h>
+ #include <gtk/gtk.h>
+-#include <libgnomeui/gnome-desktop-thumbnail.h>
+-#include <libgnomeui/gnome-bg.h>
++#include <libgnome-desktop/gnome-desktop-thumbnail.h>
++#include <libgnome-desktop/gnome-bg.h>
+ #include <gsettings-desktop-schemas/gdesktop-enums.h>
+
+ #include "gnome-wp-info.h"
+diff --git a/panels/background/gnome-wp-xml.h b/panels/background/gnome-wp-xml.h
+index a08f4c4..2140a61 100644
+--- a/panels/background/gnome-wp-xml.h
++++ b/panels/background/gnome-wp-xml.h
+@@ -21,7 +21,7 @@
+ #ifndef _GNOME_WP_XML_H_
+ #define _GNOME_WP_XML_H_
+
+-#include <libgnomeui/gnome-desktop-thumbnail.h>
++#include <libgnome-desktop/gnome-desktop-thumbnail.h>
+
+ typedef struct _GnomeWpXml GnomeWpXml;
+
+diff --git a/panels/display/xrandr-capplet.c b/panels/display/xrandr-capplet.c
+index d2c1346..eeb7349 100644
+--- a/panels/display/xrandr-capplet.c
++++ b/panels/display/xrandr-capplet.c
+@@ -27,9 +27,9 @@
+ #include <gtk/gtk.h>
+ #include "scrollarea.h"
+ #define GNOME_DESKTOP_USE_UNSTABLE_API
+-#include <libgnomeui/gnome-rr.h>
+-#include <libgnomeui/gnome-rr-config.h>
+-#include <libgnomeui/gnome-rr-labeler.h>
++#include <libgnome-desktop/gnome-rr.h>
++#include <libgnome-desktop/gnome-rr-config.h>
++#include <libgnome-desktop/gnome-rr-labeler.h>
+ #include <gdk/gdkx.h>
+ #include <X11/Xlib.h>
+ #include <glib/gi18n.h>
+diff --git a/panels/user-accounts/um-photo-dialog.c b/panels/user-accounts/um-photo-dialog.c
+index 2061ebe..06a91e2 100644
+--- a/panels/user-accounts/um-photo-dialog.c
++++ b/panels/user-accounts/um-photo-dialog.c
+@@ -27,7 +27,7 @@
+ #include <glib/gi18n.h>
+ #include <gtk/gtk.h>
+ #define GNOME_DESKTOP_USE_UNSTABLE_API
+-#include <libgnomeui/gnome-desktop-thumbnail.h>
++#include <libgnome-desktop/gnome-desktop-thumbnail.h>
+
+ #ifdef HAVE_CHEESE
+ #include <cheese-avatar-chooser.h>
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gnome-control-center/default-apps-chrome-chromium.patch?r1=1.1&r2=1.1.2.1&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gnome-control-center/gnome-control-center.spec?r1=1.43&r2=1.43.2.1&f=u
More information about the pld-cvs-commit
mailing list