From cf01096ebd1a1c2884a1230b99804f443f31f4ad Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Tue, 23 Dec 2008 15:46:55 +0000 Subject: [PATCH] Update to 4.61 and use asm for x86 too. --- .cvsignore | 2 +- p7zip.spec | 19 ++++-- ...4.58-norar.patch => p7zip_4.61-norar.patch | 68 +++++++++---------- sources | 2 +- 4 files changed, 51 insertions(+), 40 deletions(-) rename p7zip_4.58-norar.patch => p7zip_4.61-norar.patch (72%) diff --git a/.cvsignore b/.cvsignore index 2ede8b2..5832f36 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -p7zip_4.58_src_all-norar.tar.bz2 +p7zip_4.61_src_all-norar.tar.bz2 diff --git a/p7zip.spec b/p7zip.spec index 1c40777..a1e78a5 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -1,6 +1,6 @@ Summary: Very high compression ratio file archiver Name: p7zip -Version: 4.58 +Version: 4.61 Release: 1%{?dist} # Files under C/Compress/Lzma/ are dual LGPL or CPL License: LGPLv2 and (LGPLv2+ or CPL) @@ -14,10 +14,13 @@ URL: http://p7zip.sourceforge.net/ # rm -f p7zip_${VERSION}/DOCS/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_4.58-norar.patch +Patch0: p7zip_4.61-norar.patch Patch1: p7zip_4.58-install.patch Patch2: p7zip_4.51-nostrip.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root +%ifarch %{ix86} +BuildRequires: nasm +%endif %ifarch x86_64 BuildRequires: yasm %endif @@ -52,12 +55,15 @@ find contrib -type f -exec chmod -x {} \; %build -%ifarch %{ix86} ppc ppc64 -%{__cp} -f makefile.linux_x86_ppc_alpha_gcc_4.X makefile.machine +%ifarch %{ix86} +%{__cp} -f makefile.linux_x86_asm_gcc_4.X makefile.machine %endif %ifarch x86_64 %{__cp} -f makefile.linux_amd64_asm makefile.machine %endif +%ifarch ppc ppc64 +%{__cp} -f makefile.linux_x86_ppc_alpha_gcc_4.X makefile.machine +%endif # Don't use _smp_mflags since the build sometimes fails with it (as of 4.44) %{__make} %{?_smp_mflags} all2 \ @@ -104,6 +110,11 @@ find contrib -type f -exec chmod -x {} \; %changelog +* Tue Dec 23 2008 Matthias Saou 4.61-1 +- Update to 4.61. +- Update norar patch. +- Use asm for x86 too (nasm). + * Wed Jun 18 2008 Matthias Saou 4.58-1 - Update to 4.58. - Update norar patch. diff --git a/p7zip_4.58-norar.patch b/p7zip_4.61-norar.patch similarity index 72% rename from p7zip_4.58-norar.patch rename to p7zip_4.61-norar.patch index a4944ce..d5a85eb 100644 --- a/p7zip_4.58-norar.patch +++ b/p7zip_4.61-norar.patch @@ -1,7 +1,7 @@ -diff -Naupr p7zip_4.58.orig/CPP/7zip/Bundles/Format7zFree/makefile p7zip_4.58/CPP/7zip/Bundles/Format7zFree/makefile ---- p7zip_4.58.orig/CPP/7zip/Bundles/Format7zFree/makefile 2008-05-06 21:50:19.000000000 +0200 -+++ p7zip_4.58/CPP/7zip/Bundles/Format7zFree/makefile 2008-06-18 13:03:07.000000000 +0200 -@@ -79,9 +79,6 @@ HmacSha1.o \ +diff -Naupr p7zip_4.61.orig/CPP/7zip/Bundles/Format7zFree/makefile p7zip_4.61/CPP/7zip/Bundles/Format7zFree/makefile +--- p7zip_4.61.orig/CPP/7zip/Bundles/Format7zFree/makefile 2008-11-28 21:17:16.000000000 +0100 ++++ p7zip_4.61/CPP/7zip/Bundles/Format7zFree/makefile 2008-12-23 16:27:04.927434325 +0100 +@@ -83,9 +83,6 @@ HmacSha1.o \ Pbkdf2HmacSha1.o \ RandGen.o \ Sha1.o \ @@ -11,7 +11,7 @@ diff -Naupr p7zip_4.58.orig/CPP/7zip/Bundles/Format7zFree/makefile p7zip_4.58/CP WzAES.o \ ZipCipher.o \ ZipCrypto.o \ -@@ -120,12 +117,6 @@ StreamUtils.o \ +@@ -124,12 +121,6 @@ StreamUtils.o \ 7zRegister.o \ 7zSpecStream.o \ 7zUpdate.o \ @@ -21,13 +21,13 @@ diff -Naupr p7zip_4.58.orig/CPP/7zip/Bundles/Format7zFree/makefile p7zip_4.58/CP -RarItem.o \ -RarRegister.o \ -RarVolumeInStream.o \ - ArjHandler.o \ - ArjIn.o \ - ArjRegister.o \ -diff -Naupr p7zip_4.58.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_4.58/CPP/7zip/Bundles/Format7zFree/makefile.list ---- p7zip_4.58.orig/CPP/7zip/Bundles/Format7zFree/makefile.list 2008-05-08 10:27:51.000000000 +0200 -+++ p7zip_4.58/CPP/7zip/Bundles/Format7zFree/makefile.list 2008-06-18 13:03:56.000000000 +0200 -@@ -44,11 +44,6 @@ SRCS=\ + bz2Register.o \ + BZip2Handler.o \ + BZip2HandlerOut.o \ +diff -Naupr p7zip_4.61.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_4.61/CPP/7zip/Bundles/Format7zFree/makefile.list +--- p7zip_4.61.orig/CPP/7zip/Bundles/Format7zFree/makefile.list 2008-08-14 16:45:27.000000000 +0200 ++++ p7zip_4.61/CPP/7zip/Bundles/Format7zFree/makefile.list 2008-12-23 16:28:13.942309528 +0100 +@@ -51,11 +51,6 @@ SRCS=\ ../../Compress/BZip2/BZip2Decoder.cpp \ ../../Compress/BZip2/BZip2Encoder.cpp \ ../../Compress/BZip2/BZip2Register.cpp \ @@ -39,7 +39,7 @@ diff -Naupr p7zip_4.58.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_4. ../../Compress/Implode/ImplodeDecoder.cpp \ ../../Compress/Implode/ImplodeHuffmanDecoder.cpp \ ../../Compress/Lzx/Lzx86Converter.cpp \ -@@ -68,9 +63,6 @@ SRCS=\ +@@ -72,9 +67,6 @@ SRCS=\ ../../Crypto/Hash/Pbkdf2HmacSha1.cpp \ ../../Crypto/Hash/RandGen.cpp \ ../../Crypto/Hash/Sha1.cpp \ @@ -49,7 +49,7 @@ diff -Naupr p7zip_4.58.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_4. ../../Crypto/WzAES/WzAES.cpp \ ../../Crypto/Zip/ZipCipher.cpp \ ../../Crypto/Zip/ZipCrypto.cpp \ -@@ -109,12 +101,6 @@ SRCS=\ +@@ -113,12 +105,6 @@ SRCS=\ ../../Archive/7z/7zRegister.cpp \ ../../Archive/7z/7zSpecStream.cpp \ ../../Archive/7z/7zUpdate.cpp \ @@ -59,10 +59,10 @@ diff -Naupr p7zip_4.58.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_4. - ../../Archive/Rar/RarItem.cpp \ - ../../Archive/Rar/RarRegister.cpp \ - ../../Archive/Rar/RarVolumeInStream.cpp \ - ../../Archive/Arj/ArjHandler.cpp \ - ../../Archive/Arj/ArjIn.cpp \ - ../../Archive/Arj/ArjRegister.cpp \ -@@ -324,16 +310,6 @@ BZip2Encoder.o : ../../Compress/BZip2/BZ + ../../Archive/BZip2/bz2Register.cpp \ + ../../Archive/BZip2/BZip2Handler.cpp \ + ../../Archive/BZip2/BZip2HandlerOut.cpp \ +@@ -347,16 +333,6 @@ BZip2Encoder.o : ../../Compress/BZip2/BZ $(CXX) $(CC_SHARED) $(CFLAGS) ../../Compress/BZip2/BZip2Encoder.cpp BZip2Register.o : ../../Compress/BZip2/BZip2Register.cpp $(CXX) $(CC_SHARED) $(CFLAGS) ../../Compress/BZip2/BZip2Register.cpp @@ -79,7 +79,7 @@ diff -Naupr p7zip_4.58.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_4. ImplodeDecoder.o : ../../Compress/Implode/ImplodeDecoder.cpp $(CXX) $(CC_SHARED) $(CFLAGS) ../../Compress/Implode/ImplodeDecoder.cpp ImplodeHuffmanDecoder.o : ../../Compress/Implode/ImplodeHuffmanDecoder.cpp -@@ -372,12 +348,6 @@ RandGen.o : ../../Crypto/Hash/RandGen.cp +@@ -391,12 +367,6 @@ RandGen.o : ../../Crypto/Hash/RandGen.cp $(CXX) $(CC_SHARED) $(CFLAGS) ../../Crypto/Hash/RandGen.cpp Sha1.o : ../../Crypto/Hash/Sha1.cpp $(CXX) $(CC_SHARED) $(CFLAGS) ../../Crypto/Hash/Sha1.cpp @@ -92,7 +92,7 @@ diff -Naupr p7zip_4.58.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_4. WzAES.o : ../../Crypto/WzAES/WzAES.cpp $(CXX) $(CC_SHARED) $(CFLAGS) ../../Crypto/WzAES/WzAES.cpp ZipCipher.o : ../../Crypto/Zip/ZipCipher.cpp -@@ -454,18 +424,6 @@ StreamUtils.o : ../../Common/StreamUtils +@@ -473,18 +443,6 @@ StreamUtils.o : ../../Common/StreamUtils $(CXX) $(CC_SHARED) $(CFLAGS) ../../Archive/7z/7zSpecStream.cpp 7zUpdate.o : ../../Archive/7z/7zUpdate.cpp $(CXX) $(CC_SHARED) $(CFLAGS) ../../Archive/7z/7zUpdate.cpp @@ -108,31 +108,31 @@ diff -Naupr p7zip_4.58.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_4. - $(CXX) $(CC_SHARED) $(CFLAGS) ../../Archive/Rar/RarRegister.cpp -RarVolumeInStream.o : ../../Archive/Rar/RarVolumeInStream.cpp - $(CXX) $(CC_SHARED) $(CFLAGS) ../../Archive/Rar/RarVolumeInStream.cpp - ArjHandler.o : ../../Archive/Arj/ArjHandler.cpp - $(CXX) $(CC_SHARED) $(CFLAGS) ../../Archive/Arj/ArjHandler.cpp - ArjIn.o : ../../Archive/Arj/ArjIn.cpp -diff -Naupr p7zip_4.58.orig/makefile p7zip_4.58/makefile ---- p7zip_4.58.orig/makefile 2008-05-18 13:34:05.000000000 +0200 -+++ p7zip_4.58/makefile 2008-06-18 13:04:17.000000000 +0200 -@@ -41,7 +41,6 @@ depend: - cd CPP/7zip/UI/Client7z ; $(MAKE) depend + bz2Register.o : ../../Archive/BZip2/bz2Register.cpp + $(CXX) $(CC_SHARED) $(CFLAGS) ../../Archive/BZip2/bz2Register.cpp + BZip2Handler.o : ../../Archive/BZip2/BZip2Handler.cpp +diff -Naupr p7zip_4.61.orig/makefile p7zip_4.61/makefile +--- p7zip_4.61.orig/makefile 2008-11-30 16:49:38.000000000 +0100 ++++ p7zip_4.61/makefile 2008-12-23 16:28:49.215386938 +0100 +@@ -42,7 +42,6 @@ depend: cd CPP/7zip/UI/Console ; $(MAKE) depend + cd CPP/7zip/UI/GUI ; $(MAKE) depend cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) depend - cd CPP/7zip/Compress/Rar ; $(MAKE) depend sfx: common $(MKDIR) bin @@ -51,7 +50,6 @@ sfx: common + common7z:common $(MKDIR) bin/Codecs - cd CPP/7zip/UI/Console ; $(MAKE) all cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) all - cd CPP/7zip/Compress/Rar ; $(MAKE) all - clean: - cd CPP/myWindows ; $(MAKE) clean -@@ -61,7 +59,6 @@ clean: - cd CPP/7zip/UI/Client7z ; $(MAKE) clean - cd CPP/7zip/UI/Console ; $(MAKE) clean + 7z: common7z + cd CPP/7zip/UI/Console ; $(MAKE) all +@@ -71,7 +69,6 @@ clean: + cd CPP/7zip/UI/FileManager ; $(MAKE) clean + cd CPP/7zip/UI/GUI ; $(MAKE) clean cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) clean - cd CPP/7zip/Compress/Rar ; $(MAKE) clean cd CPP/7zip/Compress/LZMA_Alone ; $(MAKE) clean diff --git a/sources b/sources index 7712154..f458094 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -29d06b768154d114de31bedd1dfd57c8 p7zip_4.58_src_all-norar.tar.bz2 +3e787d5f0414f062c1834586c2562bd4 p7zip_4.61_src_all-norar.tar.bz2