From b1e878276fd83aceb22e0e2855d94000f851a162 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 15 Oct 2007 19:32:05 +0000 Subject: [PATCH 1/7] makefile update to properly grab makefile.common --- Makefile | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5ec4a11..cf3d472 100644 --- a/Makefile +++ b/Makefile @@ -3,4 +3,19 @@ NAME := xjavadoc 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 e47ff13f8f6e20349675cd264db5ab545594acb7 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 19 Feb 2008 00:58:38 +0000 Subject: [PATCH 2/7] - Autorebuild for GCC 4.3 --- xjavadoc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xjavadoc.spec b/xjavadoc.spec index b7c0062..6c45cb3 100644 --- a/xjavadoc.spec +++ b/xjavadoc.spec @@ -36,7 +36,7 @@ Name: xjavadoc Version: 1.1 -Release: 4jpp.3%{?dist} +Release: 5jpp.3%{?dist} Epoch: 0 Summary: The XJavaDoc engine License: BSD Style @@ -188,6 +188,9 @@ fi %ghost %doc %{_javadocdir}/%{name} %changelog +* Mon Feb 18 2008 Fedora Release Engineering - 0:1.1-5jpp.3 +- Autorebuild for GCC 4.3 + * Thu Sep 20 2007 Deepak Bhole 1.1-4jpp.3 - Rebuild for ppc32 execmem issue and new build-id - Add %%{?dist} as per policy From af7fbe80509fe6ab6e6f6b58cd9079d91790695c Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Thu, 29 May 2008 15:51:32 +0000 Subject: [PATCH 3/7] fix license tag --- xjavadoc.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xjavadoc.spec b/xjavadoc.spec index 6c45cb3..b184e8e 100644 --- a/xjavadoc.spec +++ b/xjavadoc.spec @@ -36,10 +36,10 @@ Name: xjavadoc Version: 1.1 -Release: 5jpp.3%{?dist} +Release: 5jpp.4%{?dist} Epoch: 0 Summary: The XJavaDoc engine -License: BSD Style +License: BSD URL: http://xdoclet.sourceforge.net/xjavadoc/ Group: Development/Testing Source0: xjavadoc-src-1.1-RHCLEAN.tar.bz2 @@ -188,6 +188,9 @@ fi %ghost %doc %{_javadocdir}/%{name} %changelog +* Thu May 29 2008 Tom "spot" Callaway - 0:1.1-5jpp.4 +- fix license tag + * Mon Feb 18 2008 Fedora Release Engineering - 0:1.1-5jpp.3 - Autorebuild for GCC 4.3 From 2a48618419d72f5ed6acc06d72a749f4fae08e02 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Thu, 10 Jul 2008 20:38:00 +0000 Subject: [PATCH 4/7] fix repotag --- xjavadoc.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/xjavadoc.spec b/xjavadoc.spec index b184e8e..c0f411b 100644 --- a/xjavadoc.spec +++ b/xjavadoc.spec @@ -36,7 +36,7 @@ Name: xjavadoc Version: 1.1 -Release: 5jpp.4%{?dist} +Release: 5.5%{?dist} Epoch: 0 Summary: The XJavaDoc engine License: BSD @@ -91,8 +91,9 @@ and some nice extra features. %package javadoc Summary: Javadoc for %{name} Group: Development/Documentation -Requires(post): /bin/rm,/bin/ln -Requires(postun): /bin/rm +# for /bin/rm and /bin/ln +Requires(post): coreutils +Requires(postun): coreutils %description javadoc %{summary}. @@ -188,6 +189,9 @@ fi %ghost %doc %{_javadocdir}/%{name} %changelog +* Thu Jul 10 2008 Tom "spot" Callaway - 0:1.1-5.5 +- drop repotag + * Thu May 29 2008 Tom "spot" Callaway - 0:1.1-5jpp.4 - fix license tag From 3b300fb9e57130b86c8f0a27f5f9e154c7cfb28f Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 7 Nov 2008 04:30:22 +0000 Subject: [PATCH 5/7] Initialize branch F-10 for xjavadoc --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..dc32377 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-10 From 807ebf8a9150e74d9206e4992945c3ca527f5b08 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:33:41 +0000 Subject: [PATCH 6/7] 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 cf3d472..70789e4 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := xjavadoc 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 958f2d7689dc94612812d25ff19f05f6097789be Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:53:56 +0000 Subject: [PATCH 7/7] 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 70789e4..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xjavadoc -# $Id$ -NAME := xjavadoc -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 dc32377..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-10