rpms/upx/devel .cvsignore, 1.10, 1.11 sources, 1.10, 1.11 upx.spec, 1.22, 1.23

[Jon Ciesla]

Author: limb

Update of /cvs/pkgs/rpms/upx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30066

Modified Files:
	.cvsignore sources upx.spec 
Log Message:
LZMA!!!



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/upx/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	16 Nov 2009 16:03:03 -0000	1.10
+++ .cvsignore	8 Jan 2010 15:48:13 -0000	1.11
@@ -1 +1,2 @@
 upx-3.04-src.tar.bz2
+lzma465.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/upx/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	16 Nov 2009 16:03:03 -0000	1.10
+++ sources	8 Jan 2010 15:48:13 -0000	1.11
@@ -1 +1,2 @@
 68d662b1f831335460f9bfdbf632c6ce  upx-3.04-src.tar.bz2
+29d5ffd03a5a3e51aef6a74e9eafb759  lzma465.tar.bz2


Index: upx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/upx/devel/upx.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- upx.spec	16 Nov 2009 16:03:04 -0000	1.22
+++ upx.spec	8 Jan 2010 15:48:13 -0000	1.23
@@ -1,12 +1,13 @@
 Name:           upx
 Version:        3.04
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Ultimate Packer for eXecutables
 
 Group:          Applications/Archiving
-License:        GPLv2+
+License:        GPLv2+ and Public Domain
 URL:            http://upx.sourceforge.net/
 Source0:        http://upx.sourceforge.net/download/%{name}-%{version}-src.tar.bz2
+Source1:	http://downloads.sourceforge.net/sevenzip/lzma465.tar.bz2
 #Patch0:		upx-3.03-pefile-strictproto.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -23,12 +24,14 @@ executables suffer no memory overhead or
 %prep
 %setup -q -n %{name}-%{version}-src
 sed -i -e 's/ -O2/ /' -e 's/ -Werror//' src/Makefile
+mkdir lzma465
+tar xfj  ../../SOURCES/lzma465.tar.bz2 -C lzma465
 
 #%patch0 -p0
 
 %build
 export CXXFLAGS="$RPM_OPT_FLAGS" # export, not to make so it won't trump all
-make %{?_smp_mflags} -C src
+UPX_LZMA_VERSION=0x465 UPX_LZMADIR=../lzma465 make %{?_smp_mflags} -C src
 make -C doc
 
 
@@ -50,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Jan 08 2010 Jon Ciesla <limb at jcomserv.net> - 3.04-2
+- LZMA fixes by John Reiser (jreiser at bitwagon.com) BZ 501636.
+
 * Mon Nov 16 2009 Jon Ciesla <limb at jcomserv.net> - 3.04-1
 - 3.04.
 - Stict prototype patch upstreamed.