rpms/p7zip/EL-5 p7zip_4.51-nostrip.patch, NONE, 1.1 p7zip_4.58-install.patch, NONE, 1.1 p7zip_4.61-norar.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 p7zip.spec, 1.15, 1.16 sources, 1.8, 1.9
Matthias Saou
thias at fedoraproject.org
Wed Dec 24 13:29:14 UTC 2008
- Previous message (by thread): rpms/p7zip/F-8 p7zip_4.58-install.patch, NONE, 1.1 p7zip_4.61-norar.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 p7zip.spec, 1.19, 1.20 sources, 1.10, 1.11 p7zip_4.47-install.patch, 1.1, NONE p7zip_4.51-norar.patch, 1.1, NONE
- Next message (by thread): rpms/p7zip/EL-4 p7zip_4.51-nostrip.patch, NONE, 1.1 p7zip_4.58-install.patch, NONE, 1.1 p7zip_4.61-norar.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 p7zip.spec, 1.14, 1.15 sources, 1.8, 1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: thias
Update of /cvs/extras/rpms/p7zip/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7847
Modified Files:
.cvsignore p7zip.spec sources
Added Files:
p7zip_4.51-nostrip.patch p7zip_4.58-install.patch
p7zip_4.61-norar.patch
Log Message:
Update to 4.61.
p7zip_4.51-nostrip.patch:
--- NEW FILE p7zip_4.51-nostrip.patch ---
diff -Naupr p7zip_4.51.orig/makefile.linux_amd64_asm p7zip_4.51/makefile.linux_amd64_asm
--- p7zip_4.51.orig/makefile.linux_amd64_asm 2007-06-28 09:32:30.000000000 +0200
+++ p7zip_4.51/makefile.linux_amd64_asm 2007-08-05 17:52:20.000000000 +0200
@@ -2,7 +2,7 @@
OPTFLAGS=-O
# use "-m32" to have a 32bits executable
-ALLFLAGS=-m64 ${OPTFLAGS} -s \
+ALLFLAGS=-m64 ${OPTFLAGS} \
-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
-DNDEBUG -D_REENTRANT -DENV_UNIX \
$(LOCAL_FLAGS)
diff -Naupr p7zip_4.51.orig/makefile.linux_x86_ppc_alpha_gcc_4.X p7zip_4.51/makefile.linux_x86_ppc_alpha_gcc_4.X
--- p7zip_4.51.orig/makefile.linux_x86_ppc_alpha_gcc_4.X 2007-06-28 09:33:43.000000000 +0200
+++ p7zip_4.51/makefile.linux_x86_ppc_alpha_gcc_4.X 2007-08-05 17:52:45.000000000 +0200
@@ -5,7 +5,7 @@
OPTFLAGS=-O
-ALLFLAGS=${OPTFLAGS} -s \
+ALLFLAGS=${OPTFLAGS} \
-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
-DNDEBUG -D_REENTRANT -DENV_UNIX \
$(LOCAL_FLAGS)
p7zip_4.58-install.patch:
--- NEW FILE p7zip_4.58-install.patch ---
diff -Naupr p7zip_4.58.orig/install.sh p7zip_4.58/install.sh
--- p7zip_4.58.orig/install.sh 2008-03-02 14:35:05.000000000 +0100
+++ p7zip_4.58/install.sh 2008-06-18 14:02:45.000000000 +0200
@@ -54,49 +54,41 @@ then
then
echo "- installing ${DEST_DIR}${DEST_BIN}/7za"
cp bin/7za "${DEST_DIR}${DEST_SHARE}/7za"
- chmod 777 "${DEST_DIR}${DEST_SHARE}/7za"
- strip "${DEST_DIR}${DEST_SHARE}/7za"
- chmod 555 "${DEST_DIR}${DEST_SHARE}/7za"
+ chmod 755 "${DEST_DIR}${DEST_SHARE}/7za"
echo "#! /bin/sh" > "${DEST_DIR}${DEST_BIN}/7za"
echo "\"${DEST_SHARE}/7za\" \"\$@\"" >> "${DEST_DIR}${DEST_BIN}/7za"
- chmod 555 "${DEST_DIR}${DEST_BIN}/7za"
+ chmod 755 "${DEST_DIR}${DEST_BIN}/7za"
fi
if [ -x bin/7zr ]
then
echo "- installing ${DEST_DIR}${DEST_BIN}/7zr"
cp bin/7zr "${DEST_DIR}${DEST_SHARE}/7zr"
- chmod 777 "${DEST_DIR}${DEST_SHARE}/7zr"
- strip "${DEST_DIR}${DEST_SHARE}/7zr"
- chmod 555 "${DEST_DIR}${DEST_SHARE}/7zr"
+ chmod 755 "${DEST_DIR}${DEST_SHARE}/7zr"
echo "#! /bin/sh" > "${DEST_DIR}${DEST_BIN}/7zr"
echo "\"${DEST_SHARE}/7zr\" \"\$@\"" >> "${DEST_DIR}${DEST_BIN}/7zr"
- chmod 555 "${DEST_DIR}${DEST_BIN}/7zr"
+ chmod 755 "${DEST_DIR}${DEST_BIN}/7zr"
fi
if [ -x bin/7zCon.sfx ]
then
echo "- installing ${DEST_DIR}${DEST_SHARE}/7zCon.sfx"
cp bin/7zCon.sfx "${DEST_DIR}${DEST_SHARE}/7zCon.sfx"
- chmod 777 "${DEST_DIR}${DEST_SHARE}/7zCon.sfx"
- strip "${DEST_DIR}${DEST_SHARE}/7zCon.sfx"
- chmod 555 "${DEST_DIR}${DEST_SHARE}/7zCon.sfx"
+ chmod 755 "${DEST_DIR}${DEST_SHARE}/7zCon.sfx"
fi
if [ -x bin/7z ]
then
echo "- installing ${DEST_DIR}${DEST_BIN}/7z"
cp bin/7z "${DEST_DIR}${DEST_SHARE}/7z"
- chmod 777 "${DEST_DIR}${DEST_SHARE}/7z"
- strip "${DEST_DIR}${DEST_SHARE}/7z"
- chmod 555 "${DEST_DIR}${DEST_SHARE}/7z"
+ chmod 755 "${DEST_DIR}${DEST_SHARE}/7z"
cp -r bin/Codecs "${DEST_DIR}${DEST_SHARE}/"
- chmod 555 "${DEST_DIR}${DEST_SHARE}"/*/*
+ chmod 755 "${DEST_DIR}${DEST_SHARE}"/*/*
cp bin/7z.so "${DEST_DIR}${DEST_SHARE}/7z.so"
- chmod 555 "${DEST_DIR}${DEST_SHARE}/7z.so"
+ chmod 755 "${DEST_DIR}${DEST_SHARE}/7z.so"
echo "#! /bin/sh" > "${DEST_DIR}${DEST_BIN}/7z"
echo "\"${DEST_SHARE}/7z\" \"\$@\"" >> "${DEST_DIR}${DEST_BIN}/7z"
- chmod 555 "${DEST_DIR}${DEST_BIN}/7z"
+ chmod 755 "${DEST_DIR}${DEST_BIN}/7z"
fi
else
@@ -105,7 +97,7 @@ else
echo "- installing ${DEST_DIR}${DEST_BIN}/7za"
mkdir -p "${DEST_DIR}${DEST_BIN}"
cp bin/7za "${DEST_DIR}${DEST_BIN}/7za"
- chmod 555 "${DEST_DIR}${DEST_BIN}/7za"
+ chmod 755 "${DEST_DIR}${DEST_BIN}/7za"
fi
if [ -x bin/7zr ]
@@ -113,7 +105,7 @@ else
echo "- installing ${DEST_DIR}${DEST_BIN}/7zr"
mkdir -p "${DEST_DIR}${DEST_BIN}"
cp bin/7zr "${DEST_DIR}${DEST_BIN}/7zr"
- chmod 555 "${DEST_DIR}${DEST_BIN}/7zr"
+ chmod 755 "${DEST_DIR}${DEST_BIN}/7zr"
fi
fi
@@ -122,27 +114,27 @@ if [ -d DOCS ]
then
echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7z.1"
sed -e s?"{DEST_SHARE_DOC}"?"${DEST_SHARE_DOC}/DOCS"?g man1/7z.1 > "${DEST_DIR}${DEST_MAN}/man1/7z.1"
- chmod 444 "${DEST_DIR}${DEST_MAN}/man1/7z.1"
+ chmod 644 "${DEST_DIR}${DEST_MAN}/man1/7z.1"
echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7za.1"
sed -e s?"{DEST_SHARE_DOC}"?"${DEST_SHARE_DOC}/DOCS"?g man1/7za.1 > "${DEST_DIR}${DEST_MAN}/man1/7za.1"
- chmod 444 "${DEST_DIR}${DEST_MAN}/man1/7za.1"
+ chmod 644 "${DEST_DIR}${DEST_MAN}/man1/7za.1"
echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7zr.1"
sed -e s?"{DEST_SHARE_DOC}"?"${DEST_SHARE_DOC}/DOCS"?g man1/7zr.1 > "${DEST_DIR}${DEST_MAN}/man1/7zr.1"
- chmod 444 "${DEST_DIR}${DEST_MAN}/man1/7zr.1"
+ chmod 644 "${DEST_DIR}${DEST_MAN}/man1/7zr.1"
else
echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7z.1"
grep -v "{DEST_SHARE_DOC}" man1/7z.1 > "${DEST_DIR}${DEST_MAN}/man1/7z.1"
- chmod 444 "${DEST_DIR}${DEST_MAN}/man1/7z.1"
+ chmod 644 "${DEST_DIR}${DEST_MAN}/man1/7z.1"
echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7za.1"
grep -v "{DEST_SHARE_DOC}" man1/7za.1 > "${DEST_DIR}${DEST_MAN}/man1/7za.1"
- chmod 444 "${DEST_DIR}${DEST_MAN}/man1/7za.1"
+ chmod 644 "${DEST_DIR}${DEST_MAN}/man1/7za.1"
echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7zr.1"
grep -v "{DEST_SHARE_DOC}" man1/7zr.1 > "${DEST_DIR}${DEST_MAN}/man1/7zr.1"
- chmod 444 "${DEST_DIR}${DEST_MAN}/man1/7zr.1"
+ chmod 644 "${DEST_DIR}${DEST_MAN}/man1/7zr.1"
fi
if [ -f README ]
@@ -150,7 +142,7 @@ then
echo "- installing ${DEST_DIR}${DEST_SHARE_DOC}/README"
mkdir -p "${DEST_DIR}${DEST_SHARE_DOC}"
cp README "${DEST_DIR}${DEST_SHARE_DOC}/README"
- chmod 444 "${DEST_DIR}${DEST_SHARE_DOC}/README"
+ chmod 644 "${DEST_DIR}${DEST_SHARE_DOC}/README"
fi
if [ -f ChangeLog ]
@@ -158,7 +150,7 @@ then
echo "- installing ${DEST_DIR}${DEST_SHARE_DOC}/ChangeLog"
mkdir -p "${DEST_DIR}${DEST_SHARE_DOC}"
cp ChangeLog "${DEST_DIR}${DEST_SHARE_DOC}/ChangeLog"
- chmod 444 "${DEST_DIR}${DEST_SHARE_DOC}/ChangeLog"
+ chmod 644 "${DEST_DIR}${DEST_SHARE_DOC}/ChangeLog"
fi
if [ -d DOCS ]
@@ -166,7 +158,7 @@ then
echo "- installing HTML help in ${DEST_DIR}${DEST_SHARE_DOC}/DOCS"
mkdir -p "${DEST_DIR}${DEST_SHARE_DOC}"
cp -r DOCS "${DEST_DIR}${DEST_SHARE_DOC}/DOCS"
- find "${DEST_DIR}${DEST_SHARE_DOC}/DOCS" -type d -exec chmod 555 {} \;
- find "${DEST_DIR}${DEST_SHARE_DOC}/DOCS" -type f -exec chmod 444 {} \;
+ find "${DEST_DIR}${DEST_SHARE_DOC}/DOCS" -type d -exec chmod 755 {} \;
+ find "${DEST_DIR}${DEST_SHARE_DOC}/DOCS" -type f -exec chmod 644 {} \;
fi
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/EL-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 1 Mar 2007 18:00:57 -0000 1.8
+++ .cvsignore 24 Dec 2008 13:28:44 -0000 1.9
@@ -1 +1 @@
-p7zip_4.44_src_all-norar.tar.bz2
+p7zip_4.61_src_all-norar.tar.bz2
Index: p7zip.spec
===================================================================
RCS file: /cvs/extras/rpms/p7zip/EL-5/p7zip.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- p7zip.spec 6 May 2007 18:57:54 -0000 1.15
+++ p7zip.spec 24 Dec 2008 13:28:44 -0000 1.16
@@ -1,8 +1,9 @@
Summary: Very high compression ratio file archiver
Name: p7zip
-Version: 4.44
-Release: 2%{?dist}.1
-License: LGPL
+Version: 4.61
+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
@@ -13,7 +14,16 @@
# 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
+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
%description
p7zip is a port of 7za.exe for Unix. 7-Zip is a file archiver with a very high
@@ -32,45 +42,46 @@
%prep
%setup -q -n %{name}_%{version}
-
-# 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}.
-%{__cat} << 'EOF' > 7za.sh
-#!/bin/sh
-exec %{_libexecdir}/p7zip/7za "$@"
-EOF
-
-%{__cat} << 'EOF' > 7z.sh
-#!/bin/sh
-exec %{_libexecdir}/p7zip/7z "$@"
-EOF
+%patch0 -p1 -b .norar
+%patch1 -p1 -b .install
+%patch2 -p1 -b .nostrip
+# Move docs early so that they don't get installed by "make install" and we
+# can include them in %%doc
+%{__mv} DOCS docs
+%{__mv} ChangeLog README TODO docs/
+# And fix useless executable bit while we're at it
+find docs -type f -exec chmod -x {} \;
+find contrib -type f -exec chmod -x {} \;
%build
-%ifarch %{ix86} ppc
-%{__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 makefile.machine
+%{__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
-# Use optflags
-%{__perl} -pi -e 's|^ALLFLAGS=.*|ALLFLAGS=-Wall %{optflags} -fPIC \\|g' \
- makefile.machine
# Don't use _smp_mflags since the build sometimes fails with it (as of 4.44)
-%{__make} 7z 7za sfx
+%{__make} %{?_smp_mflags} all2 \
+ OPTFLAGS="%{optflags}" \
+ DEST_HOME=%{_prefix} \
+ DEST_BIN=%{_bindir} \
+ DEST_SHARE=%{_libexecdir}/p7zip \
+ DEST_MAN=%{_mandir}
%install
%{__rm} -rf %{buildroot}
-
-# Install binaries (7za, 7z, 7zCon.sfx and Codecs/Formats)
-%{__mkdir_p} %{buildroot}%{_libexecdir}/p7zip/
-%{__cp} -a bin/* %{buildroot}%{_libexecdir}/p7zip/
-
-# Install wrapper scripts
-%{__install} -D -m 0755 7z.sh %{buildroot}%{_bindir}/7z
-%{__install} -D -m 0755 7za.sh %{buildroot}%{_bindir}/7za
+%{__make} install \
+ DEST_DIR=%{buildroot} \
+ DEST_HOME=%{_prefix} \
+ DEST_BIN=%{_bindir} \
+ DEST_SHARE=%{_libexecdir}/p7zip \
+ DEST_MAN=%{_mandir}
%clean
@@ -79,24 +90,57 @@
%files
%defattr(-,root,root,-)
-%doc ChangeLog README TODO DOCS/*
+%doc docs/*
%{_bindir}/7za
%dir %{_libexecdir}/p7zip/
%{_libexecdir}/p7zip/7za
%{_libexecdir}/p7zip/7zCon.sfx
+%{_mandir}/man1/7za.1*
+%exclude %{_mandir}/man1/7zr.1*
%files plugins
%defattr(-,root,root,-)
%doc contrib/
%{_bindir}/7z
%{_libexecdir}/p7zip/7z
-%{_libexecdir}/p7zip/Codecs/
-%{_libexecdir}/p7zip/Formats/
+%{_libexecdir}/p7zip/7z.so
+#{_libexecdir}/p7zip/Codecs/
+#{_libexecdir}/p7zip/Formats/
+%{_mandir}/man1/7z.1*
%changelog
-* Sun May 06 2007 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info>
-- rebuilt for RHEL5 final
+* 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.
+- Update install patch.
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org>
+- Autorebuild for GCC 4.3
+
+* Wed Aug 22 2007 Matthias Saou <http://freshrpms.net/> 4.51-3
+- Rebuild for new BuildID feature.
+
+* Thu Aug 9 2007 Matthias Saou <http://freshrpms.net/> 4.51-2
+- Update License field some more (LGPL+ to LGPLv2+).
+
+* Sun Aug 5 2007 Matthias Saou <http://freshrpms.net/> 4.51-1
+- Update to 4.51.
+- Update License field.
+
+* Tue Jun 19 2007 Matthias Saou <http://freshrpms.net/> 4.47-1
+- Update to 4.47.
+- Include now required patch to exclude removed Rar bits from makefiles.
+- Switch to using "make install" for installation... so patch and hack.
+- Use the asm makefile for x86_64, so build require yasm for it too.
+- Add ppc64 to the main %%ifarch.
+- Remove no longer included Codecs and Formats dirs (7z.so replaces them?).
+- Remove our wrapper scripts, since the install script creates its own.
* Thu Mar 1 2007 Matthias Saou <http://freshrpms.net/> 4.44-2
- Remove _smp_mflags since some builds fail with suspicious errors.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/p7zip/EL-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 1 Mar 2007 18:00:57 -0000 1.8
+++ sources 24 Dec 2008 13:28:44 -0000 1.9
@@ -1 +1 @@
-d25e7afd265f1478d027b82a2f8db81f p7zip_4.44_src_all-norar.tar.bz2
+3e787d5f0414f062c1834586c2562bd4 p7zip_4.61_src_all-norar.tar.bz2
- Previous message (by thread): rpms/p7zip/F-8 p7zip_4.58-install.patch, NONE, 1.1 p7zip_4.61-norar.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 p7zip.spec, 1.19, 1.20 sources, 1.10, 1.11 p7zip_4.47-install.patch, 1.1, NONE p7zip_4.51-norar.patch, 1.1, NONE
- Next message (by thread): rpms/p7zip/EL-4 p7zip_4.51-nostrip.patch, NONE, 1.1 p7zip_4.58-install.patch, NONE, 1.1 p7zip_4.61-norar.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 p7zip.spec, 1.14, 1.15 sources, 1.8, 1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list