From c519ce1350602d687a0fab856c6aad9cb3db4759 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:29:10 +0000 Subject: [PATCH 1/4] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f0c5a63..44135a8 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: arj -# $Id$ +# $Id: Makefile,v 1.1 2006/09/10 05:10:29 jwrdegoede Exp $ NAME := arj 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 6bef0ebad26e7e6bc3cda9e5d3064f8de05509d0 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 8 May 2010 01:43:04 +0000 Subject: [PATCH 2/4] Initialize branch EL-6 for arj --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..46381b9 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-6 From 18b9de1f87d625355ef4b2dad01979b136c0c5a6 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Tue, 18 May 2010 22:47:59 +0000 Subject: [PATCH 3/4] Sync with devel branch --- arj.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/arj.spec b/arj.spec index e60b898..7780adc 100644 --- a/arj.spec +++ b/arj.spec @@ -1,7 +1,7 @@ Summary: Archiver for .arj files Name: arj Version: 3.10.22 -Release: 11%{?dist} +Release: 12%{?dist} License: GPL+ Group: Applications/Archiving URL: http://arj.sourceforge.net/ @@ -45,8 +45,8 @@ pushd gnu %configure popd -# No %{?_smp_mflags}, arj is not parallel build clean, no stripping -make ADD_LDFLAGS="" +# Disable binary strippings +make %{?_smp_mflags} ADD_LDFLAGS="" %install rm -rf $RPM_BUILD_ROOT @@ -72,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/*arj*1.* %changelog +* Sun Mar 28 2010 Robert Scheck 3.10.22-12 +- Re-enable parallel builds again now that quoting is fixed + * Sun Sep 6 2009 Milos Jakubicek 3.10.22-11 - Fix FTBFS: added arj-3.10.22-quotes.patch From 957f56e14dd0e9f9df81466f900051eb17dd1e83 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 10:11:00 +0000 Subject: [PATCH 4/4] 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 44135a8..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: arj -# $Id: Makefile,v 1.1 2006/09/10 05:10:29 jwrdegoede Exp $ -NAME := arj -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 46381b9..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-6