rpms/p7zip/devel p7zip_4.65-norar.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 p7zip.spec, 1.23, 1.24 sources, 1.12, 1.13 p7zip_4.61-norar.patch, 1.1, NONE

Sun Apr 12 18:59:09 UTC 2009

Author: thias

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

Modified Files:
	.cvsignore p7zip.spec sources 
Added Files:
	p7zip_4.65-norar.patch 
Removed Files:
	p7zip_4.61-norar.patch 
Log Message:
Update to 4.65.


p7zip_4.65-norar.patch:

--- NEW FILE p7zip_4.65-norar.patch ---
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 = \
   NsisIn.o \
   NsisRegister.o \
 
-RAR_OBJS = \
-  RarHandler.o \
-  RarHeader.o \
-  RarIn.o \
-  RarItem.o \
-  RarVolumeInStream.o \
-  RarRegister.o \
-
 # SplitHandlerOut.o
 SPLIT_OBJS = \
   SplitHandler.o \
@@ -257,13 +249,6 @@ COMPRESS_OBJS = \
   ZlibDecoder.o \
   ZDecoder.o \
 
-COMPRESS_OBJS_NON_FREE = \
-  Rar1Decoder.o \
-  Rar2Decoder.o \
-  Rar3Decoder.o \
-  Rar3Vm.o \
-  RarCodecsRegister.o \
-
 CRYPTO_OBJS = \
   7zAes.o \
   7zAesRegister.o \
@@ -271,8 +256,6 @@ CRYPTO_OBJS = \
   MyAes.o \
   Pbkdf2HmacSha1.o \
   RandGen.o \
-  Rar20Crypto.o \
-  RarAes.o \
   Sha1.o \
   WzAes.o \
   ZipCrypto.o \
@@ -315,7 +298,6 @@ OBJS = \
   $(LZH_OBJS) \
   $(LZM_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=\
  ../../Archive/Nsis/NsisIn.cpp \
  ../../Archive/Nsis/NsisRegister.cpp \
  \
- ../../Archive/Rar/RarHandler.cpp \
- ../../Archive/Rar/RarHeader.cpp \
- ../../Archive/Rar/RarIn.cpp \
- ../../Archive/Rar/RarItem.cpp \
- ../../Archive/Rar/RarVolumeInStream.cpp \
- ../../Archive/Rar/RarRegister.cpp \
- \
  ../../Archive/Split/SplitHandler.cpp \
  ../../Archive/Split/SplitRegister.cpp \
  \
@@ -229,8 +222,6 @@ SRCS=\
  ../../Crypto/RandGen.cpp \
  ../../Crypto/Sha1.cpp \
  ../../Crypto/WzAes.cpp \
- ../../Crypto/Rar20Crypto.cpp \
- ../../Crypto/RarAes.cpp \
  ../../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:
 	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
 
 sfx: common
@@ -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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	23 Dec 2008 15:46:55 -0000	1.12
+++ .cvsignore	12 Apr 2009 18:58:38 -0000	1.13
@@ -1 +1 @@
-p7zip_4.61_src_all-norar.tar.bz2
+p7zip_4.65_src_all-norar.tar.bz2


Index: p7zip.spec
===================================================================
RCS file: /cvs/extras/rpms/p7zip/devel/p7zip.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- p7zip.spec	26 Feb 2009 09:18:57 -0000	1.23
+++ p7zip.spec	12 Apr 2009 18:58:38 -0000	1.24
@@ -1,20 +1,21 @@
 Summary: Very high compression ratio file archiver
 Name: p7zip
-Version: 4.61
-Release: 2%{?dist}
+Version: 4.65
+Release: 1%{?dist}
 # Files under C/Compress/Lzma/ are dual LGPL or CPL
 License: LGPLv2 and (LGPLv2+ or CPL)
 Group: Applications/Archiving
 URL: http://p7zip.sourceforge.net/
 # RAR sources removed since their license is incompatible with the LGPL
-#Source: http://dl.sf.net/p7zip/p7zip_%{version}_src_all.tar.bz2
+#Source: http://downloads.sf.net/p7zip/p7zip_%{version}_src_all.tar.bz2
 # VERSION=
+# wget http://downloads.sf.net/p7zip/p7zip_${VERSION}_src_all.tar.bz2
 # tar xjvf p7zip_${VERSION}_src_all.tar.bz2
 # rm -rf p7zip_${VERSION}/CPP/7zip/{Archive,Compress,Crypto}/Rar*
 # 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.61-norar.patch
+Patch0: p7zip_4.65-norar.patch
 Patch1: p7zip_4.58-install.patch
 Patch2: p7zip_4.51-nostrip.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -110,7 +111,11 @@
 
 
 %changelog
-* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.61-2
+* Sun Apr 12 2009 Matthias Saou <http://freshrpms.net/> 4.65-1
+- Update to 4.65.
+- Update norar patch.
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Tue Dec 23 2008 Matthias Saou <http://freshrpms.net/> 4.61-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/p7zip/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	23 Dec 2008 15:46:55 -0000	1.12
+++ sources	12 Apr 2009 18:58:38 -0000	1.13
@@ -1 +1 @@
-3e787d5f0414f062c1834586c2562bd4  p7zip_4.61_src_all-norar.tar.bz2
+41e748eccdf42d1cc7f84d22c6fb815b  p7zip_4.65_src_all-norar.tar.bz2


--- p7zip_4.61-norar.patch DELETED ---


