From 6977bf030ac0916bc495709da5cbb98c84dac5a0 Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Mon, 12 Jul 2010 08:46:57 +0000 Subject: [PATCH] Update to 9.13. --- .cvsignore | 2 +- p7zip.spec | 16 +++-- p7zip_4.51-nostrip.patch | 24 -------- ...4.65-norar.patch => p7zip_9.13-norar.patch | 60 +++++++++---------- p7zip_9.13-nostrip.patch | 36 +++++++++++ sources | 2 +- 6 files changed, 80 insertions(+), 60 deletions(-) delete mode 100644 p7zip_4.51-nostrip.patch rename p7zip_4.65-norar.patch => p7zip_9.13-norar.patch (55%) create mode 100644 p7zip_9.13-nostrip.patch diff --git a/.cvsignore b/.cvsignore index a356442..b82e31b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -p7zip_4.65_src_all-norar.tar.bz2 +p7zip_9.13_src_all-norar.tar.bz2 diff --git a/p7zip.spec b/p7zip.spec index 329c7c6..c52aace 100644 --- a/p7zip.spec +++ b/p7zip.spec @@ -1,7 +1,7 @@ Summary: Very high compression ratio file archiver Name: p7zip -Version: 4.65 -Release: 2%{?dist} +Version: 9.13 +Release: 1%{?dist} # Files under C/Compress/Lzma/ are dual LGPL or CPL License: LGPLv2 and (LGPLv2+ or CPL) Group: Applications/Archiving @@ -15,9 +15,9 @@ 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.65-norar.patch +Patch0: p7zip_9.13-norar.patch Patch1: p7zip_4.58-install.patch -Patch2: p7zip_4.51-nostrip.patch +Patch2: p7zip_9.13-nostrip.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root %ifarch %{ix86} BuildRequires: nasm @@ -111,6 +111,14 @@ find contrib -type f -exec chmod -x {} \; %changelog +* Thu Jul 8 2010 Matthias Saou 9.13-1 +- Update to 9.13. +- Update norar and nostrip patches. + +* Tue Dec 8 2009 Matthias Saou 9.04-1 +- Update to 9.04. +- Update norar patch. + * Sat Jul 25 2009 Fedora Release Engineering - 4.65-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/p7zip_4.51-nostrip.patch b/p7zip_4.51-nostrip.patch deleted file mode 100644 index c7379d0..0000000 --- a/p7zip_4.51-nostrip.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naupr p7zip_4.51.orig/makefile.linux_amd64_asm p7zip_4.51/makefile.linux_amd64_asm ---- p7zip_4.51.orig/makefile.linux_amd64_asm 2007-06-28 09:32:30.000000000 +0200 -+++ p7zip_4.51/makefile.linux_amd64_asm 2007-08-05 17:52:20.000000000 +0200 -@@ -2,7 +2,7 @@ - OPTFLAGS=-O - - # use "-m32" to have a 32bits executable --ALLFLAGS=-m64 ${OPTFLAGS} -s \ -+ALLFLAGS=-m64 ${OPTFLAGS} \ - -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ - -DNDEBUG -D_REENTRANT -DENV_UNIX \ - $(LOCAL_FLAGS) -diff -Naupr p7zip_4.51.orig/makefile.linux_x86_ppc_alpha_gcc_4.X p7zip_4.51/makefile.linux_x86_ppc_alpha_gcc_4.X ---- p7zip_4.51.orig/makefile.linux_x86_ppc_alpha_gcc_4.X 2007-06-28 09:33:43.000000000 +0200 -+++ p7zip_4.51/makefile.linux_x86_ppc_alpha_gcc_4.X 2007-08-05 17:52:45.000000000 +0200 -@@ -5,7 +5,7 @@ - - OPTFLAGS=-O - --ALLFLAGS=${OPTFLAGS} -s \ -+ALLFLAGS=${OPTFLAGS} \ - -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ - -DNDEBUG -D_REENTRANT -DENV_UNIX \ - $(LOCAL_FLAGS) diff --git a/p7zip_4.65-norar.patch b/p7zip_9.13-norar.patch similarity index 55% rename from p7zip_4.65-norar.patch rename to p7zip_9.13-norar.patch index fefca4b..d1c1b77 100644 --- a/p7zip_4.65-norar.patch +++ b/p7zip_9.13-norar.patch @@ -1,7 +1,7 @@ -diff -Naupr p7zip_4.65.orig/CPP/7zip/Bundles/Format7zFree/makefile p7zip_4.65/CPP/7zip/Bundles/Format7zFree/makefile ---- p7zip_4.65.orig/CPP/7zip/Bundles/Format7zFree/makefile 2009-02-09 21:47:24.000000000 +0100 -+++ p7zip_4.65/CPP/7zip/Bundles/Format7zFree/makefile 2009-04-12 20:47:44.973127047 +0200 -@@ -172,14 +172,6 @@ NSIS_OBJS = \ +diff -Naupr --exclude='*.orig' p7zip_9.13.orig/CPP/7zip/Bundles/Format7zFree/makefile p7zip_9.13/CPP/7zip/Bundles/Format7zFree/makefile +--- p7zip_9.13.orig/CPP/7zip/Bundles/Format7zFree/makefile 2010-03-16 20:49:21.000000000 +0100 ++++ p7zip_9.13/CPP/7zip/Bundles/Format7zFree/makefile 2010-07-08 14:10:34.309397353 +0200 +@@ -156,14 +156,6 @@ NSIS_OBJS = \ NsisIn.o \ NsisRegister.o \ @@ -13,11 +13,11 @@ diff -Naupr p7zip_4.65.orig/CPP/7zip/Bundles/Format7zFree/makefile p7zip_4.65/CP - RarVolumeInStream.o \ - RarRegister.o \ - - # SplitHandlerOut.o - SPLIT_OBJS = \ - SplitHandler.o \ -@@ -257,13 +249,6 @@ COMPRESS_OBJS = \ - ZlibDecoder.o \ + TAR_OBJS = \ + TarHandler.o \ + TarHandlerOut.o \ +@@ -241,13 +233,6 @@ COMPRESS_OBJS = \ + ZlibEncoder.o \ ZDecoder.o \ -COMPRESS_OBJS_NON_FREE = \ @@ -30,7 +30,7 @@ diff -Naupr p7zip_4.65.orig/CPP/7zip/Bundles/Format7zFree/makefile p7zip_4.65/CP CRYPTO_OBJS = \ 7zAes.o \ 7zAesRegister.o \ -@@ -271,8 +256,6 @@ CRYPTO_OBJS = \ +@@ -255,8 +240,6 @@ CRYPTO_OBJS = \ MyAes.o \ Pbkdf2HmacSha1.o \ RandGen.o \ @@ -39,18 +39,18 @@ diff -Naupr p7zip_4.65.orig/CPP/7zip/Bundles/Format7zFree/makefile p7zip_4.65/CP Sha1.o \ WzAes.o \ ZipCrypto.o \ -@@ -315,7 +298,6 @@ OBJS = \ - $(LZH_OBJS) \ - $(LZM_OBJS) \ +@@ -312,7 +295,6 @@ OBJS = \ + $(HFS_OBJS) \ + $(ISO_OBJS) \ $(NSIS_OBJS) \ - $(RAR_OBJS) \ - $(SPLIT_OBJS) \ $(TAR_OBJS) \ $(UDF_OBJS) \ -diff -Naupr p7zip_4.65.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_4.65/CPP/7zip/Bundles/Format7zFree/makefile.list ---- p7zip_4.65.orig/CPP/7zip/Bundles/Format7zFree/makefile.list 2009-02-09 21:04:32.000000000 +0100 -+++ p7zip_4.65/CPP/7zip/Bundles/Format7zFree/makefile.list 2009-04-12 20:47:04.713126284 +0200 -@@ -141,13 +141,6 @@ SRCS=\ + $(WIM_OBJS) \ +diff -Naupr --exclude='*.orig' p7zip_9.13.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_9.13/CPP/7zip/Bundles/Format7zFree/makefile.list +--- p7zip_9.13.orig/CPP/7zip/Bundles/Format7zFree/makefile.list 2010-03-16 20:50:11.000000000 +0100 ++++ p7zip_9.13/CPP/7zip/Bundles/Format7zFree/makefile.list 2010-07-08 14:10:34.325397501 +0200 +@@ -131,13 +131,6 @@ SRCS=\ ../../Archive/Nsis/NsisIn.cpp \ ../../Archive/Nsis/NsisRegister.cpp \ \ @@ -61,10 +61,10 @@ diff -Naupr p7zip_4.65.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_4. - ../../Archive/Rar/RarVolumeInStream.cpp \ - ../../Archive/Rar/RarRegister.cpp \ - \ - ../../Archive/Split/SplitHandler.cpp \ - ../../Archive/Split/SplitRegister.cpp \ - \ -@@ -229,8 +222,6 @@ SRCS=\ + ../../Archive/Tar/TarHandler.cpp \ + ../../Archive/Tar/TarHandlerOut.cpp \ + ../../Archive/Tar/TarHeader.cpp \ +@@ -218,8 +211,6 @@ SRCS=\ ../../Crypto/RandGen.cpp \ ../../Crypto/Sha1.cpp \ ../../Crypto/WzAes.cpp \ @@ -73,18 +73,18 @@ diff -Naupr p7zip_4.65.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_4. ../../Crypto/ZipCrypto.cpp \ ../../Crypto/ZipStrong.cpp -diff -Naupr p7zip_4.65.orig/makefile p7zip_4.65/makefile ---- p7zip_4.65.orig/makefile 2009-02-14 17:03:50.000000000 +0100 -+++ p7zip_4.65/makefile 2009-04-12 20:48:21.342256593 +0200 -@@ -41,7 +41,6 @@ depend: +diff -Naupr --exclude='*.orig' p7zip_9.13.orig/makefile p7zip_9.13/makefile +--- p7zip_9.13.orig/makefile 2010-04-04 21:12:39.000000000 +0200 ++++ p7zip_9.13/makefile 2010-07-08 14:10:34.326397745 +0200 +@@ -52,7 +52,6 @@ depend: cd CPP/7zip/UI/Client7z ; $(MAKE) depend cd CPP/7zip/UI/Console ; $(MAKE) depend cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) depend - cd CPP/7zip/Compress/Rar ; $(MAKE) depend cd CPP/7zip/UI/GUI ; $(MAKE) depend + cd CPP/7zip/UI/FileManager ; $(MAKE) depend - sfx: common -@@ -51,7 +50,6 @@ sfx: common +@@ -63,7 +62,6 @@ sfx: common common7z:common $(MKDIR) bin/Codecs cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) all @@ -92,11 +92,11 @@ diff -Naupr p7zip_4.65.orig/makefile p7zip_4.65/makefile 7z: common7z cd CPP/7zip/UI/Console ; $(MAKE) all -@@ -71,7 +69,6 @@ clean: +@@ -88,7 +86,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 - cd CPP/7zip/Compress/PPMD_Alone ; $(MAKE) clean cd CPP/7zip/Bundles/AloneGCOV ; $(MAKE) clean + cd CPP/7zip/TEST/TestUI ; $(MAKE) clean diff --git a/p7zip_9.13-nostrip.patch b/p7zip_9.13-nostrip.patch new file mode 100644 index 0000000..93c2585 --- /dev/null +++ b/p7zip_9.13-nostrip.patch @@ -0,0 +1,36 @@ +diff -Naupr p7zip_9.13.orig/makefile.linux_amd64_asm p7zip_9.13/makefile.linux_amd64_asm +--- p7zip_9.13.orig/makefile.linux_amd64_asm 2009-12-22 19:11:03.000000000 +0100 ++++ p7zip_9.13/makefile.linux_amd64_asm 2010-07-08 14:12:33.197398954 +0200 +@@ -2,7 +2,7 @@ + OPTFLAGS=-O + + # use "-m32" to have a 32bits executable +-ALLFLAGS=-m64 ${OPTFLAGS} -pipe -s \ ++ALLFLAGS=-m64 ${OPTFLAGS} -pipe \ + -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ + -DNDEBUG -D_REENTRANT -DENV_UNIX \ + -D_7ZIP_LARGE_PAGES \ +diff -Naupr p7zip_9.13.orig/makefile.linux_x86_asm_gcc_4.X p7zip_9.13/makefile.linux_x86_asm_gcc_4.X +--- p7zip_9.13.orig/makefile.linux_x86_asm_gcc_4.X 2009-12-22 19:12:54.000000000 +0100 ++++ p7zip_9.13/makefile.linux_x86_asm_gcc_4.X 2010-07-08 14:13:36.185397479 +0200 +@@ -4,7 +4,7 @@ + + OPTFLAGS=-O + +-ALLFLAGS=${OPTFLAGS} -pipe -m32 -s \ ++ALLFLAGS=${OPTFLAGS} -pipe -m32 \ + -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ + -DNDEBUG -D_REENTRANT -DENV_UNIX \ + -D_7ZIP_LARGE_PAGES \ +diff -Naupr p7zip_9.13.orig/makefile.linux_x86_ppc_alpha_gcc_4.X p7zip_9.13/makefile.linux_x86_ppc_alpha_gcc_4.X +--- p7zip_9.13.orig/makefile.linux_x86_ppc_alpha_gcc_4.X 2009-12-22 19:13:27.000000000 +0100 ++++ p7zip_9.13/makefile.linux_x86_ppc_alpha_gcc_4.X 2010-07-08 14:13:49.211397922 +0200 +@@ -4,7 +4,7 @@ + + OPTFLAGS=-O + +-ALLFLAGS=${OPTFLAGS} -pipe -s \ ++ALLFLAGS=${OPTFLAGS} -pipe \ + -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ + -DNDEBUG -D_REENTRANT -DENV_UNIX \ + -D_7ZIP_LARGE_PAGES \ diff --git a/sources b/sources index b712885..3fbc309 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -41e748eccdf42d1cc7f84d22c6fb815b p7zip_4.65_src_all-norar.tar.bz2 +a5790ee20098763841ff87fefefb0ff3 p7zip_9.13_src_all-norar.tar.bz2