Hello community,
here is the log from the commit of package gconf2 for openSUSE:Factory
checked in at Mon Aug 17 14:30:36 CEST 2009.
--------
--- GNOME/gconf2/gconf2.changes 2009-05-18 01:36:55.000000000 +0200
+++ /mounts/work_src_done/STABLE/gconf2/gconf2.changes 2009-08-13 19:41:48.000000000 +0200
@@ -1,0 +2,9 @@
+Tue Aug 11 22:19:10 CEST 2009 - dominique-obs@leuenberger.net
+
+- Add gconf2-polkit.patch to build against polkit1.
+- Add gnome-common and call to gnome-autogen.sh.
+- Adjust gconf2-pk-default-path.patch because of
+ gconf2-polkit.patch.
+- Replace PolicyKit-devel with polkit-devel BuildRequires.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
gconf2-polkit.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gconf2.spec ++++++
--- /var/tmp/diff_new_pack.ug6OYZ/_old 2009-08-17 14:28:31.000000000 +0200
+++ /var/tmp/diff_new_pack.ug6OYZ/_new 2009-08-17 14:28:31.000000000 +0200
@@ -19,26 +19,29 @@
Name: gconf2
-BuildRequires: PolicyKit-devel
BuildRequires: dbus-1-glib-devel
+BuildRequires: gnome-common
BuildRequires: gtk2-devel
BuildRequires: intltool
BuildRequires: libidl-devel
BuildRequires: libxml2-devel
BuildRequires: orbit2-devel
+BuildRequires: polkit-devel
BuildRequires: update-desktop-files
Url: http://www.gnome.org/
%define _name GConf
-License: GPL v2 or later; LGPL v2.1 or later
+License: GPL v2 or later ; LGPL v2.1 or later
Group: System/GUI/GNOME
Version: 2.26.2
-Release: 1
+Release: 2
Summary: The GNOME 2.x Desktop Configuration Database System
Source: ftp://ftp.gnome.org/pub/gnome/sources/GConf/2.20/%{_name}-%{version}.tar.bz2
# Generic tool, not upstreamed:
Source1: gconftool-rebuild
# RPM specific macros:
Source2: macros.gconf2
+# PATCH-FEATURE-UPSTREAM gconf2-polkit.patch bgo#585303 -- Port to polkit1
+Patch0: gconf2-polkit.patch
# PATCH-FIX-OPENSUSE gconf2-gconftool-reload.patch -- Include sabayon paths to the default configuration. Simplifies scriptlets:
Patch2: gconf2-gconftool-reload.patch
# PATCH-FIX-OPENSUSE gconf2-schemas-path.patch
@@ -54,14 +57,8 @@
GConf, the GNOME configuration database. It is used by the GNOME 2.x
Desktop platform.
-
-
-Authors:
---------
- Havoc Pennington
-
%package devel
-License: GPL v2 or later; LGPL v2.1 or later
+License: GPL v2 or later ; LGPL v2.1 or later
Summary: Include files and libraries mandatory for development
Group: Development/Libraries/GNOME
Requires: %{name} = %{version}
@@ -75,15 +72,10 @@
This package contains all necessary include files and libraries needed
to develop applications that require these.
-
-
-Authors:
---------
- Havoc Pennington
-
%lang_package
%prep
%setup -q -n %{_name}-%{version}
+%patch0 -p1
%patch2 -p0
%patch3
%patch4
@@ -91,7 +83,7 @@
cp -a %{S:1} %{S:2} .
%build
-#autoreconf -f -i
+NOCONFIGURE=1 gnome-autogen.sh
%configure --with-pic\
--libexecdir=%{_prefix}/lib/GConf/2\
--disable-static
@@ -156,7 +148,7 @@
%defattr(-, root, root)
%doc AUTHORS COPYING ChangeLog NEWS README
%{_bindir}/*
-%{_datadir}/PolicyKit/policy/*.policy
+%{_datadir}/polkit-1/actions/*.policy
%{_datadir}/dbus-1/services/*
%{_datadir}/dbus-1/system-services/*
%{_datadir}/sgml/gconf
++++++ gconf2-pk-default-path.patch ++++++
--- /var/tmp/diff_new_pack.ug6OYZ/_old 2009-08-17 14:28:31.000000000 +0200
+++ /var/tmp/diff_new_pack.ug6OYZ/_new 2009-08-17 14:28:31.000000000 +0200
@@ -1,13 +1,12 @@
-Index: GConf-2.25.1/defaults/gconf-defaults.c
-===================================================================
---- GConf-2.25.1.orig/defaults/gconf-defaults.c
-+++ GConf-2.25.1/defaults/gconf-defaults.c
-@@ -507,7 +507,7 @@ do_copy (GConfDefaults *mechani
+diff -pur GConf-2.26.2/defaults/gconf-defaults.c GConf-2.26.2.patched/defaults/gconf-defaults.c
+--- GConf-2.26.2/defaults/gconf-defaults.c 2009-08-11 22:00:25.000000000 +0200
++++ GConf-2.26.2.patched/defaults/gconf-defaults.c 2009-08-11 22:01:13.000000000 +0200
+@@ -797,7 +797,7 @@ do_copy (GConfDefaults *mechani
else {
- annotation_key = "org.gnome.gconf.defaults.set-system.prefix";
- default_action = "org.gnome.gconf.defaults.set-system";
-- dest_address = "xml:merged:" SYSGCONFDIR "/gconf.xml.system";
-+ dest_address = "xml:merged:" SYSGCONFDIR "/gconf.xml.defaults";
+ adata->annotation_key = "org.gnome.gconf.defaults.set-system.prefix";
+ adata->default_action = "org.gnome.gconf.defaults.set-system";
+- cdata->dest_address = "xml:merged:" SYSGCONFDIR "/gconf.xml.system";
++ cdata->dest_address = "xml:merged:" SYSGCONFDIR "/gconf.xml.defaults";
}
- for (i = 0; includes[i]; i++) {
+ polkit_authority_enumerate_actions (mechanism->priv->auth,
++++++ gconf2-polkit.patch ++++++
++++ 1340 lines (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org