summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--EXCEPTIONS12
-rw-r--r--Makefile.am2
-rw-r--r--glusterfs.spec.in2
3 files changed, 12 insertions, 4 deletions
diff --git a/EXCEPTIONS b/EXCEPTIONS
index a5478de07..dec200e4d 100644
--- a/EXCEPTIONS
+++ b/EXCEPTIONS
@@ -3,5 +3,13 @@ GlusterFS exceptions to GNU GPL
Copyright © 2011 Gluster, Inc.
-Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
-Gluster has developed the APIs and the libraries in its code to enable third parties to their software to link to GlusterFS software without requiring that such third party software be licensed under the GNU General Public License version 3 ("GNU GPL3"). Consequently, Gluster does not view the linking of third party software to GlusterFS through APIs or the libraries as requiring the combination to be distributed under GNU GPLv3. However, your reproduction, modification or other use of the GlusterFS software alone must comply with the terms of GNU GPL3.
+Everyone is permitted to copy and distribute verbatim copies of this license
+document, but changing it is not allowed.
+Gluster has developed the APIs and the libraries in its code to enable third
+parties to link their software to GlusterFS software without requiring that
+such third party software be licensed under the GNU General Public License
+version 3 ("GNU GPL3"). Consequently, Gluster does not view the linking of
+third party software to GlusterFS through APIs or the libraries as requiring
+the combination to be distributed under GNU GPLv3. However, your reproduction,
+modification or other use of the GlusterFS software alone must comply with the
+terms of GNU GPL3.
diff --git a/Makefile.am b/Makefile.am
index 85e0a13f1..6a5bc0251 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-EXTRA_DIST = autogen.sh COPYING INSTALL README AUTHORS THANKS NEWS glusterfs.spec
+EXTRA_DIST = autogen.sh COPYING INSTALL README AUTHORS THANKS NEWS EXCEPTIONS glusterfs.spec
SUBDIRS = argp-standalone libglusterfs rpc xlators glusterfsd $(FUSERMOUNT_SUBDIR) doc extras cli
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
index d01e87e34..6815ccc86 100644
--- a/glusterfs.spec.in
+++ b/glusterfs.spec.in
@@ -202,7 +202,7 @@ fi
%files core
%defattr(-,root,root)
-%doc AUTHORS ChangeLog COPYING INSTALL NEWS README THANKS
+%doc AUTHORS ChangeLog COPYING INSTALL NEWS README THANKS EXCEPTIONS
%doc %{_datadir}/doc/glusterfs
%if 0%{?_with_fusermount:1}
%{_bindir}/fusermount-glusterfs