From 0c6b18515993de5f44a2ec7cf1aeb6c1480754d9 Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Mon, 23 Oct 2006 19:23:06 +0000 Subject: [PATCH 1/5] Initialize branch FC-6 for upx --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..d5b6362 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +FC-6 From 7f97dc95fd616b4c1c5ec638e85f8974d058e951 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Sat, 11 Aug 2007 00:59:28 +0000 Subject: [PATCH 2/5] Bump to 3.01. --- sources | 2 +- upx.spec | 24 ++++++++++++++++-------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/sources b/sources index e771df5..e76e432 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -058a57c2e8d642579d4dda56633b9fd2 upx-2.02-src.tar.gz +58f3c87bf7e067ece5f7c510d4423cb8 upx-3.01-src.tar.bz2 diff --git a/upx.spec b/upx.spec index 7dcdccc..55f4ea6 100644 --- a/upx.spec +++ b/upx.spec @@ -1,17 +1,16 @@ Name: upx -Version: 2.02 +Version: 3.01 Release: 1%{?dist} Summary: Ultimate Packer for eXecutables Group: Applications/Archiving License: GPL 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" -make %{?_smp_mflags} -C src CXX=%{__cxx} UCLDIR=%{_prefix} exeext= +export CXXFLAGS="$RPM_OPT_FLAGS" # export, not to make so it won't trump all +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 755 src/upx $RPM_BUILD_ROOT%{_bindir}/upx +install -Dpm 644 doc/upx.1 $RPM_BUILD_ROOT%{_mandir}/man1/upx.1 +install -Dpm 755 src/upx.out $RPM_BUILD_ROOT%{_bindir}/upx %clean @@ -49,6 +48,15 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Aug 06 2007 Jon Ciesla - 3.01-1 +- 3.01. + +* Sun May 13 2007 Ville Skyttä - 3.00-1 +- 3.00. + +* Wed Apr 4 2007 Ville Skyttä - 2.03-1 +- 2.03. + * Wed Aug 30 2006 Ville Skyttä - 2.02-1 - 2.02. From aa8a505d633c596f50785331adab1e3532f8ed3e Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Thu, 16 Aug 2007 17:31:24 +0000 Subject: [PATCH 3/5] License tag correction. --- upx.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/upx.spec b/upx.spec index 55f4ea6..a1bdb9f 100644 --- a/upx.spec +++ b/upx.spec @@ -1,10 +1,10 @@ Name: upx 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.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Aug 16 2007 Jon Ciesla - 3.01-2 +- License tag correction. + * Mon Aug 06 2007 Jon Ciesla - 3.01-1 - 3.01. From ff837026aa0276b96b37264d7907d2d00fd75e97 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:15:42 +0000 Subject: [PATCH 4/5] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d161ccf..b5360ef 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 00d0e2096d3a529898fcb883d8aecadd98b01df3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 14:46:40 +0000 Subject: [PATCH 5/5] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index b5360ef..0000000 --- a/Makefile +++ /dev/null @@ -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 $$d/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) diff --git a/branch b/branch deleted file mode 100644 index d5b6362..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -FC-6