[dbus/f20] Correct license description for multiple licenses

[David King]

commit 207f754b8abd3ce57be7217c8bd0beace57a0685
Author: David King <amigadave at amigadave.com>
Date:   Wed Dec 3 14:54:58 2014 +0000

    Correct license description for multiple licenses

 dbus.spec |   27 +++++++++++++++------------
 1 files changed, 15 insertions(+), 12 deletions(-)
---
diff --git a/dbus.spec b/dbus.spec
index 10afcb2..9ba33f2 100644
--- a/dbus.spec
+++ b/dbus.spec
@@ -14,18 +14,20 @@
 
 %define dbus_common_config_opts --enable-libaudit --enable-selinux=yes --with-init-scripts=redhat --with-system-pid-file=%{_localstatedir}/run/messagebus.pid --with-dbus-user=dbus --libdir=/%{_lib} --bindir=/bin --sysconfdir=/etc --exec-prefix=/ --libexecdir=/%{_lib}/dbus-1 --with-systemdsystemunitdir=/lib/systemd/system/ --docdir=%{_pkgdocdir} --enable-doxygen-docs --enable-xml-docs --disable-silent-rules --disable-Werror
 
-Summary: D-BUS message bus
-Name: dbus
-Epoch: 1
+Name:    dbus
+Epoch:   1
 Version: 1.6.28
 Release: 2%{?dist}
-URL: http://www.freedesktop.org/software/dbus/
-#VCS: git:git://git.freedesktop.org/git/dbus/dbus
-Source0: http://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz
-Source2: 00-start-message-bus.sh
-License: GPLv2+ or AFL
-Group: System Environment/Libraries
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Summary: D-BUS message bus
+
+Group:   System Environment/Libraries
+# The effective license of the majority of the package, including the shared
+# library, is "GPL-2+ or AFL-2.1". Certain utilities are "GPL-2+" only.
+License: (GPLv2+ or AFL) and GPLv2+
+URL:     http://www.freedesktop.org/Software/dbus/
+#VCS:    git:git://git.freedesktop.org/git/dbus/dbus
+Source0: http://dbus.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz
+Source1: 00-start-message-bus.sh
 
 BuildRequires: libtool
 BuildRequires: expat-devel >= %{expat_version}
@@ -132,7 +134,7 @@ rm -rf %{buildroot}/%{_lib}/dbus-1.0
 rm -f %{buildroot}/%{_lib}/*.a
 rm -f %{buildroot}/%{_lib}/*.la
 
-install -D -m755 %{SOURCE2} %{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/00-start-message-bus.sh
+install -Dp -m755 %{SOURCE1} %{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/00-start-message-bus.sh
 
 mkdir -p %{buildroot}%{_datadir}/dbus-1/interfaces
 
@@ -262,7 +264,8 @@ fi
 %{_includedir}/*
 
 %changelog
-* Fri Jul 11 2014 Tom Callaway <spot at fedoraproject.org> - 1:1.6.28-2
+* Wed Dec 03 2014 David King <amigadave at amigadave.com> - 1:1.6.28-2
+- Correct license description for multiple licenses
 - fix license handling
 - BR systemd-devel
 - Adapt to unversioned docdirs; don't ship all docs in main package.