From: Gerd von Egidy <gerd.von.egidy@intra2net.com>
Date: Wed, 8 Apr 2015 12:53:45 +0000 (+0200)
Subject: make licensing more transparent
X-Git-Tag: v2.7~4
X-Git-Url: http://developer.intra2net.com/git/?a=commitdiff_plain;h=bdafe0973299b4c93c058309fa6555111b87cb9f;p=libi2ncommon

make licensing more transparent
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3d93631..a721409 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,7 +56,8 @@ set(CPACK_CMAKE_GENERATOR              "Unix Makefiles")
 set(CPACK_PACKAGE_NAME                 ${PROJECT_NAME})
 set(CPACK_PACKAGE_FILE_NAME            ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}${PACK_ARCH})
 
-set(CPACK_RESOURCE_FILE_LICENSE        ${CMAKE_SOURCE_DIR}/COPYING.GPL)
+set(CPACK_RESOURCE_FILE_LICENSE        ${CMAKE_SOURCE_DIR}/Linking-Exception.txt)
+set(CPACK_RESOURCE_FILE_README         ${CMAKE_SOURCE_DIR}/COPYING.GPL)
 
 set(CPACK_SOURCE_GENERATOR             TGZ)
 set(CPACK_SOURCE_IGNORE_FILES
diff --git a/Linking-Exception.txt b/Linking-Exception.txt
new file mode 100644
index 0000000..7961731
--- /dev/null
+++ b/Linking-Exception.txt
@@ -0,0 +1,17 @@
+The software in this package is distributed under the GNU General
+Public License version 2 (with a special exception described below).
+
+A copy of GNU General Public License (GPL) is included in this distribution,
+in the file COPYING.GPL.
+
+As a special exception, if other files instantiate templates or use macros
+or inline functions from this file, or you compile this file and link it
+with other works to produce a work based on this file, this file
+does not by itself cause the resulting work to be covered
+by the GNU General Public License.
+
+However the source code for this file must still be made available
+in accordance with section (3) of the GNU General Public License.
+
+This exception does not invalidate any other reasons why a work based
+on this file might be covered by the GNU General Public License.
diff --git a/libi2ncommon.spec b/libi2ncommon.spec
index b02c60f..704d493 100644
--- a/libi2ncommon.spec
+++ b/libi2ncommon.spec
@@ -113,7 +113,7 @@ rm -fr $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc COPYING.GPL
+%doc COPYING.GPL Linking-Exception.txt
 %{_libdir}/libi2ncommon.so*
 
 %files devel
@@ -126,17 +126,17 @@ rm -fr $RPM_BUILD_ROOT
 
 %files config
 %defattr(-,root,root)
-%doc COPYING.GPL
+%doc COPYING.GPL Linking-Exception.txt
 %{_libdir}/libi2ncommon_config.so*
 
 %if "%{with xmllib}" == "1"
 %files xml
 %defattr(-,root,root)
-%doc COPYING.GPL
+%doc COPYING.GPL Linking-Exception.txt
 %{_libdir}/libi2ncommon_xml.so*
 %endif
 
 %files utils
 %defattr(-,root,root)
-%doc COPYING.GPL
+%doc COPYING.GPL Linking-Exception.txt
 %{_libdir}/libi2ncommon_utils.so*