rpms/upx/F-12 sources,1.9,1.10 upx.spec,1.21,1.22

[Jon Ciesla]

Author: limb

Update of /cvs/pkgs/rpms/upx/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31607

Modified Files:
	sources upx.spec 
Log Message:
LZMA fixes by John Reiser (jreiser at bitwagon.com) BZ 501636.



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/upx/F-12/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	8 May 2008 19:38:40 -0000	1.9
+++ sources	8 Jan 2010 15:55:53 -0000	1.10
@@ -1 +1,2 @@
-1d5830fff06537a129c923527c4ce205  upx-3.03-src.tar.bz2
+68d662b1f831335460f9bfdbf632c6ce  upx-3.04-src.tar.bz2
+29d5ffd03a5a3e51aef6a74e9eafb759  lzma465.tar.bz2


Index: upx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/upx/F-12/upx.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- upx.spec	27 Jul 2009 06:37:02 -0000	1.21
+++ upx.spec	8 Jan 2010 15:55:54 -0000	1.22
@@ -1,13 +1,14 @@
 Name:           upx
-Version:        3.03
-Release:        4%{?dist}
+Version:        3.04
+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
-Patch0:		upx-3.03-pefile-strictproto.patch
+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)
 
 BuildRequires:  ucl-devel >= 1.01
@@ -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
+#%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,13 @@ 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.
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.03-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild