diff --git a/.gitignore b/.gitignore index a70d0d2..31d261c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /p7zip_9.13_src_all-norar.tar.bz2 /p7zip_9.20.1_src_all-norar.tar.bz2 /p7zip_15.09_src_all-norar.tar.bz2 +/p7zip_15.14_src_all-norar.tar.bz2 diff --git a/p7zip.spec b/p7zip.spec index ec7fdce..6f7054c 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -1,30 +1,28 @@ Summary: Very high compression ratio file archiver Name: p7zip -Version: 15.09 -Release: 10%{?dist} +Version: 15.14 +Release: 1%{?dist} # Files under C/Compress/Lzma/ are dual LGPL or CPL License: LGPLv2 and (LGPLv2+ or CPL) Group: Applications/Archiving URL: http://p7zip.sourceforge.net/ # RAR sources removed since their license is incompatible with the LGPL #Source: http://downloads.sf.net/p7zip/p7zip_%%{version}_src_all.tar.bz2 -# VERSION= +# export VERSION=15.14 # wget http://downloads.sf.net/p7zip/p7zip_${VERSION}_src_all.tar.bz2 # tar xjvf p7zip_${VERSION}_src_all.tar.bz2 -# rm -rf p7zip_${VERSION}/CPP/7zip/{Archive,Compress,Crypto}/Rar* +# rm -rf p7zip_${VERSION}/CPP/7zip/{Archive,Compress,Crypto,QMAKE}/Rar* # rm p7zip_${VERSION}/DOC/unRarLicense.txt # tar --numeric-owner -cjvf p7zip_${VERSION}_src_all-norar.tar.bz2 p7zip_${VERSION} 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 -Patch4: p7zip_15.09-incorrect-fsf-address.patch +Patch0: p7zip_15.14-norar_cmake.patch # from Debain Patch5: 02_man.patch BuildRequires: cmake -# BuildRequires: wxGTK3-devel wxGTK-devel # for 7zG GUI +# for 7zG GUI +BuildRequires: wxGTK-devel +BuildRequires: kde-filesystem %ifarch %{ix86} BuildRequires: nasm %endif @@ -45,31 +43,34 @@ Group: Applications/Archiving Additional plugins that can be used with 7z to extend its abilities. This package contains also a virtual file system for Midnight Commander. +%package gui +Summary: 7zG - 7-Zip GUI version +Requires: kde-filesystem + +%description gui +7zG is a gui provide by p7zip and it is now in beta stage. +Also add some context menus for KDE4. +This package is *experimental*. + %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 %patch5 -p1 -b .man -# Move docs early so that they don't get installed by "make install" and we -# can include them in %%doc -mv DOC docs -mv ChangeLog README TODO docs/ # move license files -mv docs/License.txt docs/copying.txt . -# And fix useless executable bit while we're at it -find docs -type f -exec chmod -x {} \; -find contrib -type f -exec chmod -x {} \; +mv DOC/License.txt DOC/copying.txt . + +# no need anymore +## And fix useless executable bit while we're at it +#find docs -type f -exec chmod -x {} \; +#find contrib -type f -exec chmod -x {} \; %build pushd CPP/7zip/CMAKE/ -./generate.sh +sh ./generate.sh popd %ifarch %{ix86} cp -f makefile.linux_x86_asm_gcc_4.X makefile.machine @@ -81,7 +82,7 @@ cp -f makefile.linux_amd64_asm makefile.machine cp -f makefile.linux_any_cpu_gcc_4.X makefile.machine %endif -make %{?_smp_mflags} all2 \ +make %{?_smp_mflags} all2 7zG \ OPTFLAGS="%{optflags}" \ DEST_HOME=%{_prefix} \ DEST_BIN=%{_bindir} \ @@ -96,15 +97,21 @@ make install \ DEST_BIN=%{_bindir} \ DEST_SHARE=%{_libexecdir}/p7zip \ DEST_MAN=%{_mandir} -find %{buildroot} +# remove redundant DOC dir +mv %{buildroot}%{_docdir}/p7zip/DOC/* %{buildroot}%{_docdir}/p7zip +rmdir %{buildroot}%{_docdir}/p7zip/DOC/ + +mkdir -p %{buildroot}%{_kde4_datadir}/kde4/services/ServiceMenus/ +cp GUI/kde4/*.desktop %{buildroot}%{_kde4_datadir}/kde4/services/ServiceMenus/ %check -find %{buildroot} +make test +#make test_7zG || : %files -%doc docs/* +%{_docdir}/p7zip %license copying.txt License.txt %{_bindir}/7za %dir %{_libexecdir}/p7zip/ @@ -123,8 +130,25 @@ find %{buildroot} #{_libexecdir}/p7zip/Formats/ %{_mandir}/man1/7z.1* +%files gui +%{_bindir}/7zG +%{_bindir}/p7zipForFilemanager +%{_libexecdir}/p7zip/7zG +%{_libexecdir}/p7zip/Lang +%{_kde4_datadir}/kde4/services/ServiceMenus/*.desktop + %changelog +* Tue Mar 15 2016 Sérgio Basto - 15.14-1 +- Update to 15.14 . +- Rebase norar_cmake.patch +- Minor improvement in snippet of documentation. +- Drop patch1, from changelog build on s390 is fixed. +- Drop p7zip-15.09-CVE-2015-1038.patch, from changelog if fixed. +- Drop upstreamed p7zip_15.09-incorrect-fsf-address.patch . +- Drop p7zip_15.09-no7zG_and_7zFM.patch, p7zip build is fixed. +- Add sub-package p7zip-gui with 7zG. + * Thu Feb 04 2016 Fedora Release Engineering - 15.09-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/p7zip_15.09-incorrect-fsf-address.patch b/p7zip_15.09-incorrect-fsf-address.patch deleted file mode 100644 index 4cb1fb1..0000000 --- a/p7zip_15.09-incorrect-fsf-address.patch +++ /dev/null @@ -1,88 +0,0 @@ -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-s390.patch b/p7zip_15.09-s390.patch deleted file mode 100644 index 5ae3af2..0000000 --- a/p7zip_15.09-s390.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- p7zip_15.09.orig/C/CpuArch.h 2015-09-27 15:31:20.000000000 -0400 -+++ p7zip_15.09/C/CpuArch.h 2015-12-01 06:16:38.000000000 -0500 -@@ -77,7 +77,7 @@ - || defined(__MIPSEB) \ - || defined(_MIPSEB) \ - || defined(__m68k__) \ -- || defined(__s390x__) -+ || defined(__s390__) - #define MY_CPU_BE - #endif - diff --git a/p7zip_15.09-norar_cmake.patch b/p7zip_15.14-norar_cmake.patch similarity index 71% rename from p7zip_15.09-norar_cmake.patch rename to p7zip_15.14-norar_cmake.patch index e11c89e..41a351d 100644 --- a/p7zip_15.09-norar_cmake.patch +++ b/p7zip_15.14-norar_cmake.patch @@ -1,50 +1,7 @@ -diff -rup p7zip_15.09.orig/CPP/7zip/CMAKE/generate.sh p7zip_15.09/CPP/7zip/CMAKE/generate.sh ---- p7zip_15.09.orig/CPP/7zip/CMAKE/generate.sh 2015-01-18 17:14:54.000000000 +0000 -+++ p7zip_15.09/CPP/7zip/CMAKE/generate.sh 2015-11-05 03:55:11.789432894 +0000 -@@ -15,14 +15,14 @@ CURDIR=$PWD - cd $CURDIR - doit "Unix" "Unix Makefiles" - --cd $CURDIR --doit "codeblocks" "CodeBlocks - Unix Makefiles" -+#cd $CURDIR -+#doit "codeblocks" "CodeBlocks - Unix Makefiles" - - #cd $CURDIR - #doit "KDevelop3" "KDevelop3" - --cd $CURDIR --doit "EclipseCDT4" "Eclipse CDT4 - Unix Makefiles" -+#cd $CURDIR -+#doit "EclipseCDT4" "Eclipse CDT4 - Unix Makefiles" - - #cd $CURDIR - #doit "ninja" "Ninja" -diff -rup p7zip_15.09.orig/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt p7zip_15.09/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt ---- p7zip_15.09.orig/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt 2015-10-10 13:30:03.000000000 +0100 -+++ p7zip_15.09/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt 2015-11-05 04:21:50.386888680 +0000 -@@ -127,8 +127,6 @@ add_library(7z MODULE - "../../../../CPP/7zip/Archive/PeHandler.cpp" - "../../../../CPP/7zip/Archive/PpmdHandler.cpp" - "../../../../CPP/7zip/Archive/QcowHandler.cpp" -- "../../../../CPP/7zip/Archive/Rar/RarHandler.cpp" -- "../../../../CPP/7zip/Archive/Rar/Rar5Handler.cpp" - "../../../../CPP/7zip/Archive/RpmHandler.cpp" - "../../../../CPP/7zip/Archive/SplitHandler.cpp" - "../../../../CPP/7zip/Archive/SquashfsHandler.cpp" -@@ -231,9 +229,6 @@ add_library(7z MODULE - "../../../../CPP/7zip/Crypto/MyAesReg.cpp" - "../../../../CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp" - "../../../../CPP/7zip/Crypto/RandGen.cpp" -- "../../../../CPP/7zip/Crypto/Rar20Crypto.cpp" -- "../../../../CPP/7zip/Crypto/Rar5Aes.cpp" -- "../../../../CPP/7zip/Crypto/RarAes.cpp" - "../../../../CPP/7zip/Crypto/WzAes.cpp" - "../../../../CPP/7zip/Crypto/ZipCrypto.cpp" - "../../../../CPP/7zip/Crypto/ZipStrong.cpp" ---- p7zip_15.09.orig/CPP/7zip/Bundles/Format7zFree/makefile.list 2015-10-10 13:30:03.000000000 +0100 -+++ p7zip_15.09/CPP/7zip/Bundles/Format7zFree/makefile.list 2015-11-05 13:22:50.715659911 +0000 -@@ -89,8 +89,6 @@ SRCS=\ +diff -rup p7zip_15.14.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_15.14/CPP/7zip/Bundles/Format7zFree/makefile.list +--- p7zip_15.14.orig/CPP/7zip/Bundles/Format7zFree/makefile.list 2016-03-10 07:27:16.000000000 +0000 ++++ p7zip_15.14/CPP/7zip/Bundles/Format7zFree/makefile.list 2016-03-15 13:50:22.638470716 +0000 +@@ -87,8 +87,6 @@ SRCS=\ ../../../../CPP/7zip/Archive/PeHandler.cpp \ ../../../../CPP/7zip/Archive/PpmdHandler.cpp \ ../../../../CPP/7zip/Archive/QcowHandler.cpp \ @@ -53,7 +10,7 @@ diff -rup p7zip_15.09.orig/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt p7zip_15.0 ../../../../CPP/7zip/Archive/RpmHandler.cpp \ ../../../../CPP/7zip/Archive/SplitHandler.cpp \ ../../../../CPP/7zip/Archive/SquashfsHandler.cpp \ -@@ -193,9 +191,6 @@ SRCS=\ +@@ -191,9 +189,6 @@ SRCS=\ ../../../../CPP/7zip/Crypto/MyAesReg.cpp \ ../../../../CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp \ ../../../../CPP/7zip/Crypto/RandGen.cpp \ @@ -63,7 +20,7 @@ diff -rup p7zip_15.09.orig/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt p7zip_15.0 ../../../../CPP/7zip/Crypto/WzAes.cpp \ ../../../../CPP/7zip/Crypto/ZipCrypto.cpp \ ../../../../CPP/7zip/Crypto/ZipStrong.cpp \ -@@ -491,10 +486,6 @@ PpmdHandler.o : ../../../../CPP/7zip/Arc +@@ -485,10 +480,6 @@ PpmdHandler.o : ../../../../CPP/7zip/Arc $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Archive/PpmdHandler.cpp QcowHandler.o : ../../../../CPP/7zip/Archive/QcowHandler.cpp $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Archive/QcowHandler.cpp @@ -74,7 +31,7 @@ diff -rup p7zip_15.09.orig/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt p7zip_15.0 RpmHandler.o : ../../../../CPP/7zip/Archive/RpmHandler.cpp $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Archive/RpmHandler.cpp SplitHandler.o : ../../../../CPP/7zip/Archive/SplitHandler.cpp -@@ -699,12 +690,6 @@ Pbkdf2HmacSha1.o : ../../../../CPP/7zip/ +@@ -693,12 +684,6 @@ Pbkdf2HmacSha1.o : ../../../../CPP/7zip/ $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp RandGen.o : ../../../../CPP/7zip/Crypto/RandGen.cpp $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Crypto/RandGen.cpp @@ -87,7 +44,7 @@ diff -rup p7zip_15.09.orig/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt p7zip_15.0 WzAes.o : ../../../../CPP/7zip/Crypto/WzAes.cpp $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Crypto/WzAes.cpp ZipCrypto.o : ../../../../CPP/7zip/Crypto/ZipCrypto.cpp -@@ -877,8 +862,6 @@ OBJS=\ +@@ -869,8 +854,6 @@ OBJS=\ PeHandler.o \ PpmdHandler.o \ QcowHandler.o \ @@ -96,7 +53,7 @@ diff -rup p7zip_15.09.orig/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt p7zip_15.0 RpmHandler.o \ SplitHandler.o \ SquashfsHandler.o \ -@@ -981,9 +964,6 @@ OBJS=\ +@@ -973,9 +956,6 @@ OBJS=\ MyAesReg.o \ Pbkdf2HmacSha1.o \ RandGen.o \ @@ -106,9 +63,67 @@ diff -rup p7zip_15.09.orig/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt p7zip_15.0 WzAes.o \ ZipCrypto.o \ ZipStrong.o \ ---- p7zip_15.09.orig/makefile 2015-10-05 09:39:57.000000000 +0100 -+++ p7zip_15.09/makefile 2015-11-05 13:36:01.160793573 +0000 -@@ -70,7 +70,6 @@ depend: +diff -rup p7zip_15.14.orig/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt p7zip_15.14/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt +--- p7zip_15.14.orig/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt 2016-03-10 07:27:16.000000000 +0000 ++++ p7zip_15.14/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt 2016-03-15 13:50:22.639470728 +0000 +@@ -126,8 +126,6 @@ add_library(7z MODULE + "../../../../CPP/7zip/Archive/PeHandler.cpp" + "../../../../CPP/7zip/Archive/PpmdHandler.cpp" + "../../../../CPP/7zip/Archive/QcowHandler.cpp" +- "../../../../CPP/7zip/Archive/Rar/RarHandler.cpp" +- "../../../../CPP/7zip/Archive/Rar/Rar5Handler.cpp" + "../../../../CPP/7zip/Archive/RpmHandler.cpp" + "../../../../CPP/7zip/Archive/SplitHandler.cpp" + "../../../../CPP/7zip/Archive/SquashfsHandler.cpp" +@@ -230,9 +228,6 @@ add_library(7z MODULE + "../../../../CPP/7zip/Crypto/MyAesReg.cpp" + "../../../../CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp" + "../../../../CPP/7zip/Crypto/RandGen.cpp" +- "../../../../CPP/7zip/Crypto/Rar20Crypto.cpp" +- "../../../../CPP/7zip/Crypto/Rar5Aes.cpp" +- "../../../../CPP/7zip/Crypto/RarAes.cpp" + "../../../../CPP/7zip/Crypto/WzAes.cpp" + "../../../../CPP/7zip/Crypto/ZipCrypto.cpp" + "../../../../CPP/7zip/Crypto/ZipStrong.cpp" +diff -rup p7zip_15.14.orig/CPP/7zip/CMAKE/generate.sh p7zip_15.14/CPP/7zip/CMAKE/generate.sh +--- p7zip_15.14.orig/CPP/7zip/CMAKE/generate.sh 2016-02-03 04:54:00.000000000 +0000 ++++ p7zip_15.14/CPP/7zip/CMAKE/generate.sh 2016-03-15 13:50:47.596758591 +0000 +@@ -15,15 +15,15 @@ CURDIR=$PWD + cd $CURDIR + doit "Unix" "Unix Makefiles" + +-cd $CURDIR +-doit "codeblocks" "CodeBlocks - Unix Makefiles" ++#cd $CURDIR ++#doit "codeblocks" "CodeBlocks - Unix Makefiles" + + #cd $CURDIR + #doit "KDevelop3" "KDevelop3" + +-cd $CURDIR +-doit "EclipseCDT4" "Eclipse CDT4 - Unix Makefiles" ++#cd $CURDIR ++#doit "EclipseCDT4" "Eclipse CDT4 - Unix Makefiles" + +-cd $CURDIR +-doit "ninja" "Ninja" ++#cd $CURDIR ++#doit "ninja" "Ninja" + +diff -rup p7zip_15.14.orig/DOC/License.txt p7zip_15.14/DOC/License.txt +--- p7zip_15.14.orig/DOC/License.txt 2016-03-02 05:57:39.000000000 +0000 ++++ p7zip_15.14/DOC/License.txt 2016-03-15 13:50:22.640470740 +0000 +@@ -1,3 +1,6 @@ ++ Fedora package note: non-Free unrar code have been removed from the sources ++ (#190277) ++ + 7-Zip source code + ~~~~~~~~~~~~~~~~~ + License for use and distribution +diff -rup p7zip_15.14.orig/makefile p7zip_15.14/makefile +--- p7zip_15.14.orig/makefile 2016-02-29 06:28:31.000000000 +0000 ++++ p7zip_15.14/makefile 2016-03-15 13:50:22.640470740 +0000 +@@ -31,7 +31,6 @@ depend: $(MAKE) -C CPP/7zip/UI/Client7z depend $(MAKE) -C CPP/7zip/UI/Console depend $(MAKE) -C CPP/7zip/Bundles/Format7zFree depend @@ -116,29 +131,19 @@ diff -rup p7zip_15.09.orig/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt p7zip_15.0 $(MAKE) -C CPP/7zip/UI/GUI depend $(MAKE) -C CPP/7zip/UI/FileManager depend -@@ -81,7 +80,6 @@ sfx: common +@@ -42,7 +41,6 @@ sfx: common common7z:common $(MKDIR) bin/Codecs $(MAKE) -C CPP/7zip/Bundles/Format7zFree all - $(MAKE) -C CPP/7zip/Compress/Rar all - 7z: common7z - $(MAKE) -C CPP/7zip/UI/Console all -@@ -106,7 +104,6 @@ clean: + lzham:common + $(MKDIR) bin/Codecs +@@ -67,7 +65,6 @@ clean_C: $(MAKE) -C CPP/7zip/UI/FileManager clean $(MAKE) -C CPP/7zip/UI/GUI clean $(MAKE) -C CPP/7zip/Bundles/Format7zFree clean - $(MAKE) -C CPP/7zip/Compress/Rar clean + $(MAKE) -C CPP/7zip/Compress/Lzham clean $(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/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 -@@ -1,3 +1,6 @@ -+ Fedora package note: non-Free unrar code have been removed from the sources -+ (#190277) -+ - 7-Zip source code - ~~~~~~~~~~~~~~~~~ - License for use and distribution diff --git a/sources b/sources index 25b0a88..b7a4ab1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -51b361979baf8124935cfaa2888b4a10 p7zip_15.09_src_all-norar.tar.bz2 +7f19e4426635bfa5d642e6f850776341 p7zip_15.14_src_all-norar.tar.bz2