2004-02-10 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* rtemsdoc/.cvsignore: Reformat.
	* configure.ac: Add RTEMS_RPM_RELEASE.
	* Makefile.am: Reformat. Add RTEMS_RPM_RELEASE support to
	rtems-source.add
	* rtems/rtems-source.add: Add RTEMS_RPM_RELEASE.
	* rtemsdoc/mkspec.in: Remove.
	* rtemsdoc/Makefile.am: Reworked.
	* rtemsdoc/header.add: Update Copyright notice.
	* rtemsdoc/rtemsdoc.add: Add RTEMS_RPM_RELEASE.
	Add %{rpmgroup}. Remove bzip-ing *.ps.
	* rtemsdoc/supplement.add.in: Add %{rpmgroup}.
	* rtemsdoc/templ.add.in: Add %{rpmgroup}.

11 files changed, 53 insertions, 109 deletions

diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index 8cbe71e4a6..e77ae06e67 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,18 @@
+2004-02-10	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* rtemsdoc/.cvsignore: Reformat.
+	* configure.ac: Add RTEMS_RPM_RELEASE.
+	* Makefile.am: Reformat. Add RTEMS_RPM_RELEASE support to
+	rtems-source.add
+	* rtems/rtems-source.add: Add RTEMS_RPM_RELEASE.
+	* rtemsdoc/mkspec.in: Remove.
+	* rtemsdoc/Makefile.am: Reworked.
+	* rtemsdoc/header.add: Update Copyright notice.
+	* rtemsdoc/rtemsdoc.add: Add RTEMS_RPM_RELEASE.
+	Add %{rpmgroup}. Remove bzip-ing *.ps.
+	* rtemsdoc/supplement.add.in: Add %{rpmgroup}.
+	* rtemsdoc/templ.add.in: Add %{rpmgroup}.
+
 2004-02-09	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* rtems/rtems-source.add: New.
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 85744fce12..2cf7fee2f5 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -7,8 +7,8 @@ ACLOCAL_AMFLAGS = -I ../aclocal
 SUBDIRS = . binutils gccnewlib gcc3newlib gdb rtems autotools cpukit
 SUBDIRS += rtemsdoc
 
-noinst_SCRIPTS = setup buildall buildalltar mkbspspec \
-    mkgccnewlibspec mkrpms mkspec
+noinst_SCRIPTS = setup buildall buildalltar mkbspspec mkgccnewlibspec mkrpms \
+    mkspec
 
 noinst_DATA = setup.def
 
@@ -18,14 +18,17 @@ CONFIG_STATUS_DEPENDENCIES = setup.cache
 setup.cache: setup.def
 	cp setup.def $@
 
-noinst_DATA += rtems/rtems-source.spec
-rtems/rtems-source.spec: common/common.add \
-    rtems/rtems-source.add \
+rtems_source_spec_DEPENDENCIES = common/common.add rtems/rtems-source.add \
     common/clean.add
-	cat $^ | sed 's,[@]rtems_version[@],$(RTEMS_VERSION),g' > $@
+noinst_DATA += rtems/rtems-source.spec
+rtems/rtems-source.spec: $(rtems_source_spec_DEPENDENCIES)
+	cat $(rtems_source_spec_DEPENDENCIES) | sed \
+        -e 's,[@]rtems_version[@],$(RTEMS_VERSION),g' \
+        -e 's,[@]RTEMS_RPM_RELEASE[@],$(RTEMS_RPM_RELEASE),g' > $@
 
 CLEANFILES = rtems/rtems-source.spec
 
 DISTCLEANFILES = setup.cache
+
 include $(top_srcdir)/../automake/subdirs.am
 include $(top_srcdir)/../automake/local.am
diff --git a/scripts/configure.ac b/scripts/configure.ac
index c6f9aeb69d..6417b64a14 100644
--- a/scripts/configure.ac
+++ b/scripts/configure.ac
@@ -70,6 +70,7 @@ AC_SUBST(BSPVERS)
 AC_SUBST(RPM_CPU)
 AC_SUBST(rpmprefix,$rpmprefix)
 AC_SUBST(rpmgroup,[RTEMS/][RTEMS_API])
+AC_SUBST(RTEMS_RPM_RELEASE,$rtems_rpm_release)
 AC_SUBST(osversion,$osversion)
 AC_CONFIG_FILES([Makefile
 binutils/Makefile
diff --git a/scripts/rtems/rtems-source.add b/scripts/rtems/rtems-source.add
index 4197361081..3ec4671c75 100644
--- a/scripts/rtems/rtems-source.add
+++ b/scripts/rtems/rtems-source.add
@@ -1,6 +1,6 @@
 Name:           %{rpmprefix}rtems-source
 Version:        @rtems_version@
-Release:        1
+Release:        @RTEMS_RPM_RELEASE@
 Epoch:          0
 Summary:        RTEMS source code
 
diff --git a/scripts/rtemsdoc/.cvsignore b/scripts/rtemsdoc/.cvsignore
index 8d02109d55..92afa99561 100644
--- a/scripts/rtemsdoc/.cvsignore
+++ b/scripts/rtemsdoc/.cvsignore
@@ -15,11 +15,11 @@ Makefile
 Makefile.in
 mips64orion-supplement.add
 mips-supplement.add
-mkspec
 networking-docs.add
 new_chapters-docs.add
 porting-docs.add
 posix1003_1-docs.add
+posix_users-docs.add
 powerpc-supplement.add
 relnotes-docs.add
 rgdb_specs-docs.add
@@ -27,6 +27,6 @@ rtems_gdb-docs.add
 sh-supplement.add
 sparc-supplement.add
 *.spec
+*.spec.in
 started_ada-docs.add
 started-docs.add
-*.spec.in
diff --git a/scripts/rtemsdoc/Makefile.am b/scripts/rtemsdoc/Makefile.am
index c294037973..e0ad53b317 100644
--- a/scripts/rtemsdoc/Makefile.am
+++ b/scripts/rtemsdoc/Makefile.am
@@ -6,29 +6,14 @@ include ${top_srcdir}/common/common.am
 
 CLEANFILES =
 
-MKSPEC = $(SHELL) ./mkspec
+SUPPLEMENTS = arm c4x hppa1_1 i386 i960 m68k mips mips64orion powerpc sh \
+    sparc
 
-MKSPEC_DEPS = mkspec rtemsdoc.spec.in \
-    $(top_builddir)/setup.cache
-
-SUPPLEMENTS = \
-  arm \
-  c4x \
-  hppa1_1 \
-  i386 \
-  i960 \
-  m68k \
-  mips \
-  mips64orion \
-  powerpc \
-  sh \
-  sparc
-
-DOCS =  ada_user posix1003_1 bsp_howto
-DOCS += c_user
-DOCS += develenv 
+DOCS = ada_user posix1003_1 bsp_howto
+DOCS += c_user posix_users
+DOCS += develenv
 DOCS += FAQ filesystem itron
-DOCS += networking porting new_chapters 
+DOCS += networking porting new_chapters
 DOCS += relnotes rgdb_specs rtems_gdb
 DOCS += started started_ada
 
@@ -37,36 +22,27 @@ SUBPACKAGES += ../common/common.add
 SUBPACKAGES += rtemsdoc.add
 SUBPACKAGES += ../common/clean.add
 SUBPACKAGES += $(DOCS:%=%-docs.add)
-CLEANFILES  += $(DOCS:%=%-docs.add)
+CLEANFILES += $(DOCS:%=%-docs.add)
 SUBPACKAGES += $(SUPPLEMENTS:%=%-supplement.add)
-CLEANFILES  += $(SUPPLEMENTS:%=%-supplement.add)
+CLEANFILES += $(SUPPLEMENTS:%=%-supplement.add)
 
 SUFFIXES = -supplement.add -docs.add
 
 %-supplement.add: supplement.add.in
 	t=`echo $@ | sed -e 's,-supplement.add,,'`; \
-	sed -e s/@target\@/$$t/g < $< >$@ 
+	sed -e s/@target\@/$$t/g < $< >$@
 
 %-docs.add: templ.add.in
 	t=`echo $@ | sed -e 's,-docs.add,,'`; \
-	sed -e s/@target\@/$$t/g < $< >$@ 
+	sed -e s/@target\@/$$t/g < $< >$@
 
-rtemsdoc.spec.in: $(SUBPACKAGES)
-	cat $^ > $@
-CLEANFILES += rtemsdoc.spec.in
-
-rtemsdoc.spec: $(MKSPEC_DEPS) $(SUBPACKAGES)
-	$(MKSPEC) -cfg $(top_builddir)/setup.cache > $@
+rtemsdoc.spec: $(SUBPACKAGES) Makefile
+	cat $(SUBPACKAGES) | sed \
+    	-e 's,[@]rtems_version[@],$(RTEMS_VERSION),g' \
+	-e 's,[@]rtems_rpm_release[@],$(RTEMS_RPM_RELEASE),g' \
+	 > $@
 CLEANFILES += rtemsdoc.spec
 
-RPM_SPECS_DATA = rtemsdoc.spec
-
-TEMPLATES = rtemsdoc.spec.in
-
-noinst_DATA = $(TEMPLATES)
-
-EXTRA_DIST = $(TEMPLATES)
-
-CLEANFILES += $(RPM_SPECS_DATA)
+noinst_DATA = rtemsdoc.spec
 
 include $(top_srcdir)/../automake/local.am
diff --git a/scripts/rtemsdoc/header.add b/scripts/rtemsdoc/header.add
index e4bf99318c..6806c819dc 100644
--- a/scripts/rtemsdoc/header.add
+++ b/scripts/rtemsdoc/header.add
@@ -1,4 +1,4 @@
 #
 # spec file for package rtemsdoc
 # 
-# Copyright  (c)  2003 Ralf Corsepius, Ulm, Germany
+# Copyright  (c)  2003, 2004 Ralf Corsepius, Ulm, Germany
diff --git a/scripts/rtemsdoc/mkspec.in b/scripts/rtemsdoc/mkspec.in
deleted file mode 100644
index 132e5f1050..0000000000
--- a/scripts/rtemsdoc/mkspec.in
+++ /dev/null
@@ -1,51 +0,0 @@
-#! /bin/sh 
-
-RTEMS_DIR=`dirname $0`/@top_srcdir@
-PACKAGE_BUGREPORT=@PACKAGE_BUGREPORT@
-
-CFG=../setup.cache
-
-usage()
-{
-  echo "$0 [options]"
-  echo "  options:"
-  echo "    -cfg <setup.cache>"
-  echo "    -o <rpm-spec-dir>"
-  exit 1 ;
-}
-
-specsrc=${RTEMS_DIR}/rtemsdoc/rtemsdoc.spec.in
-
-while test $# -ge 2; do
-case $1 in
--cfg) 
-  shift
-  CFG=$1
-  shift
-  ;;
--o)
-  shift
-  dst=$1
-  shift
-  ;;
--*)
-  echo "invalid option $1";
-  usage
-  ;;
-esac
-done
-
-if test ! $# -eq 0;
-then
-  echo "Invalid number of arguments" >&2
-  usage >&2
-fi
-
-. ./$CFG
-
-sed -e "s%@PACKAGE_BUGREPORT\@%@PACKAGE_BUGREPORT@%g" \
-    -e "s%@rtems_rpm_release\@%${rtems_rpm_release}%g" \
-    -e "s%@rtems_version\@%${rtems_version}%g" \
-    -e "s%@rtems_rpm_version\@%${rtems_rpm_version}%g" \
-    -e "s,@rpm_build_root\@,${rpm_build_root},g" \
-< ${specsrc}
diff --git a/scripts/rtemsdoc/rtemsdoc.add b/scripts/rtemsdoc/rtemsdoc.add
index fe5c20b145..942ae290a3 100644
--- a/scripts/rtemsdoc/rtemsdoc.add
+++ b/scripts/rtemsdoc/rtemsdoc.add
@@ -4,10 +4,11 @@
 %define srcvers	@rtems_version@
 %define rpmvers  %{expand:%%(echo @rtems_version@ | tr - _ )}
 
-Name:         rtemsdoc
+Name:         %{rpmprefix}rtemsdoc
 Release:      @rtems_rpm_release@
+Epoch:	      0
 License:      Distributable
-Group:        rtems
+Group:        %{rpmgroup}/Documentation
 
 Autoreqprov:  on
 Packager:     	corsepiu@faw.uni-ulm.de and joel@OARcorp.com
@@ -64,13 +65,12 @@ cd build
   rm -rf ${RPM_BUILD_ROOT}/%{_datadir}/rtems/html/supplements/template*
 
   gzip -9qf ${RPM_BUILD_ROOT}/%{_infodir}/*
-  bzip2 -9qf ${RPM_BUILD_ROOT}/%{_datadir}/rtems/ps/*
 
 ## base
 
 %package base
 Summary: Documentation for RTEMS ada support
-Group: rtems/documentation
+Group: %{rpmgroup}/Documentation
 
 %description base
 RTEMS is a free operating system for embedded systems.
diff --git a/scripts/rtemsdoc/supplement.add.in b/scripts/rtemsdoc/supplement.add.in
index 603db361e2..9d58b0e176 100644
--- a/scripts/rtemsdoc/supplement.add.in
+++ b/scripts/rtemsdoc/supplement.add.in
@@ -2,9 +2,9 @@
 
 %package @target@
 Summary: Documentation for RTEMS @target@ support
-Group: rtems/documentation
+Group: %{rpmgroup}/Documentation
 PreReq: /sbin/install-info
-Requires: rtemsdoc-base
+Requires: %{rpmprefix}rtemsdoc-base
 
 %description @target@
 RTEMS is a free operating system for embedded systems.
diff --git a/scripts/rtemsdoc/templ.add.in b/scripts/rtemsdoc/templ.add.in
index 9addda8290..5a0d8f7be0 100644
--- a/scripts/rtemsdoc/templ.add.in
+++ b/scripts/rtemsdoc/templ.add.in
@@ -2,9 +2,9 @@
 
 %package @target@
 Summary: Documentation for RTEMS @target@ support
-Group: rtems/documentation
+Group: %{rpmgroup}/Documentation
 PreReq: /sbin/install-info
-Requires: rtemsdoc-base
+Requires: %{rpmprefix}rtemsdoc-base
 
 %description @target@
 RTEMS is a free operating system for embedded systems.