From 091dcccab6fc270f0dea24dbeb6cc3c1870c086f Mon Sep 17 00:00:00 2001 From: Sérgio M. Basto Date: Jan 22 2016 04:45:45 +0000 Subject: Split incorrect-fsf-address.patch and do not pack backup files --- diff --git a/p7zip.spec b/p7zip.spec index c79e118..5707ac7 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -1,7 +1,7 @@ Summary: Very high compression ratio file archiver Name: p7zip Version: 15.09 -Release: 6%{?dist} +Release: 7%{?dist} # Files under C/Compress/Lzma/ are dual LGPL or CPL License: LGPLv2 and (LGPLv2+ or CPL) Group: Applications/Archiving @@ -19,6 +19,7 @@ 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 +Patch4: p7zip_15.09-incorrect-fsf-address.patch BuildRequires: cmake # BuildRequires: wxGTK3-devel wxGTK-devel # for 7zG GUI @@ -46,9 +47,12 @@ This package contains also a virtual file system for Midnight Commander. %prep %setup -q -n %{name}_%{version} %patch0 -p1 -b .norar_cmake +#Remove backups from DOC directory +rm DOC/License.txt.* %patch1 -p1 -b .s390 %patch2 -p1 -b .CVE-2015-1038 %patch3 -p1 -b .no7zG_and_7zFM.patch +%patch4 -p1 # Move docs early so that they don't get installed by "make install" and we # can include them in %%doc mv DOC docs @@ -111,6 +115,9 @@ make install \ %changelog +* Fri Jan 22 2016 Sérgio Basto - 15.09-7 +- Split incorrect-fsf-address.patch and do not pack backup files + * 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) diff --git a/p7zip_15.09-incorrect-fsf-address.patch b/p7zip_15.09-incorrect-fsf-address.patch new file mode 100644 index 0000000..4cb1fb1 --- /dev/null +++ b/p7zip_15.09-incorrect-fsf-address.patch @@ -0,0 +1,88 @@ +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 + + 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. + +@@ -10,7 +10,7 @@ + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + +- Preamble ++ Preamble + + 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 04:04:38.314054043 +0000 +@@ -32,7 +35,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 diff --git a/p7zip_15.09-norar_cmake.patch b/p7zip_15.09-norar_cmake.patch index dd0f797..e11c89e 100644 --- a/p7zip_15.09-norar_cmake.patch +++ b/p7zip_15.09-norar_cmake.patch @@ -132,81 +132,6 @@ 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 -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 - - 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. - -@@ -10,7 +10,7 @@ - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - -- Preamble -+ Preamble - - 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 04:04:38.314054043 +0000 @@ -217,13 +142,3 @@ diff -up p7zip_15.09.orig/DOC/License.txt p7zip_15.09/DOC/License.txt 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