From 14c27885628adf19e40593fdb4de9692dde69eb0 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 15 Oct 2007 18:38:27 +0000 Subject: [PATCH 1/5] makefile update to properly grab makefile.common --- Makefile | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 4bdd215..3e7c4ad 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,21 @@ # Makefile for source rpm: bcel -# $Id$ +# $Id: Makefile,v 1.1 2004/09/09 03:27:01 cvsdist Exp $ NAME := bcel SPECFILE = $(firstword $(wildcard *.spec)) -include ../common/Makefile.common +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),) +# attempt 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) From 0c35f95fee30a397848a6fe89171703297df0409 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sat, 20 Oct 2007 04:27:15 +0000 Subject: [PATCH 2/5] Initialize branch F-8 for bcel --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..e9e7ccd --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-8 From 41ef27cb7d02de80382c91943b2bb38fe24f91f7 Mon Sep 17 00:00:00 2001 From: Permaine Cheung Date: Mon, 7 Jan 2008 21:37:59 +0000 Subject: [PATCH 3/5] Fixed unowned directory (Bugzilla 246185) --- bcel.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/bcel.spec b/bcel.spec index 8b24a60..8a767cd 100644 --- a/bcel.spec +++ b/bcel.spec @@ -43,7 +43,7 @@ Name: bcel Version: 5.2 -Release: 2jpp.1%{?dist} +Release: 2jpp.2%{?dist} Epoch: 0 Summary: Byte Code Engineering Library License: ASL 2.0 @@ -264,6 +264,7 @@ fi %files %defattr(0644,root,root,0755) +%doc %{_docdir}/%{name}-%{version} %doc %{_docdir}/%{name}-%{version}/LICENSE.txt %{_javadir}/* %if %{with_maven} @@ -271,6 +272,7 @@ fi %endif %{_mavendepmapfragdir} %if %{gcj_support} +%dir %{_libdir}/gcj/%{name} %attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-*.jar.* %endif @@ -284,6 +286,9 @@ fi %doc %{_docdir}/%{name}-%{version} %changelog +* Mon Jan 07 2008 Permaine Cheung 0:5.2-2jpp.2 +- Fixed unowned directory (Bugzilla 246185) + * Wed Sep 19 2007 Permaine Cheung 0:5.2-2jpp.1 - Update to 5.2 in Fedora From 0886977bdcebe61dce23d34d17ed49e40492a500 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:18:51 +0000 Subject: [PATCH 4/5] 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 3e7c4ad..92d5bcc 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: bcel -# $Id: Makefile,v 1.1 2004/09/09 03:27:01 cvsdist Exp $ +# $Id: Makefile,v 1.2 2007/10/15 18:38:27 notting Exp $ NAME := bcel 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 f76018bfa0de3783c226901ef239831666ea61ff Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 10:51:10 +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 92d5bcc..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: bcel -# $Id: Makefile,v 1.2 2007/10/15 18:38:27 notting Exp $ -NAME := bcel -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),) -# attempt 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 e9e7ccd..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-8