From f105aa2aa15ede6ebee301979c174d87a578d21f350b113263826599591e4951 Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Wed, 25 Jan 2012 09:32:26 +0000
Subject: [PATCH 1/2] Accepting request 101454 from
 home:babelworx:ldig:branches:Base:System

license update: AFL-2.1 or GPL-2.0+
License is a dual license choice of either Academic Free License 2.1 or GNU GPL 2+. This is the SPDX format for that license

OBS-URL: https://build.opensuse.org/request/show/101454
OBS-URL: https://build.opensuse.org/package/show/Base:System/dbus-1-glib?expand=0&rev=31
---
 dbus-1-glib.changes | 7 +++++++
 dbus-1-glib.spec    | 6 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/dbus-1-glib.changes b/dbus-1-glib.changes
index 547622a..541456f 100644
--- a/dbus-1-glib.changes
+++ b/dbus-1-glib.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jan 25 09:17:54 UTC 2012 - cfarrell@suse.com
+
+- license update: AFL-2.1 or GPL-2.0+
+  License is a dual license choice of either Academic Free License 2.1 or
+  GNU GPL 2+. This is the SPDX format for that license
+
 -------------------------------------------------------------------
 Wed Oct 12 19:56:00 UTC 2011 - vuntz@opensuse.org
 
diff --git a/dbus-1-glib.spec b/dbus-1-glib.spec
index 276139a..10494f1 100644
--- a/dbus-1-glib.spec
+++ b/dbus-1-glib.spec
@@ -19,7 +19,7 @@
 
 Name:           dbus-1-glib
 Url:            http://dbus.freedesktop.org/
-License:        Other uncritical OpenSource License
+License:        AFL-2.1 or GPL-2.0+
 Group:          Development/Libraries/Other
 Version:        0.98
 Release:        1
@@ -37,7 +37,7 @@ Obsoletes:      dbus-1-glib-64bit
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %package -n dbus-1-glib-devel
-License:        Other uncritical OpenSource License
+License:        AFL-2.1 or GPL-2.0+
 Summary:        Developer package for D-Bus/GLib bindings
 Requires:       dbus-1 >= %( echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' dbus-1`)
 Requires:       dbus-1-devel >= %( echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' dbus-1-devel`)
@@ -46,7 +46,7 @@ Requires:       glib2-devel
 Group:          Development/Libraries/Other
 
 %package -n dbus-1-glib-doc
-License:        GPLv2+ ; Other uncritical OpenSource License
+License:        AFL-2.1 or GPL-2.0+
 Summary:        Documentation for the D-Bus/GLib bindings
 Group:          Documentation/HTML
 %if 0%{?suse_version} >= 1120

From 703fbbb9f043c625562815646bd518ba530f9543c1effac9cdffac6a7a778fdd Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Wed, 25 Jan 2012 09:33:13 +0000
Subject: [PATCH 2/2] OBS-URL:
 https://build.opensuse.org/package/show/Base:System/dbus-1-glib?expand=0&rev=32

---
 dbus-1-glib.spec | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/dbus-1-glib.spec b/dbus-1-glib.spec
index 10494f1..f64b371 100644
--- a/dbus-1-glib.spec
+++ b/dbus-1-glib.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package dbus-1-glib
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,18 +15,18 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
-
 Name:           dbus-1-glib
 Url:            http://dbus.freedesktop.org/
+Version:        0.98
+Release:        0
+Summary:        GLib-based library for using D-Bus
 License:        AFL-2.1 or GPL-2.0+
 Group:          Development/Libraries/Other
-Version:        0.98
-Release:        1
-Summary:        GLib-based library for using D-Bus
 Source0:        http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-%{version}.tar.gz
 Source1:        baselibs.conf
-BuildRequires:  dbus-1-devel glib2-devel libexpat-devel
+BuildRequires:  dbus-1-devel
+BuildRequires:  glib2-devel
+BuildRequires:  libexpat-devel
 BuildRequires:  libselinux-devel
 Requires:       dbus-1 >= %( echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' dbus-1`)
 # bug437293
@@ -37,16 +37,14 @@ Obsoletes:      dbus-1-glib-64bit
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %package -n dbus-1-glib-devel
-License:        AFL-2.1 or GPL-2.0+
 Summary:        Developer package for D-Bus/GLib bindings
+Group:          Development/Libraries/Other
 Requires:       dbus-1 >= %( echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' dbus-1`)
 Requires:       dbus-1-devel >= %( echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' dbus-1-devel`)
 Requires:       dbus-1-glib = %{version}
 Requires:       glib2-devel
-Group:          Development/Libraries/Other
 
 %package -n dbus-1-glib-doc
-License:        AFL-2.1 or GPL-2.0+
 Summary:        Documentation for the D-Bus/GLib bindings
 Group:          Documentation/HTML
 %if 0%{?suse_version} >= 1120