rpms/p7zip/devel p7zip_4.61-norar.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 p7zip.spec, 1.21, 1.22 sources, 1.11, 1.12 p7zip_4.58-norar.patch, 1.1, NONE

Matthias Saou thias at fedoraproject.org
Tue Dec 23 15:47:25 UTC 2008 

Author: thias

Update of /cvs/extras/rpms/p7zip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23439

Modified Files:
	.cvsignore p7zip.spec sources 
Added Files:
	p7zip_4.61-norar.patch 
Removed Files:
	p7zip_4.58-norar.patch 
Log Message:
Update to 4.61 and use asm for x86 too.


p7zip_4.61-norar.patch:

--- NEW FILE p7zip_4.61-norar.patch ---
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  \
-RarAES.o  \
-Rar20Cipher.o  \
-Rar20Crypto.o  \
 WzAES.o  \
 ZipCipher.o  \
 ZipCrypto.o  \
@@ -124,12 +121,6 @@ StreamUtils.o  \
 7zRegister.o  \
 7zSpecStream.o  \
 7zUpdate.o  \
-RarHandler.o  \
-RarHeader.o  \
-RarIn.o  \
-RarItem.o  \
-RarRegister.o  \
-RarVolumeInStream.o  \
 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 \
- ../../Compress/Rar/Rar1Decoder.cpp \
- ../../Compress/Rar/Rar2Decoder.cpp \
- ../../Compress/Rar/Rar3Decoder.cpp \
- ../../Compress/Rar/Rar3Vm.cpp \
- ../../Compress/Rar/RarCodecsRegister.cpp \
  ../../Compress/Implode/ImplodeDecoder.cpp \
  ../../Compress/Implode/ImplodeHuffmanDecoder.cpp \
  ../../Compress/Lzx/Lzx86Converter.cpp \
@@ -72,9 +67,6 @@ SRCS=\
  ../../Crypto/Hash/Pbkdf2HmacSha1.cpp \
  ../../Crypto/Hash/RandGen.cpp \
  ../../Crypto/Hash/Sha1.cpp \
- ../../Crypto/RarAES/RarAES.cpp \
- ../../Crypto/Rar20/Rar20Cipher.cpp \
- ../../Crypto/Rar20/Rar20Crypto.cpp \
  ../../Crypto/WzAES/WzAES.cpp \
  ../../Crypto/Zip/ZipCipher.cpp \
  ../../Crypto/Zip/ZipCrypto.cpp \
@@ -113,12 +105,6 @@ SRCS=\
  ../../Archive/7z/7zRegister.cpp \
  ../../Archive/7z/7zSpecStream.cpp \
  ../../Archive/7z/7zUpdate.cpp \
- ../../Archive/Rar/RarHandler.cpp \
- ../../Archive/Rar/RarHeader.cpp \
- ../../Archive/Rar/RarIn.cpp \
- ../../Archive/Rar/RarItem.cpp \
- ../../Archive/Rar/RarRegister.cpp \
- ../../Archive/Rar/RarVolumeInStream.cpp \
  ../../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
-Rar1Decoder.o : ../../Compress/Rar/Rar1Decoder.cpp
-	$(CXX) $(CC_SHARED) $(CFLAGS) ../../Compress/Rar/Rar1Decoder.cpp
-Rar2Decoder.o : ../../Compress/Rar/Rar2Decoder.cpp
-	$(CXX) $(CC_SHARED) $(CFLAGS) ../../Compress/Rar/Rar2Decoder.cpp
-Rar3Decoder.o : ../../Compress/Rar/Rar3Decoder.cpp
-	$(CXX) $(CC_SHARED) $(CFLAGS) ../../Compress/Rar/Rar3Decoder.cpp
-Rar3Vm.o : ../../Compress/Rar/Rar3Vm.cpp
-	$(CXX) $(CC_SHARED) $(CFLAGS) ../../Compress/Rar/Rar3Vm.cpp
-RarCodecsRegister.o : ../../Compress/Rar/RarCodecsRegister.cpp
-	$(CXX) $(CC_SHARED) $(CFLAGS) ../../Compress/Rar/RarCodecsRegister.cpp
 ImplodeDecoder.o : ../../Compress/Implode/ImplodeDecoder.cpp
 	$(CXX) $(CC_SHARED) $(CFLAGS) ../../Compress/Implode/ImplodeDecoder.cpp
 ImplodeHuffmanDecoder.o : ../../Compress/Implode/ImplodeHuffmanDecoder.cpp
@@ -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
-RarAES.o : ../../Crypto/RarAES/RarAES.cpp
-	$(CXX) $(CC_SHARED) $(CFLAGS) ../../Crypto/RarAES/RarAES.cpp
-Rar20Cipher.o : ../../Crypto/Rar20/Rar20Cipher.cpp
-	$(CXX) $(CC_SHARED) $(CFLAGS) ../../Crypto/Rar20/Rar20Cipher.cpp
-Rar20Crypto.o : ../../Crypto/Rar20/Rar20Crypto.cpp
-	$(CXX) $(CC_SHARED) $(CFLAGS) ../../Crypto/Rar20/Rar20Crypto.cpp
 WzAES.o : ../../Crypto/WzAES/WzAES.cpp
 	$(CXX) $(CC_SHARED) $(CFLAGS) ../../Crypto/WzAES/WzAES.cpp
 ZipCipher.o : ../../Crypto/Zip/ZipCipher.cpp
@@ -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
-RarHandler.o : ../../Archive/Rar/RarHandler.cpp
-	$(CXX) $(CC_SHARED) $(CFLAGS) ../../Archive/Rar/RarHandler.cpp
-RarHeader.o : ../../Archive/Rar/RarHeader.cpp
-	$(CXX) $(CC_SHARED) $(CFLAGS) ../../Archive/Rar/RarHeader.cpp
-RarIn.o : ../../Archive/Rar/RarIn.cpp
-	$(CXX) $(CC_SHARED) $(CFLAGS) ../../Archive/Rar/RarIn.cpp
-RarItem.o : ../../Archive/Rar/RarItem.cpp
-	$(CXX) $(CC_SHARED) $(CFLAGS) ../../Archive/Rar/RarItem.cpp
-RarRegister.o : ../../Archive/Rar/RarRegister.cpp
-	$(CXX) $(CC_SHARED) $(CFLAGS) ../../Archive/Rar/RarRegister.cpp
-RarVolumeInStream.o : ../../Archive/Rar/RarVolumeInStream.cpp
-	$(CXX) $(CC_SHARED) $(CFLAGS) ../../Archive/Rar/RarVolumeInStream.cpp
 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/Bundles/Format7zFree ; $(MAKE) all
-	cd CPP/7zip/Compress/Rar         ; $(MAKE) all
 
 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
 	cd CPP/7zip/Compress/PPMD_Alone  ; $(MAKE) clean
 	cd CPP/7zip/Bundles/AloneGCOV    ; $(MAKE) clean


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/p7zip/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	18 Jun 2008 12:17:47 -0000	1.11
+++ .cvsignore	23 Dec 2008 15:46:55 -0000	1.12
@@ -1 +1 @@
-p7zip_4.58_src_all-norar.tar.bz2
+p7zip_4.61_src_all-norar.tar.bz2


Index: p7zip.spec
===================================================================
RCS file: /cvs/extras/rpms/p7zip/devel/p7zip.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- p7zip.spec	18 Jun 2008 12:17:47 -0000	1.21
+++ p7zip.spec	23 Dec 2008 15:46:55 -0000	1.22
@@ -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 @@
 # 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 @@
 
 
 %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 @@
 
 
 %changelog
+* Tue Dec 23 2008 Matthias Saou <http://freshrpms.net/> 4.61-1
+- Update to 4.61.
+- Update norar patch.
+- Use asm for x86 too (nasm).
+
 * Wed Jun 18 2008 Matthias Saou <http://freshrpms.net/> 4.58-1
 - Update to 4.58.
 - Update norar patch.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/p7zip/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	18 Jun 2008 12:17:47 -0000	1.11
+++ sources	23 Dec 2008 15:46:55 -0000	1.12
@@ -1 +1 @@
-29d06b768154d114de31bedd1dfd57c8  p7zip_4.58_src_all-norar.tar.bz2
+3e787d5f0414f062c1834586c2562bd4  p7zip_4.61_src_all-norar.tar.bz2


--- p7zip_4.58-norar.patch DELETED ---

More information about the fedora-extras-commits mailing list