From 11f567117880379373d56b5f0763960b3029a095 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Fri, 22 Jan 2016 04:17:40 +0000 Subject: [PATCH] Stating in License.txt file that we removed non-Free unrar code from sources (#190277) - Fix incorrect fsf address in the license files. - Add p7zip_15.09-no7zG_and_7zFM.patch in a diferent patch. --- p7zip.spec | 10 +++- p7zip_15.09-norar_cmake.patch | 92 +++++++++++++++++++++++++++++++---- 2 files changed, 91 insertions(+), 11 deletions(-) diff --git a/p7zip.spec b/p7zip.spec index fd18d7c..c79e118 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -1,7 +1,7 @@ Summary: Very high compression ratio file archiver Name: p7zip Version: 15.09 -Release: 5%{?dist} +Release: 6%{?dist} # Files under C/Compress/Lzma/ are dual LGPL or CPL License: LGPLv2 and (LGPLv2+ or CPL) Group: Applications/Archiving @@ -18,6 +18,7 @@ Source: p7zip_%{version}_src_all-norar.tar.bz2 Patch0: p7zip_15.09-norar_cmake.patch Patch1: p7zip_15.09-s390.patch Patch2: p7zip-15.09-CVE-2015-1038.patch +Patch3: p7zip_15.09-no7zG_and_7zFM.patch BuildRequires: cmake # BuildRequires: wxGTK3-devel wxGTK-devel # for 7zG GUI @@ -47,6 +48,7 @@ This package contains also a virtual file system for Midnight Commander. %patch0 -p1 -b .norar_cmake %patch1 -p1 -b .s390 %patch2 -p1 -b .CVE-2015-1038 +%patch3 -p1 -b .no7zG_and_7zFM.patch # Move docs early so that they don't get installed by "make install" and we # can include them in %%doc mv DOC docs @@ -109,6 +111,12 @@ make install \ %changelog +* Fri Jan 22 2016 Sérgio Basto - 15.09-6 +- Stating in License.txt file that we removed non-Free unrar code + from sources (#190277) +- Fix incorrect fsf address in the license files. +- Add p7zip_15.09-no7zG_and_7zFM.patch in a diferent patch. + * Fri Jan 22 2016 Sérgio Basto - 15.09-5 - Add license tag - better solutions for "create unowned directory" (#917366) diff --git a/p7zip_15.09-norar_cmake.patch b/p7zip_15.09-norar_cmake.patch index 7da05f4..dd0f797 100644 --- a/p7zip_15.09-norar_cmake.patch +++ b/p7zip_15.09-norar_cmake.patch @@ -132,22 +132,84 @@ diff -rup p7zip_15.09.orig/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt p7zip_15.0 $(MAKE) -C CPP/7zip/Bundles/LzmaCon clean2 $(MAKE) -C CPP/7zip/Bundles/AloneGCOV clean $(MAKE) -C CPP/7zip/TEST/TestUI clean ---- p7zip_15.09.orig/CPP/7zip/CMAKE/CMakeLists.txt 2015-06-21 20:53:26.000000000 +0100 -+++ p7zip_15.09/CPP/7zip/CMAKE/CMakeLists.txt 2015-11-05 14:35:42.849613481 +0000 -@@ -27,9 +27,9 @@ add_subdirectory(7za) +diff -up p7zip_15.09.orig/DOC/copying.txt p7zip_15.09/DOC/copying.txt +--- p7zip_15.09.orig/DOC/copying.txt 2008-08-01 10:56:23.000000000 +0100 ++++ p7zip_15.09/DOC/copying.txt 2016-01-22 04:00:02.525966083 +0000 +@@ -1,8 +1,8 @@ +- GNU LESSER GENERAL PUBLIC LICENSE +- Version 2.1, February 1999 ++ GNU LESSER GENERAL PUBLIC LICENSE ++ Version 2.1, February 1999 - add_subdirectory(7z_) + Copyright (C) 1991, 1999 Free Software Foundation, Inc. +- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. --add_subdirectory(7zG) -+#add_subdirectory(7zG) +@@ -10,7 +10,7 @@ + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] --add_subdirectory(7zFM) -+#add_subdirectory(7zFM) +- Preamble ++ Preamble - add_subdirectory(7zr) + The licenses for most software are designed to take away your + freedom to share and change it. By contrast, the GNU General Public +@@ -112,7 +112,7 @@ modification follow. Pay close attentio + former contains code derived from the library, whereas the latter must + be combined with the library in order to run. + +- GNU LESSER GENERAL PUBLIC LICENSE ++ GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + 0. This License Agreement applies to any software library or other +@@ -146,7 +146,7 @@ such a program is covered only if its co + on the Library (independent of the use of the Library in a tool for + writing it). Whether that is true depends on what the Library does + and what the program that uses the Library does. +- ++ + 1. You may copy and distribute verbatim copies of the Library's + complete source code as you receive it, in any medium, provided that + you conspicuously and appropriately publish on each copy an +@@ -432,7 +432,7 @@ decision will be guided by the two goals + of all derivatives of our free software and of promoting the sharing + and reuse of software generally. + +- NO WARRANTY ++ NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO + WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +@@ -455,7 +455,7 @@ FAILURE OF THE LIBRARY TO OPERATE WITH A + SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH + DAMAGES. + +- END OF TERMS AND CONDITIONS ++ END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + +@@ -485,7 +485,7 @@ convey the exclusion of warranty; and ea + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software +- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + + Also add information on how to contact you by electronic and paper mail. + +@@ -500,5 +500,3 @@ necessary. Here is a sample; alter the + Ty Coon, President of Vice + + That's all there is to it! +- +- +diff -up p7zip_15.09.orig/DOC/License.txt p7zip_15.09/DOC/License.txt --- p7zip_15.09.orig/DOC/License.txt 2015-01-05 18:38:02.000000000 +0000 -+++ p7zip_15.09/DOC/License.txt 2016-01-22 03:41:19.376362458 +0000 ++++ p7zip_15.09/DOC/License.txt 2016-01-22 04:04:38.314054043 +0000 @@ -1,3 +1,6 @@ + Fedora package note: non-Free unrar code have been removed from the sources + (#190277) @@ -155,3 +217,13 @@ diff -rup p7zip_15.09.orig/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt p7zip_15.0 7-Zip source code ~~~~~~~~~~~~~~~~~ License for use and distribution +@@ -29,7 +32,8 @@ + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software +- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 ++ USA + + + unRAR restriction