From 14c27885628adf19e40593fdb4de9692dde69eb0 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 15 Oct 2007 18:38:27 +0000 Subject: [PATCH 1/9] 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 bff08ebbe8485d3bd49e44952d62c98c29611add Mon Sep 17 00:00:00 2001 From: Permaine Cheung Date: Mon, 7 Jan 2008 22:10:32 +0000 Subject: [PATCH 2/9] Fixed unowned directory --- 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 be2e51cbde69ae8d80ccc5186596e447e0fab3dd Mon Sep 17 00:00:00 2001 From: Permaine Cheung Date: Tue, 22 Jan 2008 23:15:56 +0000 Subject: [PATCH 3/9] Merge with upstream --- bcel.spec | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/bcel.spec b/bcel.spec index 8a767cd..04c6a27 100644 --- a/bcel.spec +++ b/bcel.spec @@ -43,7 +43,7 @@ Name: bcel Version: 5.2 -Release: 2jpp.2%{?dist} +Release: 3jpp.2%{?dist} Epoch: 0 Summary: Byte Code Engineering Library License: ASL 2.0 @@ -213,12 +213,15 @@ ant -Dbuild.dest=build/classes -Dbuild.dir=build -Ddocs.dest=docs \ ) # depmap frags %add_to_maven_depmap %{name} %{name} %{version} JPP %{name} +%add_to_maven_depmap org.apache.bcel %{name} %{version} JPP %{name} # pom -%if %{with_maven} %{__mkdir_p} %{buildroot}%{_datadir}/maven2/poms %{__install} -m 0644 %{SOURCE7} \ - %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}.pom -%endif + %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}.pom +%{__mkdir_p} %{buildroot}%{_datadir}/maven2/default_poms +%{__install} -m 0644 %{SOURCE7} \ + %{buildroot}%{_datadir}/maven2/default_poms/JPP-%{name}.pom + # javadoc %{__mkdir_p} %{buildroot}%{_javadocdir}/%{name}-%{version} %if %{with_maven} @@ -269,6 +272,7 @@ fi %{_javadir}/* %if %{with_maven} %{_datadir}/maven2/poms/* +%{_datadir}/maven2/default_poms/* %endif %{_mavendepmapfragdir} %if %{gcj_support} @@ -286,9 +290,17 @@ fi %doc %{_docdir}/%{name}-%{version} %changelog +* Tue Jan 22 2008 Permaine Cheung 0:5.2-3jpp.1 +- Merge with upstream + * Mon Jan 07 2008 Permaine Cheung 0:5.2-2jpp.2 - Fixed unowned directory (Bugzilla 246185) +* Fri Nov 16 2007 Ralph Apel 0:5.2-3jpp +- Install poms unconditionally +- Add pom in ./maven2/default_poms +- Add org.apache.bcel:bcel depmap frag + * Wed Sep 19 2007 Permaine Cheung 0:5.2-2jpp.1 - Update to 5.2 in Fedora From 9dc06e43282bfa1618779c0089350fefa4fb0a7f Mon Sep 17 00:00:00 2001 From: Permaine Cheung Date: Wed, 23 Jan 2008 01:40:04 +0000 Subject: [PATCH 4/9] Package pom files --- bcel.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/bcel.spec b/bcel.spec index 04c6a27..692eb86 100644 --- a/bcel.spec +++ b/bcel.spec @@ -270,10 +270,8 @@ fi %doc %{_docdir}/%{name}-%{version} %doc %{_docdir}/%{name}-%{version}/LICENSE.txt %{_javadir}/* -%if %{with_maven} %{_datadir}/maven2/poms/* %{_datadir}/maven2/default_poms/* -%endif %{_mavendepmapfragdir} %if %{gcj_support} %dir %{_libdir}/gcj/%{name} From 1cfb2896b286c1dff00f4b441ccaaa187a554a5d Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 19 Feb 2008 17:43:24 +0000 Subject: [PATCH 5/9] - Autorebuild for GCC 4.3 --- bcel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bcel.spec b/bcel.spec index 692eb86..b50cdb8 100644 --- a/bcel.spec +++ b/bcel.spec @@ -43,7 +43,7 @@ Name: bcel Version: 5.2 -Release: 3jpp.2%{?dist} +Release: 4jpp.2%{?dist} Epoch: 0 Summary: Byte Code Engineering Library License: ASL 2.0 @@ -288,6 +288,9 @@ fi %doc %{_docdir}/%{name}-%{version} %changelog +* Tue Feb 19 2008 Fedora Release Engineering - 0:5.2-4jpp.2 +- Autorebuild for GCC 4.3 + * Tue Jan 22 2008 Permaine Cheung 0:5.2-3jpp.1 - Merge with upstream From 21e38ed71b6b1b618e3aed7c56c7c519ce8eb763 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sun, 20 Apr 2008 13:21:41 +0000 Subject: [PATCH 6/9] Initialize branch F-9 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..1c26f78 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-9 From 564b06d5e7c234d5dc97f1915bb0932e0132137e Mon Sep 17 00:00:00 2001 From: Permaine Cheung Date: Thu, 4 Dec 2008 17:09:49 +0000 Subject: [PATCH 7/9] Do not install pom in /usr/share/maven2/default_poms --- bcel.spec | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/bcel.spec b/bcel.spec index b50cdb8..ae4b41c 100644 --- a/bcel.spec +++ b/bcel.spec @@ -43,7 +43,7 @@ Name: bcel Version: 5.2 -Release: 4jpp.2%{?dist} +Release: 4jpp.3%{?dist} Epoch: 0 Summary: Byte Code Engineering Library License: ASL 2.0 @@ -218,9 +218,6 @@ ant -Dbuild.dest=build/classes -Dbuild.dir=build -Ddocs.dest=docs \ %{__mkdir_p} %{buildroot}%{_datadir}/maven2/poms %{__install} -m 0644 %{SOURCE7} \ %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}.pom -%{__mkdir_p} %{buildroot}%{_datadir}/maven2/default_poms -%{__install} -m 0644 %{SOURCE7} \ - %{buildroot}%{_datadir}/maven2/default_poms/JPP-%{name}.pom # javadoc %{__mkdir_p} %{buildroot}%{_javadocdir}/%{name}-%{version} @@ -271,7 +268,6 @@ fi %doc %{_docdir}/%{name}-%{version}/LICENSE.txt %{_javadir}/* %{_datadir}/maven2/poms/* -%{_datadir}/maven2/default_poms/* %{_mavendepmapfragdir} %if %{gcj_support} %dir %{_libdir}/gcj/%{name} @@ -288,6 +284,9 @@ fi %doc %{_docdir}/%{name}-%{version} %changelog +* Thu Dec 04 2008 Permaine Cheung 0:5.2-4jpp.3 +- Do not install pom in /usr/share/maven2/default_poms + * Tue Feb 19 2008 Fedora Release Engineering - 0:5.2-4jpp.2 - Autorebuild for GCC 4.3 From 87424d31eb01b7dfaaef4d97b5ff016e590a2cf8 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:18:52 +0000 Subject: [PATCH 8/9] 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 2f3f6c34d9cde7c8c5e1e76b90ab026456cbfe89 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 10:51:25 +0000 Subject: [PATCH 9/9] 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 1c26f78..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-9