diff --git a/.cvsignore b/.cvsignore
index c58b1c6..b82e31b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-p7zip_9.04_src_all-norar.tar.bz2
+p7zip_9.13_src_all-norar.tar.bz2
diff --git a/p7zip.spec b/p7zip.spec
index 3beebe9..c52aace 100644
--- a/p7zip.spec
+++ b/p7zip.spec
@@ -1,6 +1,6 @@
Summary: Very high compression ratio file archiver
Name: p7zip
-Version: 9.04
+Version: 9.13
Release: 1%{?dist}
# Files under C/Compress/Lzma/ are dual LGPL or CPL
License: LGPLv2 and (LGPLv2+ or CPL)
@@ -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_9.04-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,10 @@ 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.
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_9.04-norar.patch b/p7zip_9.13-norar.patch
similarity index 61%
rename from p7zip_9.04-norar.patch
rename to p7zip_9.13-norar.patch
index 1c8ced6..d1c1b77 100644
--- a/p7zip_9.04-norar.patch
+++ b/p7zip_9.13-norar.patch
@@ -1,7 +1,7 @@
-diff -Naupr p7zip_9.04.orig/CPP/7zip/Bundles/Format7zFree/makefile p7zip_9.04/CPP/7zip/Bundles/Format7zFree/makefile
---- p7zip_9.04.orig/CPP/7zip/Bundles/Format7zFree/makefile 2009-06-04 21:06:49.000000000 +0200
-+++ p7zip_9.04/CPP/7zip/Bundles/Format7zFree/makefile 2009-12-08 13:21:22.713559220 +0100
-@@ -150,14 +150,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 \
@@ -16,8 +16,8 @@ diff -Naupr p7zip_9.04.orig/CPP/7zip/Bundles/Format7zFree/makefile p7zip_9.04/CP
TAR_OBJS = \
TarHandler.o \
TarHandlerOut.o \
-@@ -233,13 +225,6 @@ COMPRESS_OBJS = \
- ZlibDecoder.o \
+@@ -241,13 +233,6 @@ COMPRESS_OBJS = \
+ ZlibEncoder.o \
ZDecoder.o \
-COMPRESS_OBJS_NON_FREE = \
@@ -30,7 +30,7 @@ diff -Naupr p7zip_9.04.orig/CPP/7zip/Bundles/Format7zFree/makefile p7zip_9.04/CP
CRYPTO_OBJS = \
7zAes.o \
7zAesRegister.o \
-@@ -247,8 +232,6 @@ CRYPTO_OBJS = \
+@@ -255,8 +240,6 @@ CRYPTO_OBJS = \
MyAes.o \
Pbkdf2HmacSha1.o \
RandGen.o \
@@ -39,7 +39,7 @@ diff -Naupr p7zip_9.04.orig/CPP/7zip/Bundles/Format7zFree/makefile p7zip_9.04/CP
Sha1.o \
WzAes.o \
ZipCrypto.o \
-@@ -298,7 +281,6 @@ OBJS = \
+@@ -312,7 +295,6 @@ OBJS = \
$(HFS_OBJS) \
$(ISO_OBJS) \
$(NSIS_OBJS) \
@@ -47,10 +47,10 @@ diff -Naupr p7zip_9.04.orig/CPP/7zip/Bundles/Format7zFree/makefile p7zip_9.04/CP
$(TAR_OBJS) \
$(UDF_OBJS) \
$(WIM_OBJS) \
-diff -Naupr p7zip_9.04.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_9.04/CPP/7zip/Bundles/Format7zFree/makefile.list
---- p7zip_9.04.orig/CPP/7zip/Bundles/Format7zFree/makefile.list 2009-06-04 21:01:21.000000000 +0200
-+++ p7zip_9.04/CPP/7zip/Bundles/Format7zFree/makefile.list 2009-12-08 13:21:52.858319619 +0100
-@@ -124,13 +124,6 @@ SRCS=\
+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 \
\
@@ -64,7 +64,7 @@ diff -Naupr p7zip_9.04.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_9.
../../Archive/Tar/TarHandler.cpp \
../../Archive/Tar/TarHandlerOut.cpp \
../../Archive/Tar/TarHeader.cpp \
-@@ -212,8 +205,6 @@ SRCS=\
+@@ -218,8 +211,6 @@ SRCS=\
../../Crypto/RandGen.cpp \
../../Crypto/Sha1.cpp \
../../Crypto/WzAes.cpp \
@@ -73,18 +73,18 @@ diff -Naupr p7zip_9.04.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_9.
../../Crypto/ZipCrypto.cpp \
../../Crypto/ZipStrong.cpp
-diff -Naupr p7zip_9.04.orig/makefile p7zip_9.04/makefile
---- p7zip_9.04.orig/makefile 2009-06-04 20:28:50.000000000 +0200
-+++ p7zip_9.04/makefile 2009-12-08 13:22:30.120194667 +0100
-@@ -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_9.04.orig/makefile p7zip_9.04/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 e4bb4dd..3fbc309 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8bc7e82ae226a77cd4c9bd8c30be1661 p7zip_9.04_src_all-norar.tar.bz2
+a5790ee20098763841ff87fefefb0ff3 p7zip_9.13_src_all-norar.tar.bz2