Update to 4.39 and remove all Rar-related files since their license is not

acceptable for inclusion in Fedora.

.cvsignore

@@ -1 +1 @@
-p7zip_4.30_src_all.tar.bz2
+p7zip_4.39_src_all-norar.tar.bz2

p7zip.spec

@@ -1,14 +1,19 @@
 Summary: Very high compression ratio file archiver
 Name: p7zip
-Version: 4.30
+Version: 4.39
-Release: 3%{?dist}
+Release: 1%{?dist}
 License: LGPL
 Group: Applications/Archiving
 URL: http://p7zip.sourceforge.net/
-Source: http://dl.sf.net/p7zip/p7zip_%{version}_src_all.tar.bz2
+# RAR sources removed since their license is incompatible with the LGPL
-Patch0: p7zip_4.30-extraqualif.patch
+#Source: http://dl.sf.net/p7zip/p7zip_%{version}_src_all.tar.bz2
+# VERSION=
+# tar xjvf p7zip_${VERSION}_src_all.tar.bz2
+# rm -rf p7zip_${VERSION}/7zip/{Archive,Compress,Crypto}/Rar*
+# rm -f p7zip_${VERSION}/DOCS/unRarLicense.txt
+# tar cjvf p7zip_${VERSION}_src_all-norar.tar.bz2 p7zip_${VERSION}
+Source: p7zip_%{version}_src_all-norar.tar.bz2
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: gcc-c++
 
 %description
 p7zip is a port of 7za.exe for Unix. 7-Zip is a file archiver with a very high
@@ -27,7 +32,6 @@ This package contains also a virtual file system for Midnight Commander.
 
 %prep
 %setup -n %{name}_%{version}
-%patch0 -p1 -b .extraqualif
 
 # Create wrapper scripts, as 7zCon.sfx and Codecs/Formats need to be in the
 # same directory as the binaries, and we don't want them in %{_bindir}.
@@ -44,7 +48,7 @@ EOF
 
 %build
 %ifarch %{ix86} ppc
-%{__cp} -f makefile.linux_x86_ppc_alpha makefile.machine
+%{__cp} -f makefile.linux_x86_ppc_alpha__gcc_4.X makefile.machine
 %endif
 %ifarch x86_64
 %{__cp} -f makefile.linux_amd64 makefile.machine
@@ -90,6 +94,12 @@ EOF
 
 
 %changelog
+* Tue May  2 2006 Matthias Saou <http://freshrpms.net/> 4.39-1
+- Update to 4.39.
+- Remove no longer needed gcc 4.1 patch.
+- Use the gcc_4.X makefile.
+- Remove RAR licensed files and RAR license itself (#190277).
+
 * Mon Mar  6 2006 Matthias Saou <http://freshrpms.net/> 4.30-3
 - FC5 rebuild.
 

p7zip_4.30-extraqualif.patch

@@ -1,91 +0,0 @@
-diff -Naupr p7zip_4.30.orig/7zip/Archive/7z/7zIn.h p7zip_4.30/7zip/Archive/7z/7zIn.h
---- p7zip_4.30.orig/7zip/Archive/7z/7zIn.h	2005-09-22 19:53:23.000000000 +0200
-+++ p7zip_4.30/7zip/Archive/7z/7zIn.h	2006-02-09 17:25:37.000000000 +0100
-@@ -244,7 +244,7 @@ private:
-       CRecordVector<bool> &digestsDefined, 
-       CRecordVector<UInt32> &digests);
- 
--  HRESULT CInArchive::ReadStreamsInfo(
-+  HRESULT ReadStreamsInfo(
-       const CObjectVector<CByteBuffer> *dataVector,
-       UInt64 &dataOffset,
-       CRecordVector<UInt64> &packSizes,
-diff -Naupr p7zip_4.30.orig/7zip/Compress/Arj/ArjDecoder1.h p7zip_4.30/7zip/Compress/Arj/ArjDecoder1.h
---- p7zip_4.30.orig/7zip/Compress/Arj/ArjDecoder1.h	2005-09-22 19:53:21.000000000 +0200
-+++ p7zip_4.30/7zip/Compress/Arj/ArjDecoder1.h	2006-02-09 17:30:32.000000000 +0100
-@@ -58,7 +58,7 @@ class CCoder :
-   UInt32 c_table[CTABLESIZE];
-   UInt32 pt_table[PTABLESIZE];
-   
--  void CCoder::ReleaseStreams()
-+  void ReleaseStreams()
-   {
-     m_OutWindowStream.ReleaseStream();
-     m_InBitStream.ReleaseStream();
-diff -Naupr p7zip_4.30.orig/7zip/Compress/Arj/ArjDecoder2.h p7zip_4.30/7zip/Compress/Arj/ArjDecoder2.h
---- p7zip_4.30.orig/7zip/Compress/Arj/ArjDecoder2.h	2005-09-22 19:53:21.000000000 +0200
-+++ p7zip_4.30/7zip/Compress/Arj/ArjDecoder2.h	2006-02-09 17:27:38.000000000 +0100
-@@ -26,7 +26,7 @@ class CCoder :
-   CLZOutWindow m_OutWindowStream;
-   NStream::NMSBF::CDecoder<CInBuffer> m_InBitStream;
-   
--  void CCoder::ReleaseStreams()
-+  void ReleaseStreams()
-   {
-     m_OutWindowStream.ReleaseStream();
-     m_InBitStream.ReleaseStream();
-@@ -62,4 +62,4 @@ public:
- 
- }}}
- 
--#endif
-\ No newline at end of file
-+#endif
-diff -Naupr p7zip_4.30.orig/7zip/Compress/Deflate/DeflateDecoder.h p7zip_4.30/7zip/Compress/Deflate/DeflateDecoder.h
---- p7zip_4.30.orig/7zip/Compress/Deflate/DeflateDecoder.h	2005-09-22 19:53:20.000000000 +0200
-+++ p7zip_4.30/7zip/Compress/Deflate/DeflateDecoder.h	2006-02-09 17:23:19.000000000 +0100
-@@ -60,7 +60,7 @@ class CCoder:
-   void DeCodeLevelTable(Byte *newLevels, int numLevels);
-   bool ReadTables();
-   
--  void CCoder::ReleaseStreams()
-+  void ReleaseStreams()
-   {
-     m_OutWindowStream.ReleaseStream();
-     ReleaseInStream();
-diff -Naupr p7zip_4.30.orig/7zip/Compress/Deflate/DeflateEncoder.h p7zip_4.30/7zip/Compress/Deflate/DeflateEncoder.h
---- p7zip_4.30.orig/7zip/Compress/Deflate/DeflateEncoder.h	2005-11-19 22:09:02.000000000 +0100
-+++ p7zip_4.30/7zip/Compress/Deflate/DeflateEncoder.h	2006-02-09 17:32:27.000000000 +0100
-@@ -115,7 +115,7 @@ class CCoder
-   void CopyBackBlockOp(UInt32 distance, UInt32 length);
-   void WriteBlockData(bool writeMode, bool finalBlock);
- 
--  void CCoder::ReleaseStreams()
-+  void ReleaseStreams()
-   {
-     // m_MatchFinder.ReleaseStream();
-     m_OutStream.ReleaseStream();
-diff -Naupr p7zip_4.30.orig/7zip/Compress/Lzh/LzhDecoder.h p7zip_4.30/7zip/Compress/Lzh/LzhDecoder.h
---- p7zip_4.30.orig/7zip/Compress/Lzh/LzhDecoder.h	2005-09-22 19:53:21.000000000 +0200
-+++ p7zip_4.30/7zip/Compress/Lzh/LzhDecoder.h	2006-02-09 17:37:56.000000000 +0100
-@@ -53,7 +53,7 @@ class CCoder :
-   CHuffmanDecoder<kNumDistanceSymbols> m_PHuffmanDecoder;
-   CHuffmanDecoder<kNumCSymbols> m_CHuffmanDecoder;
- 
--  void CCoder::ReleaseStreams()
-+  void ReleaseStreams()
-   {
-     m_OutWindowStream.ReleaseStream();
-     m_InBitStream.ReleaseStream();
-diff -Naupr p7zip_4.30.orig/7zip/UI/Console/ExtractCallbackConsole.h p7zip_4.30/7zip/UI/Console/ExtractCallbackConsole.h
---- p7zip_4.30.orig/7zip/UI/Console/ExtractCallbackConsole.h	2005-09-22 19:53:22.000000000 +0200
-+++ p7zip_4.30/7zip/UI/Console/ExtractCallbackConsole.h	2006-02-09 17:20:16.000000000 +0100
-@@ -52,7 +52,7 @@ public:
- 
-   CStdOutStream *OutStream;
- 
--  void CExtractCallbackConsole::Init()
-+  void Init()
-   {
-     NumArchives = 0;
-     NumArchiveErrors = 0;

sources

@@ -1 +1 @@
-cf30baaf8eeba8ad28d1a1f17db4cc1e  p7zip_4.30_src_all.tar.bz2
+06dc4693d44c9efecca98969256ddb6c  p7zip_4.39_src_all-norar.tar.bz2