From: undefine <undefine@pld-linux.org>
Date: Fri, 27 Aug 2004 21:55:07 +0000 (+0000)
Subject: - update to 1.25
X-Git-Tag: AC-STABLE~1
X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;h=e07e5d6ba2bc183c06bcbfdbf60bd5567aa06ea1;p=packages%2Fupx.git

- update to 1.25

Changed files:
    upx.spec -> 1.24
---

diff --git a/upx.spec b/upx.spec
index 457fa91..0af00c4 100644
--- a/upx.spec
+++ b/upx.spec
@@ -1,12 +1,12 @@
 Summary:	The Ultimate Packer for eXecutables
 Summary(pl):	Program pakuj±cy pliki wykonywalne
 Name:		upx
-Version:	1.24
+Version:	1.25
 Release:	1
 License:	GPL
 Group:		Applications
 Source0:	http://upx.sourceforge.net/download/%{name}-%{version}-src.tar.gz
-# Source0-md5:	c7addf22766bdc9878e0a191855eec16
+# Source0-md5:	6f20a62999a46a1864652454b3c8a5d8
 Patch0:		%{name}-opt.patch
 Patch1:		%{name}-ucl.patch
 URL:		http://upx.sourceforge.net/
@@ -32,14 +32,17 @@ wa
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
+#%patch0 -p1
+#%patch1 -p1
 
 %build
 %{__make} -C doc
 %{__make} -C src \
+	CCARCH="" \
 	CFLAGS_O="%{rpmcflags}" \
-	CC="%{__cxx}"
+	CC="%{__cc}" \
+	CXX="%{__cxx}" \
+	UCLDIR="%{_prefix}"
 
 %install
 rm -rf $RPM_BUILD_ROOT