rpms/upx/devel upx-nostrip.patch,NONE,1.1 upx.spec,1.3,1.4

[Ville Skytta (scop)]

Author: scop

Update of /cvs/extras/rpms/upx/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv9506

Modified Files:
	upx.spec 
Added Files:
	upx-nostrip.patch 
Log Message:
Let rpmbuild take care of stripping binaries, honor build env better.

upx-nostrip.patch:

--- NEW FILE upx-nostrip.patch ---
--- src/Makedefs.gcc~	2004-12-17 01:57:34.817261352 +0200
+++ src/Makedefs.gcc	2004-12-17 02:00:45.805567953 +0200
@@ -58,8 +58,6 @@
 
 ifeq ($(DEBUG),1)
 LDFLAGS += -g
-else
-LDFLAGS += -s
 endif
 LDFLAGS += -Wl,-Map,$T.map
 


Index: upx.spec
===================================================================
RCS file: /cvs/extras/rpms/upx/devel/upx.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- upx.spec	10 Dec 2004 22:03:12 -0000	1.3
+++ upx.spec	17 Dec 2004 17:58:40 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           upx
 Version:        1.25
-Release:        1
+Release:        2
 Epoch:          0
 Summary:        The Ultimate Packer for eXecutables
 
@@ -9,6 +9,7 @@
 URL:            http://upx.sourceforge.net/
 Source0:        http://upx.sourceforge.net/download/upx-1.25-src.tar.gz
 Patch0:         %{name}-optflags.patch
+Patch1:         %{name}-nostrip.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ucl-devel >= 0:1.01, perl
@@ -23,11 +24,17 @@
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p0
 
 
 %build
 make -C doc
-UCLDIR=%{_prefix} make %{?_smp_mflags} -C src target=linux CXX=g++
+make %{?_smp_mflags} -C src \
+  target=linux \
+  CXX=%{__cxx} \
+  CCARCH= \
+  UCLDIR=%{_prefix} \
+  STUBEDIT_EXE=:
 
 
 %install
@@ -49,6 +56,10 @@
 
 
 %changelog
+* Fri Dec 17 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:1.25-2
+- Let rpmbuild take care of stripping binaries.
+- Honor build environment settings better.
+
 * Thu Jul  1 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:1.25-0.fdr.1
 - Update to 1.25.