summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--COPYING.MIT23
-rw-r--r--packaging/libgpg-error.spec5
2 files changed, 26 insertions, 2 deletions
diff --git a/COPYING.MIT b/COPYING.MIT
new file mode 100644
index 0000000..81e8a23
--- /dev/null
+++ b/COPYING.MIT
@@ -0,0 +1,23 @@
+Copyright (C) 1994 X Consortium
+
+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
+X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of the X Consortium shall not
+be used in advertising or otherwise to promote the sale, use or other deal-
+ings in this Software without prior written authorization from the X Consor-
+tium.
diff --git a/packaging/libgpg-error.spec b/packaging/libgpg-error.spec
index 8fc485e..5fa599a 100644
--- a/packaging/libgpg-error.spec
+++ b/packaging/libgpg-error.spec
@@ -1,7 +1,7 @@
Name: libgpg-error
Version: 1.13
Release: 0
-License: GPL-2.0+ ; LGPL-2.1+
+License: LGPL-2.1+ and GPL-2.0+
Summary: Library That Defines Common Error Values for All GnuPG Components
Url: http://www.gnupg.org/
Group: Security/Crypto Libraries
@@ -17,7 +17,7 @@ components. Among these are GPG, GPGSM, GPGME, GPG-Agent, libgcrypt,
pinentry, SmartCard Daemon, and possibly more in the future.
%package devel
-License: GPL-2.0+ ; LGPL-2.1+ ; MIT
+License: LGPL-2.1+ and GPL-2.0+ and MIT
Summary: Development package for libgpg-error
Group: Development/Libraries
Requires: glibc-devel
@@ -56,6 +56,7 @@ rm -r %{buildroot}%{_datadir}/common-lisp
%files devel
%manifest %{name}.manifest
%defattr(-,root,root)
+%license COPYING.MIT
%{_datadir}/aclocal/gpg-error.m4
%{_includedir}/*
%{_bindir}/*