[kde-settings] * Wed Aug 31 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.7-6 - put under the MIT license as agreed
Kevin Kofler
kkofler at fedoraproject.org
Wed Aug 31 17:07:40 UTC 2011
commit 8e5164ef653d424ea375e48ce76fe0a1a36c0fee
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date: Wed Aug 31 19:07:13 2011 +0200
* Wed Aug 31 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.7-6
- put under the MIT license as agreed with the other contributors
COPYING | 21 +++++++++++++++++++++
kde-settings.spec | 14 ++++++++++++--
2 files changed, 33 insertions(+), 2 deletions(-)
---
diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..3e7de2b
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,21 @@
+Copyright (C) 2006-2011 Fedora KDE SIG
+(Rex Dieter, Than Ngo, Kevin Kofler, Jaroslav Řezník)
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/kde-settings.spec b/kde-settings.spec
index 7465a19..18b858d 100644
--- a/kde-settings.spec
+++ b/kde-settings.spec
@@ -6,13 +6,14 @@ Summary: Config files for kde
Name: kde-settings
Version: 4.7
#Release: %{rel}%{?dist}
-Release: 5%{?dist}
+Release: 6%{?dist}
Group: System Environment/Base
-License: Public Domain
+License: MIT
Url: http://fedorahosted.org/kde-settings
Source0: https://fedorahosted.org/releases/k/d/kde-settings/%{name}-%{version}-%{rel}.tar.bz2
Source1: kde-settings-plasma-rpm-20110821.tar.xz
+Source2: COPYING
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -47,6 +48,8 @@ Requires(post): kde4-macros(api) = %{_kde4_macros_api}
%package pulseaudio
Summary: Enable pulseaudio support in KDE
Group: System Environment/Base
+# nothing here to license
+License: Public Domain
Requires: %{name} = %{version}-%{release}
Requires: pulseaudio
Requires: pulseaudio-module-x11
@@ -74,6 +77,8 @@ mkdir -p %{buildroot}{%{_datadir}/config,%{_sysconfdir}/kde/kdm}
tar cpf - . | tar --directory %{buildroot} -xvpf -
+cp -p %{SOURCE2} .
+
# kdebase/kdm symlink
rm -rf %{buildroot}%{_datadir}/config/kdm
ln -sf ../../../etc/kde/kdm %{buildroot}%{_datadir}/config/kdm
@@ -105,6 +110,7 @@ rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
+%doc COPYING
%config(noreplace) %{_sysconfdir}/profile.d/kde.*
%{_sysconfdir}/kde/env/env.sh
%{_sysconfdir}/kde/env/gpg-agent*.sh
@@ -125,6 +131,7 @@ rm -rf %{buildroot}
%files kdm
%defattr(-,root,root,-)
+%doc COPYING
%config(noreplace) /etc/pam.d/kdm*
# compat symlink
%{_datadir}/config/kdm
@@ -150,6 +157,9 @@ rm -rf %{buildroot}
%changelog
+* Wed Aug 31 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.7-6
+- put under the MIT license as agreed with the other contributors
+
* Sun Aug 21 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.7-5
- fix the RPM dependency generators to also accept ServiceTypes= (#732271)
More information about the scm-commits
mailing list