rpms/p7zip/devel p7zip_9.04-norar.patch, NONE, 1.1 .cvsignore, 1.13, 1.14 p7zip.spec, 1.25, 1.26 sources, 1.13, 1.14 p7zip_4.65-norar.patch, 1.1, NONE
Matthias Saou
thias at fedoraproject.org
Tue Dec 8 12:28:00 UTC 2009
Author: thias
Update of /cvs/extras/rpms/p7zip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11855
Modified Files:
.cvsignore p7zip.spec sources
Added Files:
p7zip_9.04-norar.patch
Removed Files:
p7zip_4.65-norar.patch
Log Message:
Update to 9.04.
p7zip_9.04-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.04-norar.patch ---
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 = \
NsisIn.o \
NsisRegister.o \
-RAR_OBJS = \
- RarHandler.o \
- RarHeader.o \
- RarIn.o \
- RarItem.o \
- RarVolumeInStream.o \
- RarRegister.o \
-
TAR_OBJS = \
TarHandler.o \
TarHandlerOut.o \
@@ -233,13 +225,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 \
@@ -247,8 +232,6 @@ CRYPTO_OBJS = \
MyAes.o \
Pbkdf2HmacSha1.o \
RandGen.o \
- Rar20Crypto.o \
- RarAes.o \
Sha1.o \
WzAes.o \
ZipCrypto.o \
@@ -298,7 +281,6 @@ OBJS = \
$(HFS_OBJS) \
$(ISO_OBJS) \
$(NSIS_OBJS) \
- $(RAR_OBJS) \
$(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=\
../../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 \
@@ -212,8 +205,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_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:
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.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore 12 Apr 2009 18:58:38 -0000 1.13
+++ .cvsignore 8 Dec 2009 12:28:00 -0000 1.14
@@ -1 +1 @@
-p7zip_4.65_src_all-norar.tar.bz2
+p7zip_9.04_src_all-norar.tar.bz2
Index: p7zip.spec
===================================================================
RCS file: /cvs/extras/rpms/p7zip/devel/p7zip.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- p7zip.spec 25 Jul 2009 21:04:04 -0000 1.25
+++ p7zip.spec 8 Dec 2009 12:28:00 -0000 1.26
@@ -1,7 +1,7 @@
Summary: Very high compression ratio file archiver
Name: p7zip
-Version: 4.65
-Release: 2%{?dist}
+Version: 9.04
+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 at lists.fedoraproject.org> - 4.65-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/p7zip/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources 12 Apr 2009 18:58:38 -0000 1.13
+++ sources 8 Dec 2009 12:28:00 -0000 1.14
@@ -1 +1 @@
-41e748eccdf42d1cc7f84d22c6fb815b p7zip_4.65_src_all-norar.tar.bz2
+8bc7e82ae226a77cd4c9bd8c30be1661 p7zip_9.04_src_all-norar.tar.bz2
--- p7zip_4.65-norar.patch DELETED ---
More information about the fedora-extras-commits
mailing list