From b1e878276fd83aceb22e0e2855d94000f851a162 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 15 Oct 2007 19:32:05 +0000 Subject: [PATCH 01/22] 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 4bf57b60a86b8b68e39edc29b6ec0826ea09dda6 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 15 Oct 2007 19:32:05 +0000 Subject: [PATCH 02/22] makefile update to properly grab makefile.common --- Makefile | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 5ec4a11..fdeeb31 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,21 @@ # Makefile for source rpm: xjavadoc -# $Id$ +# $Id: Makefile,v 1.1 2004/10/15 18:13:43 fnasser Exp $ 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 03/22] - 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 9fcf2821d1abf3a06fcf6964a2092b7fe20c57ec Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 19 Feb 2008 00:58:38 +0000 Subject: [PATCH 04/22] - 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 05/22] 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 de1eb7715562a80750890accb1eff1ce707012b6 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Thu, 29 May 2008 15:51:32 +0000 Subject: [PATCH 06/22] 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 07/22] 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 e67b421725f276ccbee8bcb34b9993610e8d0556 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Thu, 10 Jul 2008 20:38:00 +0000 Subject: [PATCH 08/22] 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 1b6852808a25f302ee5f196c7cb893a3f9e9b663 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Thu, 26 Feb 2009 09:43:34 +0000 Subject: [PATCH 09/22] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- xjavadoc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xjavadoc.spec b/xjavadoc.spec index c0f411b..70c8c40 100644 --- a/xjavadoc.spec +++ b/xjavadoc.spec @@ -36,7 +36,7 @@ Name: xjavadoc Version: 1.1 -Release: 5.5%{?dist} +Release: 6.5%{?dist} Epoch: 0 Summary: The XJavaDoc engine License: BSD @@ -189,6 +189,9 @@ fi %ghost %doc %{_javadocdir}/%{name} %changelog +* Thu Feb 26 2009 Fedora Release Engineering - 0:1.1-6.5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Thu Jul 10 2008 Tom "spot" Callaway - 0:1.1-5.5 - drop repotag From 4a269d6cb920edc375c3f2f121d54b6b9824da85 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Thu, 26 Feb 2009 09:43:34 +0000 Subject: [PATCH 10/22] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- xjavadoc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xjavadoc.spec b/xjavadoc.spec index c0f411b..70c8c40 100644 --- a/xjavadoc.spec +++ b/xjavadoc.spec @@ -36,7 +36,7 @@ Name: xjavadoc Version: 1.1 -Release: 5.5%{?dist} +Release: 6.5%{?dist} Epoch: 0 Summary: The XJavaDoc engine License: BSD @@ -189,6 +189,9 @@ fi %ghost %doc %{_javadocdir}/%{name} %changelog +* Thu Feb 26 2009 Fedora Release Engineering - 0:1.1-6.5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Thu Jul 10 2008 Tom "spot" Callaway - 0:1.1-5.5 - drop repotag From 1a8a68f79ad34d4ce866251614f47eb4bb516b14 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 27 Jul 2009 08:06:40 +0000 Subject: [PATCH 11/22] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- xjavadoc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xjavadoc.spec b/xjavadoc.spec index 70c8c40..82b6d02 100644 --- a/xjavadoc.spec +++ b/xjavadoc.spec @@ -36,7 +36,7 @@ Name: xjavadoc Version: 1.1 -Release: 6.5%{?dist} +Release: 7.5%{?dist} Epoch: 0 Summary: The XJavaDoc engine License: BSD @@ -189,6 +189,9 @@ fi %ghost %doc %{_javadocdir}/%{name} %changelog +* Mon Jul 27 2009 Fedora Release Engineering - 0:1.1-7.5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Thu Feb 26 2009 Fedora Release Engineering - 0:1.1-6.5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From d6af880696959fc8850eab5fc7cd86a760a6e1c6 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 27 Jul 2009 08:06:40 +0000 Subject: [PATCH 12/22] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- xjavadoc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xjavadoc.spec b/xjavadoc.spec index 70c8c40..82b6d02 100644 --- a/xjavadoc.spec +++ b/xjavadoc.spec @@ -36,7 +36,7 @@ Name: xjavadoc Version: 1.1 -Release: 6.5%{?dist} +Release: 7.5%{?dist} Epoch: 0 Summary: The XJavaDoc engine License: BSD @@ -189,6 +189,9 @@ fi %ghost %doc %{_javadocdir}/%{name} %changelog +* Mon Jul 27 2009 Fedora Release Engineering - 0:1.1-7.5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Thu Feb 26 2009 Fedora Release Engineering - 0:1.1-6.5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From 282e1171ff442d13efb1efc277051506ef128c35 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:40:59 +0000 Subject: [PATCH 13/22] 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 869d0803b70632296575dad7faea6a8e3aea716b Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:40:59 +0000 Subject: [PATCH 14/22] 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 fdeeb31..128d962 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: xjavadoc -# $Id: Makefile,v 1.1 2004/10/15 18:13:43 fnasser Exp $ +# $Id: Makefile,v 1.2 2007/10/15 19:32:05 notting Exp $ 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 938272f6084891af8254c9503a3ddf127fd7e198 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 17 Feb 2010 03:31:03 +0000 Subject: [PATCH 15/22] Initialize branch F-13 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..baa94ef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-13 From d2a175eb7dda5c171e6d66212ffa12cc5aaaa73e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:53:54 +0000 Subject: [PATCH 16/22] 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 baa94ef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-13 From 7254331b2f791507b1c07d97f0f6b415b3995c3e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:53:58 +0000 Subject: [PATCH 17/22] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile 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 128d962..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xjavadoc -# $Id: Makefile,v 1.2 2007/10/15 19:32:05 notting Exp $ -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) From 490c0ae3731ba273673095b7a2d0e496dc2c681f Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Fri, 24 Sep 2010 21:14:22 +0300 Subject: [PATCH 18/22] * Fri Sep 24 2010 Alexander Kurtakov 0:1.1-8 - Drop gcj_support. - Add shell script to generate tarball. - Fix permissions. - Drop buildroot. --- .gitignore | 1 + fetch-sources.sh | 7 +++ sources | 2 +- xjavadoc.spec | 158 +++++++++++++++++------------------------------ 4 files changed, 65 insertions(+), 103 deletions(-) create mode 100644 fetch-sources.sh diff --git a/.gitignore b/.gitignore index 9e73e6d..aeac180 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ xjavadoc-src-1.1-RHCLEAN.tar.bz2 xjavadoc noarch *.src.rpm +xjavadoc-src-1.1.tar.xz diff --git a/fetch-sources.sh b/fetch-sources.sh new file mode 100644 index 0000000..ae248ba --- /dev/null +++ b/fetch-sources.sh @@ -0,0 +1,7 @@ +#/bin/sh +cvs -d:pserver:anonymous@xdoclet.cvs.sourceforge.net:/cvsroot/xdoclet export -r XJAVADOC_1_1 xjavadoc +pushd xjavadoc +find . -name "*.zip" -exec rm {} \; +find . -name "*.jar" -exec rm {} \; +popd +tar caf xjavadoc-src-1.1.tar.xz xjavadoc \ No newline at end of file diff --git a/sources b/sources index 565bb85..668f560 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b9ab69d0d30f49ee9824947ebac395e8 xjavadoc-src-1.1-RHCLEAN.tar.bz2 +43662c4ce6b1084edf1240bb2a4fc0e1 xjavadoc-src-1.1.tar.xz diff --git a/xjavadoc.spec b/xjavadoc.spec index 82b6d02..d798855 100644 --- a/xjavadoc.spec +++ b/xjavadoc.spec @@ -28,72 +28,53 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -%define _with_gcj_support 1 - -%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}} - -%define section free - -Name: xjavadoc -Version: 1.1 -Release: 7.5%{?dist} -Epoch: 0 -Summary: The XJavaDoc engine -License: BSD -URL: http://xdoclet.sourceforge.net/xjavadoc/ -Group: Development/Testing -Source0: xjavadoc-src-1.1-RHCLEAN.tar.bz2 -# cvs -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/xdoclet login -# cvs -z3 -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/xdoclet export -r XJAVADOC_1_1 xjavadoc -Patch0: %{name}-build_xml.patch -BuildRequires: java -BuildRequires: java-devel >= 0:1.4.2 -BuildRequires: jpackage-utils -BuildRequires: junit -BuildRequires: ant >= 0:1.6 -BuildRequires: ant-nodeps >= 0:1.6 -BuildRequires: ant-junit >= 0:1.6 -BuildRequires: jakarta-commons-logging -BuildRequires: jakarta-commons-collections -BuildRequires: xml-commons-apis -BuildRequires: log4j -BuildRequires: javacc -BuildRequires: xalan-j2 -BuildRequires: jrefactory -Requires: java -Requires: jakarta-commons-logging -Requires: jakarta-commons-collections -Requires: xml-commons-apis -Requires: log4j -Requires: xalan-j2 -Requires: jrefactory -%if ! %{gcj_support} -BuildArch: noarch -%endif -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot - -%if %{gcj_support} -BuildRequires: java-gcj-compat-devel -Requires(post): java-gcj-compat -Requires(postun): java-gcj-compat -%endif +Name: xjavadoc +Version: 1.1 +Release: 8%{?dist} +Epoch: 0 +Summary: JavaDoc engine that is fast and more suited for XDoclet +License: BSD +URL: http://xdoclet.sourceforge.net/xjavadoc/ +Group: Development/Tools +Source0: xjavadoc-src-1.1.tar.xz +Source1: fetch-sources.sh +Patch0: xjavadoc-build_xml.patch +BuildRequires: java +BuildRequires: java-devel >= 0:1.4.2 +BuildRequires: jpackage-utils +BuildRequires: junit +BuildRequires: ant >= 0:1.6 +BuildRequires: ant-nodeps >= 0:1.6 +BuildRequires: ant-junit >= 0:1.6 +BuildRequires: apache-commons-logging +BuildRequires: jakarta-commons-collections +BuildRequires: xml-commons-apis +BuildRequires: log4j +BuildRequires: javacc +BuildRequires: xalan-j2 +BuildRequires: jrefactory +Requires: java +Requires: apache-commons-logging +Requires: jakarta-commons-collections +Requires: xml-commons-apis +Requires: log4j +Requires: xalan-j2 +Requires: jrefactory +BuildArch: noarch %description -The XJavaDoc engine is a complete rewrite of Sun's -JavaDoc engine that is faster and more suited for -XDoclet (although it is completely standalone). It -scans java source code and makes information about -a class available via special java beans that are -part of the XJavaDoc core. These beans provide the -same information about a class as Sun's JavaDoc API, -and some nice extra features. +A complete rewrite of Sun's JavaDoc engine that is +faster and more suited for XDoclet (although it is +completely standalone). It scans java source code +and makes information about a class available via +special java beans that are part of the XJavaDoc core. +These beans provide the same information about a class +as Sun's JavaDoc API, and some nice extra features. %package javadoc Summary: Javadoc for %{name} -Group: Development/Documentation -# for /bin/rm and /bin/ln -Requires(post): coreutils -Requires(postun): coreutils +Group: Documentation +Requires: jpackage-utils %description javadoc %{summary}. @@ -102,8 +83,8 @@ Requires(postun): coreutils %setup -q -n %{name} find . -name "*.zip" -exec rm {} \; find . -name "*.jar" -exec rm {} \; +%patch0 -%patch0 -b .sav %build build-jar-repository -s -p lib \ @@ -118,9 +99,6 @@ jrefactory \ ant \ -#Fix these binary deps -#BINCLASSPATH=$PWD/lib/ConfigLog4j.jar - ant -Djavacchome=/usr/share/java javadoc %install @@ -140,55 +118,30 @@ install -m 644 docs/architecture.txt $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version #javadoc install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink - -%if %{gcj_support} -%{_bindir}/aot-compile-rpm -%endif +ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} %clean -[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT - -%post javadoc -rm -f %{_javadocdir}/%{name} -ln -s %{name}-%{version} %{_javadocdir}/%{name} - -%postun javadoc -if [ "$1" = "0" ]; then - rm -f %{_javadocdir}/%{name} -fi - -%post -%if %{gcj_support} -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif - -%postun -%if %{gcj_support} -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif +rm -rf $RPM_BUILD_ROOT %files -%defattr(0644,root,root,0755) +%defattr(-,root,root,-) +%doc LICENSE.txt %{_javadir}/* %{_docdir}/%{name}-%{version} -%if %{gcj_support} -%attr(-,root,root) %{_libdir}/gcj/%{name} -%endif - %files javadoc %defattr(-,root,root,-) +%doc LICENSE.txt %doc %{_javadocdir}/%{name}-%{version} -%ghost %doc %{_javadocdir}/%{name} +%doc %{_javadocdir}/%{name} %changelog +* Fri Sep 24 2010 Alexander Kurtakov 0:1.1-8 +- Drop gcj_support. +- Add shell script to generate tarball. +- Fix permissions. +- Drop buildroot. + * Mon Jul 27 2009 Fedora Release Engineering - 0:1.1-7.5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild @@ -239,3 +192,4 @@ fi * Mon Dec 15 2003 Paul Nasrat 1.0-1jpp - Initial Release + From 1350a4040146200c5fb62a8d3a613e3c022efb4b Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Fri, 24 Sep 2010 21:23:30 +0300 Subject: [PATCH 19/22] - Fix doc files. --- .gitignore | 1 + fetch-sources.sh | 7 ++ sources | 2 +- xjavadoc.spec | 167 +++++++++++++++++------------------------------ 4 files changed, 68 insertions(+), 109 deletions(-) create mode 100644 fetch-sources.sh diff --git a/.gitignore b/.gitignore index 9e73e6d..aeac180 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ xjavadoc-src-1.1-RHCLEAN.tar.bz2 xjavadoc noarch *.src.rpm +xjavadoc-src-1.1.tar.xz diff --git a/fetch-sources.sh b/fetch-sources.sh new file mode 100644 index 0000000..ae248ba --- /dev/null +++ b/fetch-sources.sh @@ -0,0 +1,7 @@ +#/bin/sh +cvs -d:pserver:anonymous@xdoclet.cvs.sourceforge.net:/cvsroot/xdoclet export -r XJAVADOC_1_1 xjavadoc +pushd xjavadoc +find . -name "*.zip" -exec rm {} \; +find . -name "*.jar" -exec rm {} \; +popd +tar caf xjavadoc-src-1.1.tar.xz xjavadoc \ No newline at end of file diff --git a/sources b/sources index 565bb85..668f560 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b9ab69d0d30f49ee9824947ebac395e8 xjavadoc-src-1.1-RHCLEAN.tar.bz2 +43662c4ce6b1084edf1240bb2a4fc0e1 xjavadoc-src-1.1.tar.xz diff --git a/xjavadoc.spec b/xjavadoc.spec index 82b6d02..b02da01 100644 --- a/xjavadoc.spec +++ b/xjavadoc.spec @@ -28,72 +28,53 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -%define _with_gcj_support 1 - -%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}} - -%define section free - -Name: xjavadoc -Version: 1.1 -Release: 7.5%{?dist} -Epoch: 0 -Summary: The XJavaDoc engine -License: BSD -URL: http://xdoclet.sourceforge.net/xjavadoc/ -Group: Development/Testing -Source0: xjavadoc-src-1.1-RHCLEAN.tar.bz2 -# cvs -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/xdoclet login -# cvs -z3 -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/xdoclet export -r XJAVADOC_1_1 xjavadoc -Patch0: %{name}-build_xml.patch -BuildRequires: java -BuildRequires: java-devel >= 0:1.4.2 -BuildRequires: jpackage-utils -BuildRequires: junit -BuildRequires: ant >= 0:1.6 -BuildRequires: ant-nodeps >= 0:1.6 -BuildRequires: ant-junit >= 0:1.6 -BuildRequires: jakarta-commons-logging -BuildRequires: jakarta-commons-collections -BuildRequires: xml-commons-apis -BuildRequires: log4j -BuildRequires: javacc -BuildRequires: xalan-j2 -BuildRequires: jrefactory -Requires: java -Requires: jakarta-commons-logging -Requires: jakarta-commons-collections -Requires: xml-commons-apis -Requires: log4j -Requires: xalan-j2 -Requires: jrefactory -%if ! %{gcj_support} -BuildArch: noarch -%endif -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot - -%if %{gcj_support} -BuildRequires: java-gcj-compat-devel -Requires(post): java-gcj-compat -Requires(postun): java-gcj-compat -%endif +Name: xjavadoc +Version: 1.1 +Release: 9%{?dist} +Epoch: 0 +Summary: JavaDoc engine that is fast and more suited for XDoclet +License: BSD +URL: http://xdoclet.sourceforge.net/xjavadoc/ +Group: Development/Tools +Source0: xjavadoc-src-1.1.tar.xz +Source1: fetch-sources.sh +Patch0: xjavadoc-build_xml.patch +BuildRequires: java +BuildRequires: java-devel >= 0:1.4.2 +BuildRequires: jpackage-utils +BuildRequires: junit +BuildRequires: ant >= 0:1.6 +BuildRequires: ant-nodeps >= 0:1.6 +BuildRequires: ant-junit >= 0:1.6 +BuildRequires: apache-commons-logging +BuildRequires: jakarta-commons-collections +BuildRequires: xml-commons-apis +BuildRequires: log4j +BuildRequires: javacc +BuildRequires: xalan-j2 +BuildRequires: jrefactory +Requires: java +Requires: apache-commons-logging +Requires: jakarta-commons-collections +Requires: xml-commons-apis +Requires: log4j +Requires: xalan-j2 +Requires: jrefactory +BuildArch: noarch %description -The XJavaDoc engine is a complete rewrite of Sun's -JavaDoc engine that is faster and more suited for -XDoclet (although it is completely standalone). It -scans java source code and makes information about -a class available via special java beans that are -part of the XJavaDoc core. These beans provide the -same information about a class as Sun's JavaDoc API, -and some nice extra features. +A complete rewrite of Sun's JavaDoc engine that is +faster and more suited for XDoclet (although it is +completely standalone). It scans java source code +and makes information about a class available via +special java beans that are part of the XJavaDoc core. +These beans provide the same information about a class +as Sun's JavaDoc API, and some nice extra features. %package javadoc Summary: Javadoc for %{name} -Group: Development/Documentation -# for /bin/rm and /bin/ln -Requires(post): coreutils -Requires(postun): coreutils +Group: Documentation +Requires: jpackage-utils %description javadoc %{summary}. @@ -102,8 +83,8 @@ Requires(postun): coreutils %setup -q -n %{name} find . -name "*.zip" -exec rm {} \; find . -name "*.jar" -exec rm {} \; +%patch0 -%patch0 -b .sav %build build-jar-repository -s -p lib \ @@ -118,77 +99,47 @@ jrefactory \ ant \ -#Fix these binary deps -#BINCLASSPATH=$PWD/lib/ConfigLog4j.jar - ant -Djavacchome=/usr/share/java javadoc %install [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_javadir} mkdir -p $RPM_BUILD_ROOT%{_javadocdir} -mkdir -p $RPM_BUILD_ROOT%{_docdir} install -m 644 target/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir} # version less symlinks (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) -install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} -install -m 644 LICENSE.txt $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} -install -m 644 docs/architecture.txt $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} - #javadoc install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink - -%if %{gcj_support} -%{_bindir}/aot-compile-rpm -%endif +ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} %clean -[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT - -%post javadoc -rm -f %{_javadocdir}/%{name} -ln -s %{name}-%{version} %{_javadocdir}/%{name} - -%postun javadoc -if [ "$1" = "0" ]; then - rm -f %{_javadocdir}/%{name} -fi - -%post -%if %{gcj_support} -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif - -%postun -%if %{gcj_support} -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif +rm -rf $RPM_BUILD_ROOT %files -%defattr(0644,root,root,0755) +%defattr(-,root,root,-) +%doc LICENSE.txt +%doc docs/architecture.txt %{_javadir}/* -%{_docdir}/%{name}-%{version} - -%if %{gcj_support} -%attr(-,root,root) %{_libdir}/gcj/%{name} -%endif %files javadoc %defattr(-,root,root,-) +%doc LICENSE.txt %doc %{_javadocdir}/%{name}-%{version} -%ghost %doc %{_javadocdir}/%{name} +%doc %{_javadocdir}/%{name} %changelog +* Fri Sep 24 2010 Alexander Kurtakov 0:1.1-9 +- Fix doc files. + +* Fri Sep 24 2010 Alexander Kurtakov 0:1.1-8 +- Drop gcj_support. +- Add shell script to generate tarball. +- Fix permissions. +- Drop buildroot. + * Mon Jul 27 2009 Fedora Release Engineering - 0:1.1-7.5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From 53cbb13f34407c08510d2a4e88d98a18e21e34c4 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 23:18:16 -0600 Subject: [PATCH 20/22] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- xjavadoc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xjavadoc.spec b/xjavadoc.spec index b02da01..ddd6b6c 100644 --- a/xjavadoc.spec +++ b/xjavadoc.spec @@ -30,7 +30,7 @@ Name: xjavadoc Version: 1.1 -Release: 9%{?dist} +Release: 10%{?dist} Epoch: 0 Summary: JavaDoc engine that is fast and more suited for XDoclet License: BSD @@ -131,6 +131,9 @@ rm -rf $RPM_BUILD_ROOT %doc %{_javadocdir}/%{name} %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 0:1.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Fri Sep 24 2010 Alexander Kurtakov 0:1.1-9 - Fix doc files. From b3ef75f97dbc36cfc40b1e8a69a75057794f3802 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 14 Jan 2012 02:59:11 -0600 Subject: [PATCH 21/22] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- xjavadoc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xjavadoc.spec b/xjavadoc.spec index ddd6b6c..03e0177 100644 --- a/xjavadoc.spec +++ b/xjavadoc.spec @@ -30,7 +30,7 @@ Name: xjavadoc Version: 1.1 -Release: 10%{?dist} +Release: 11%{?dist} Epoch: 0 Summary: JavaDoc engine that is fast and more suited for XDoclet License: BSD @@ -131,6 +131,9 @@ rm -rf $RPM_BUILD_ROOT %doc %{_javadocdir}/%{name} %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 0:1.1-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Mon Feb 07 2011 Fedora Release Engineering - 0:1.1-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From d6680fac593393cb19725f9abfde47ce10d05746 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Fri, 27 Jan 2012 00:05:31 +0200 Subject: [PATCH 22/22] Package is retired --- .gitignore | 5 - dead.package | 1 + fetch-sources.sh | 7 -- sources | 1 - xjavadoc-build_xml.patch | 62 ------------ xjavadoc.spec | 198 --------------------------------------- 6 files changed, 1 insertion(+), 273 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 fetch-sources.sh delete mode 100644 sources delete mode 100644 xjavadoc-build_xml.patch delete mode 100644 xjavadoc.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index aeac180..0000000 --- a/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -xjavadoc-src-1.1-RHCLEAN.tar.bz2 -xjavadoc -noarch -*.src.rpm -xjavadoc-src-1.1.tar.xz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..0f98991 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Package is retired diff --git a/fetch-sources.sh b/fetch-sources.sh deleted file mode 100644 index ae248ba..0000000 --- a/fetch-sources.sh +++ /dev/null @@ -1,7 +0,0 @@ -#/bin/sh -cvs -d:pserver:anonymous@xdoclet.cvs.sourceforge.net:/cvsroot/xdoclet export -r XJAVADOC_1_1 xjavadoc -pushd xjavadoc -find . -name "*.zip" -exec rm {} \; -find . -name "*.jar" -exec rm {} \; -popd -tar caf xjavadoc-src-1.1.tar.xz xjavadoc \ No newline at end of file diff --git a/sources b/sources deleted file mode 100644 index 668f560..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -43662c4ce6b1084edf1240bb2a4fc0e1 xjavadoc-src-1.1.tar.xz diff --git a/xjavadoc-build_xml.patch b/xjavadoc-build_xml.patch deleted file mode 100644 index d9c4667..0000000 --- a/xjavadoc-build_xml.patch +++ /dev/null @@ -1,62 +0,0 @@ ---- build.xml.orig 2004-06-29 11:23:25.332349000 +0200 -+++ build.xml 2004-06-29 15:29:29.879533000 +0200 -@@ -6,6 +6,8 @@ - - - -+ -+ - - - -@@ -83,6 +85,7 @@ - WE'RE USING THE OLD XDOCLET, THE ONE THAT USES SUN'S JAVADOC. - IT'S TO SEE IF XJAVADOC DOES THE SAME JOB AS JAVADOC - --> -+ - - - -@@ -111,6 +113,7 @@ - subTaskClassName="xdoclet.NoInnerClassSubTask" - /> - -+--> - - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - diff --git a/xjavadoc.spec b/xjavadoc.spec deleted file mode 100644 index 03e0177..0000000 --- a/xjavadoc.spec +++ /dev/null @@ -1,198 +0,0 @@ -# Copyright (c) 2000-2005, JPackage Project -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the -# distribution. -# 3. Neither the name of the JPackage Project nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -Name: xjavadoc -Version: 1.1 -Release: 11%{?dist} -Epoch: 0 -Summary: JavaDoc engine that is fast and more suited for XDoclet -License: BSD -URL: http://xdoclet.sourceforge.net/xjavadoc/ -Group: Development/Tools -Source0: xjavadoc-src-1.1.tar.xz -Source1: fetch-sources.sh -Patch0: xjavadoc-build_xml.patch -BuildRequires: java -BuildRequires: java-devel >= 0:1.4.2 -BuildRequires: jpackage-utils -BuildRequires: junit -BuildRequires: ant >= 0:1.6 -BuildRequires: ant-nodeps >= 0:1.6 -BuildRequires: ant-junit >= 0:1.6 -BuildRequires: apache-commons-logging -BuildRequires: jakarta-commons-collections -BuildRequires: xml-commons-apis -BuildRequires: log4j -BuildRequires: javacc -BuildRequires: xalan-j2 -BuildRequires: jrefactory -Requires: java -Requires: apache-commons-logging -Requires: jakarta-commons-collections -Requires: xml-commons-apis -Requires: log4j -Requires: xalan-j2 -Requires: jrefactory -BuildArch: noarch - -%description -A complete rewrite of Sun's JavaDoc engine that is -faster and more suited for XDoclet (although it is -completely standalone). It scans java source code -and makes information about a class available via -special java beans that are part of the XJavaDoc core. -These beans provide the same information about a class -as Sun's JavaDoc API, and some nice extra features. - -%package javadoc -Summary: Javadoc for %{name} -Group: Documentation -Requires: jpackage-utils - -%description javadoc -%{summary}. - -%prep -%setup -q -n %{name} -find . -name "*.zip" -exec rm {} \; -find . -name "*.jar" -exec rm {} \; -%patch0 - - -%build -build-jar-repository -s -p lib \ -xalan-j2 \ -junit \ -javacc \ -log4j \ -commons-logging \ -commons-collections \ -xml-commons-apis \ -jrefactory \ -ant \ - - -ant -Djavacchome=/usr/share/java javadoc - -%install -[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%{_javadir} -mkdir -p $RPM_BUILD_ROOT%{_javadocdir} -install -m 644 target/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir} - -# version less symlinks -(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) - -#javadoc -install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} - -%clean -rm -rf $RPM_BUILD_ROOT - -%files -%defattr(-,root,root,-) -%doc LICENSE.txt -%doc docs/architecture.txt -%{_javadir}/* - -%files javadoc -%defattr(-,root,root,-) -%doc LICENSE.txt -%doc %{_javadocdir}/%{name}-%{version} -%doc %{_javadocdir}/%{name} - -%changelog -* Sat Jan 14 2012 Fedora Release Engineering - 0:1.1-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Mon Feb 07 2011 Fedora Release Engineering - 0:1.1-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Fri Sep 24 2010 Alexander Kurtakov 0:1.1-9 -- Fix doc files. - -* Fri Sep 24 2010 Alexander Kurtakov 0:1.1-8 -- Drop gcj_support. -- Add shell script to generate tarball. -- Fix permissions. -- Drop buildroot. - -* Mon Jul 27 2009 Fedora Release Engineering - 0:1.1-7.5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Thu Feb 26 2009 Fedora Release Engineering - 0:1.1-6.5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* 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 - -* 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 - -* Mon Mar 26 2007 Deepak Bhole 1.1-4jpp.2 -- Fixed incorrect entry in the files section - -* Thu Aug 10 2006 Deepak Bhole 1.1-4jpp.1 -- Added missing postun section for javadoc. -- Added missing requirements. - -* Mon Jul 24 2006 Deepak Bhole 1.1-3jpp_1fc -- Added conditional native compilation. -- BR fixes. - -* Thu Apr 06 2005 Ralph Apel 1.1-2jpp -- First JPP-1.7 release - -* Tue Feb 15 2005 Ralph Apel 1.1-1jpp -- upgrade to 1.1 -- replace requirement of xml-commons by xml-commons-apis - -* Thu Aug 26 2004 Ralph Apel 1.0.3-2jpp -- Build with ant-1.6.2 - -* Fri Jul 02 2004 Ralph Apel 1.0.3-1jpp -- upgrade to 1.0.3 -- just eliminate __GENERATED__ tests because no sources for old xdoclet -- add xjavadoc javadoc subpackage - -* Tue Dec 16 2003 Paul Nasrat 1.0-2jpp -- fix non-versioned symlink typo - -* Mon Dec 15 2003 Paul Nasrat 1.0-1jpp -- Initial Release