rpms/p7zip/devel p7zip_9.13-norar.patch, NONE, 1.1 p7zip_9.13-nostrip.patch, NONE, 1.1 p7zip.spec, 1.26, 1.27 p7zip_4.51-nostrip.patch, 1.1, NONE p7zip_9.04-norar.patch, 1.1, NONE

Matthias Saou thias at fedoraproject.org
Thu Jul 8 12:30:52 UTC 2010


Author: thias

Update of /cvs/extras/rpms/p7zip/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv511

Modified Files:
	p7zip.spec 
Added Files:
	p7zip_9.13-norar.patch p7zip_9.13-nostrip.patch 
Removed Files:
	p7zip_4.51-nostrip.patch p7zip_9.04-norar.patch 
Log Message:
Update to 9.13.


p7zip_9.13-norar.patch:
 CPP/7zip/Bundles/Format7zFree/makefile      |   18 ------------------
 CPP/7zip/Bundles/Format7zFree/makefile.list |    9 ---------
 makefile                                    |    3 ---
 3 files changed, 30 deletions(-)

--- NEW FILE p7zip_9.13-norar.patch ---
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 \
 
-RAR_OBJS = \
-  RarHandler.o \
-  RarHeader.o \
-  RarIn.o \
-  RarItem.o \
-  RarVolumeInStream.o \
-  RarRegister.o \
-
 TAR_OBJS = \
   TarHandler.o \
   TarHandlerOut.o \
@@ -241,13 +233,6 @@ COMPRESS_OBJS = \
   ZlibEncoder.o \
   ZDecoder.o \
 
-COMPRESS_OBJS_NON_FREE = \
-  Rar1Decoder.o \
-  Rar2Decoder.o \
-  Rar3Decoder.o \
-  Rar3Vm.o \
-  RarCodecsRegister.o \
-
 CRYPTO_OBJS = \
   7zAes.o \
   7zAesRegister.o \
@@ -255,8 +240,6 @@ CRYPTO_OBJS = \
   MyAes.o \
   Pbkdf2HmacSha1.o \
   RandGen.o \
-  Rar20Crypto.o \
-  RarAes.o \
   Sha1.o \
   WzAes.o \
   ZipCrypto.o \
@@ -312,7 +295,6 @@ OBJS = \
   $(HFS_OBJS) \
   $(ISO_OBJS) \
   $(NSIS_OBJS) \
-  $(RAR_OBJS) \
   $(TAR_OBJS) \
   $(UDF_OBJS) \
   $(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 \
  \
- ../../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/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 \
- ../../Crypto/Rar20Crypto.cpp \
- ../../Crypto/RarAes.cpp \
  ../../Crypto/ZipCrypto.cpp \
  ../../Crypto/ZipStrong.cpp
 
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
 
@@ -63,7 +62,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
@@ -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/Bundles/AloneGCOV    ; $(MAKE) clean
 	cd CPP/7zip/TEST/TestUI          ; $(MAKE) clean

p7zip_9.13-nostrip.patch:
 makefile.linux_amd64_asm             |    2 +-
 makefile.linux_x86_asm_gcc_4.X       |    2 +-
 makefile.linux_x86_ppc_alpha_gcc_4.X |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE p7zip_9.13-nostrip.patch ---
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 \


Index: p7zip.spec
===================================================================
RCS file: /cvs/extras/rpms/p7zip/devel/p7zip.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- p7zip.spec	8 Dec 2009 12:28:00 -0000	1.26
+++ p7zip.spec	8 Jul 2010 12:30:51 -0000	1.27
@@ -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 <http://freshrpms.net/> 9.13-1
+- Update to 9.13.
+- Update norar and nostrip patches.
+
 * Tue Dec  8 2009 Matthias Saou <http://freshrpms.net/> 9.04-1
 - Update to 9.04.
 - Update norar patch.


--- p7zip_4.51-nostrip.patch DELETED ---


--- p7zip_9.04-norar.patch DELETED ---



More information about the scm-commits mailing list