From e39e59c2e9d8d3144d1f8fa4094b9e42d2acc329 Mon Sep 17 00:00:00 2001 From: "taesub.kim" Date: Tue, 22 Dec 2015 11:48:30 +0900 Subject: [PATCH] To modify Makefile.am to build only lib folder for removing GPL features http://165.213.149.170/gerrit/#/c/68706/ http://165.213.149.170/gerrit/#/c/76084/ 1. Fix build error: %license to %doc 2. Exclude extra directory for removing GPL features. 3. Change the license from LGPL-3.0+ to LGPL-2.1+ because of using gmplib (version 4.2.1) Change-Id: If27996bdf18546c94145cd61f7dafaddaa90c01e Signed-off-by: Taesub Kim --- Makefile.am | 2 +- gl/Makefile.am | 1 - packaging/gnutls.spec | 51 ++++++--------------------------------------------- 3 files changed, 7 insertions(+), 47 deletions(-) mode change 100644 => 100755 Makefile.am mode change 100644 => 100755 gl/Makefile.am mode change 100644 => 100755 packaging/gnutls.spec diff --git a/Makefile.am b/Makefile.am old mode 100644 new mode 100755 index 71a7d83..f1374e2 --- a/Makefile.am +++ b/Makefile.am @@ -21,7 +21,7 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-valgrind-tests -SUBDIRS = gl lib extra +SUBDIRS = gl lib if ENABLE_DANE SUBDIRS += libdane diff --git a/gl/Makefile.am b/gl/Makefile.am old mode 100644 new mode 100755 index 47d9944..d1f351f --- a/gl/Makefile.am +++ b/gl/Makefile.am @@ -37,7 +37,6 @@ MOSTLYCLEANDIRS = CLEANFILES = DISTCLEANFILES = MAINTAINERCLEANFILES = -SUBDIRS += tests EXTRA_DIST += m4/gnulib-cache.m4 AM_CPPFLAGS = diff --git a/packaging/gnutls.spec b/packaging/gnutls.spec old mode 100644 new mode 100755 index 9441a51..a789965 --- a/packaging/gnutls.spec +++ b/packaging/gnutls.spec @@ -6,7 +6,7 @@ Name: gnutls Version: 3.3.5 Release: 0 Summary: The GNU Transport Layer Security Library -License: LGPL-3.0+ and GPL-3.0+ +License: LGPL-2.1+ Group: Security/Crypto Libraries Url: http://www.gnutls.org/ Source0: http://ftp.gnu.org/gnu/gnutls/%{name}-%{version}.tar.xz @@ -34,7 +34,7 @@ implements the proposed standards of the IETF's TLS working group. %package -n libgnutls Summary: The GNU Transport Layer Security Library -License: LGPL-3.0+ +License: LGPL-2.1+ Group: Security/Crypto Libraries %description -n libgnutls @@ -44,7 +44,7 @@ implements the proposed standards of the IETF's TLS working group. %package -n libgnutlsxx Summary: The GNU Transport Layer Security Library -License: LGPL-3.0+ +License: LGPL-2.1+ Group: Security/Crypto Libraries %description -n libgnutlsxx @@ -53,20 +53,9 @@ layer over a reliable transport layer. Currently the GnuTLS library implements the proposed standards of the IETF's TLS working group. -%package -n libgnutls-openssl -Summary: The GNU Transport Layer Security Library -License: GPL-3.0+ -Group: Security/Crypto Libraries - -%description -n libgnutls-openssl -The GnuTLS project aims to develop a library that provides a secure -layer over a reliable transport layer. Currently the GnuTLS library -implements the proposed standards of the IETF's TLS working group. - - %package -n libgnutls-devel Summary: Development package for gnutls -License: LGPL-3.0+ +License: LGPL-2.1+ Group: Development/Libraries Requires: glibc-devel Requires: libgnutls = %{version} @@ -77,7 +66,7 @@ Files needed for software development using gnutls. %package -n libgnutlsxx-devel Summary: Development package for gnutls -License: LGPL-3.0+ +License: LGPL-2.1+ Group: Development/Libraries Requires: libgnutls-devel = %{version} Requires: libgnutlsxx = %{version} @@ -86,18 +75,6 @@ Requires: libstdc++-devel %description -n libgnutlsxx-devel Files needed for software development using gnutls. - -%package -n libgnutls-openssl-devel -Summary: Development package for gnutls -License: GPL-3.0+ -Group: Development/Libraries -Requires: libgnutls-devel = %{version} -Requires: libgnutls-openssl = %{version} - -%description -n libgnutls-openssl-devel -Files needed for software development using gnutls. - - %prep %setup -q cp %{SOURCE1001} . @@ -135,14 +112,10 @@ rm -f %{buildroot}%{_libdir}/*.la %postun -n libgnutlsxx -p /sbin/ldconfig -%post -n libgnutls-openssl -p /sbin/ldconfig - -%postun -n libgnutls-openssl -p /sbin/ldconfig - %files -f libgnutls.lang %manifest %{name}.manifest %defattr(-, root, root) -%license COPYING +%doc COPYING %{_bindir}/certtool %{_bindir}/crywrap %{_bindir}/gnutls-cli @@ -159,11 +132,6 @@ rm -f %{buildroot}%{_libdir}/*.la %defattr(-,root,root) %{_libdir}/libgnutls.so.* -%files -n libgnutls-openssl -%manifest %{name}.manifest -%defattr(-,root,root) -%{_libdir}/libgnutls-openssl.so.* - %files -n libgnutlsxx %manifest %{name}.manifest %defattr(-,root,root) @@ -198,10 +166,3 @@ rm -f %{buildroot}%{_libdir}/*.la %{_libdir}/libgnutlsxx.so %dir %{_includedir}/%{name} %{_includedir}/%{name}/gnutlsxx.h - -%files -n libgnutls-openssl-devel -%manifest %{name}.manifest -%defattr(-, root, root) -%{_libdir}/libgnutls-openssl.so -%dir %{_includedir}/%{name} -%{_includedir}/%{name}/openssl.h -- 2.7.4