Update to 9.04.

.cvsignore

@@ -1 +1 @@
-p7zip_4.65_src_all-norar.tar.bz2
+p7zip_9.04_src_all-norar.tar.bz2

p7zip.spec

@@ -1,7 +1,7 @@
 Summary: Very high compression ratio file archiver
 Name: p7zip
-Version: 4.65
+Version: 9.04
-Release: 2%{?dist}
+Release: 1%{?dist}
 # Files under C/Compress/Lzma/ are dual LGPL or CPL
 License: LGPLv2 and (LGPLv2+ or CPL)
 Group: Applications/Archiving
@@ -15,7 +15,7 @@ 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.04-norar.patch
 Patch1: p7zip_4.58-install.patch
 Patch2: p7zip_4.51-nostrip.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -111,6 +111,10 @@ find contrib -type f -exec chmod -x {} \;
 
 
 %changelog
+* Tue Dec  8 2009 Matthias Saou <http://freshrpms.net/> 9.04-1
+- Update to 9.04.
+- Update norar patch.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.65-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 

p7zip_9.04-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
+diff -Naupr p7zip_9.04.orig/CPP/7zip/Bundles/Format7zFree/makefile p7zip_9.04/CPP/7zip/Bundles/Format7zFree/makefile
---- p7zip_4.65.orig/CPP/7zip/Bundles/Format7zFree/makefile	2009-02-09 21:47:24.000000000 +0100
+--- p7zip_9.04.orig/CPP/7zip/Bundles/Format7zFree/makefile	2009-06-04 21:06:49.000000000 +0200
-+++ p7zip_4.65/CPP/7zip/Bundles/Format7zFree/makefile	2009-04-12 20:47:44.973127047 +0200
++++ p7zip_9.04/CPP/7zip/Bundles/Format7zFree/makefile	2009-12-08 13:21:22.713559220 +0100
-@@ -172,14 +172,6 @@ NSIS_OBJS = \
+@@ -150,14 +150,6 @@ NSIS_OBJS = \
    NsisIn.o \
    NsisRegister.o \
  
@@ -13,10 +13,10 @@ diff -Naupr p7zip_4.65.orig/CPP/7zip/Bundles/Format7zFree/makefile p7zip_4.65/CP
 -  RarVolumeInStream.o \
 -  RarRegister.o \
 -
- # SplitHandlerOut.o
+ TAR_OBJS = \
- SPLIT_OBJS = \
+   TarHandler.o \
-   SplitHandler.o \
+   TarHandlerOut.o \
-@@ -257,13 +249,6 @@ COMPRESS_OBJS = \
+@@ -233,13 +225,6 @@ COMPRESS_OBJS = \
    ZlibDecoder.o \
    ZDecoder.o \
  
@@ -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 = \
+@@ -247,8 +232,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 = \
+@@ -298,7 +281,6 @@ OBJS = \
-   $(LZH_OBJS) \
+   $(HFS_OBJS) \
-   $(LZM_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
+   $(WIM_OBJS) \
---- p7zip_4.65.orig/CPP/7zip/Bundles/Format7zFree/makefile.list	2009-02-09 21:04:32.000000000 +0100
+diff -Naupr p7zip_9.04.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_9.04/CPP/7zip/Bundles/Format7zFree/makefile.list
-+++ p7zip_4.65/CPP/7zip/Bundles/Format7zFree/makefile.list	2009-04-12 20:47:04.713126284 +0200
+--- p7zip_9.04.orig/CPP/7zip/Bundles/Format7zFree/makefile.list	2009-06-04 21:01:21.000000000 +0200
-@@ -141,13 +141,6 @@ SRCS=\
++++ p7zip_9.04/CPP/7zip/Bundles/Format7zFree/makefile.list	2009-12-08 13:21:52.858319619 +0100
+@@ -124,13 +124,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/Tar/TarHandler.cpp \
-  ../../Archive/Split/SplitRegister.cpp \
+  ../../Archive/Tar/TarHandlerOut.cpp \
-  \
+  ../../Archive/Tar/TarHeader.cpp \
-@@ -229,8 +222,6 @@ SRCS=\
+@@ -212,8 +205,6 @@ SRCS=\
   ../../Crypto/RandGen.cpp \
   ../../Crypto/Sha1.cpp \
   ../../Crypto/WzAes.cpp \
@@ -73,9 +73,9 @@ 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
+diff -Naupr p7zip_9.04.orig/makefile p7zip_9.04/makefile
---- p7zip_4.65.orig/makefile	2009-02-14 17:03:50.000000000 +0100
+--- p7zip_9.04.orig/makefile	2009-06-04 20:28:50.000000000 +0200
-+++ p7zip_4.65/makefile	2009-04-12 20:48:21.342256593 +0200
++++ p7zip_9.04/makefile	2009-12-08 13:22:30.120194667 +0100
 @@ -41,7 +41,6 @@ depend:
  	cd CPP/7zip/UI/Client7z       ; $(MAKE) depend
  	cd CPP/7zip/UI/Console        ; $(MAKE) depend

sources

@@ -1 +1 @@
-41e748eccdf42d1cc7f84d22c6fb815b  p7zip_4.65_src_all-norar.tar.bz2
+8bc7e82ae226a77cd4c9bd8c30be1661  p7zip_9.04_src_all-norar.tar.bz2