dist-git conversion

#2781)

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: upx
-# $Id$
-NAME := upx
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON	:= $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

sources

@@ -1 +1 @@
-058a57c2e8d642579d4dda56633b9fd2  upx-2.02-src.tar.gz
+58f3c87bf7e067ece5f7c510d4423cb8  upx-3.01-src.tar.bz2

upx.spec

@@ -1,17 +1,16 @@
 Name:           upx
-Version:        2.02
+Version:        3.01
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Ultimate Packer for eXecutables
 
 Group:          Applications/Archiving
-License:        GPL
+License:        GPLv2+
 URL:            http://upx.sourceforge.net/
-Source0:        http://upx.sourceforge.net/download/%{name}-%{version}-src.tar.gz
+Source0:        http://upx.sourceforge.net/download/%{name}-%{version}-src.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ucl-devel >= 1.01
 BuildRequires:  zlib-devel
-BuildRequires:  perl
 
 %description
 UPX is a free, portable, extendable, high-performance executable
@@ -22,19 +21,19 @@ executables suffer no memory overhead or other drawbacks.
 
 %prep
 %setup -q -n %{name}-%{version}-src
-sed -i -e 's/ -O2 / /' -e 's/ -Werror//' src/Makefile
+sed -i -e 's/ -O2/ /' -e 's/ -Werror//' src/Makefile
 
 
 %build
-export CXXFLAGS="$RPM_OPT_FLAGS"
+export CXXFLAGS="$RPM_OPT_FLAGS" # export, not to make so it won't trump all
-make %{?_smp_mflags} -C src CXX=%{__cxx} UCLDIR=%{_prefix} exeext=
+make %{?_smp_mflags} -C src
 make -C doc
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -Dpm 644 doc/upx.1 $RPM_BUILD_ROOT%{_mandir}/man1/upx.1
+install -Dpm 644 doc/upx.1   $RPM_BUILD_ROOT%{_mandir}/man1/upx.1
-install -Dpm 755 src/upx   $RPM_BUILD_ROOT%{_bindir}/upx
+install -Dpm 755 src/upx.out $RPM_BUILD_ROOT%{_bindir}/upx
 
 
 %clean
@@ -49,6 +48,18 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 16 2007 Jon Ciesla <limb@jcomserv.net> - 3.01-2
+- License tag correction.
+
+* Mon Aug 06 2007 Jon Ciesla <limb@jcomserv.net> - 3.01-1
+- 3.01.
+
+* Sun May 13 2007 Ville Skyttä <ville.skytta at iki.fi> - 3.00-1
+- 3.00.
+
+* Wed Apr  4 2007 Ville Skyttä <ville.skytta at iki.fi> - 2.03-1
+- 2.03.
+
 * Wed Aug 30 2006 Ville Skyttä <ville.skytta at iki.fi> - 2.02-1
 - 2.02.