Eliminate %{rpmgroup}

24 files changed, 18 insertions, 45 deletions

diff --git a/contrib/crossrpms/binutils/base-binutils.add b/contrib/crossrpms/binutils/base-binutils.add
index 9960e0641f..5f807be546 100644
--- a/contrib/crossrpms/binutils/base-binutils.add
+++ b/contrib/crossrpms/binutils/base-binutils.add
@@ -4,7 +4,7 @@
 # ==============================================================
 %package -n @rpmprefix@rtems@osversion@-base-binutils
 Summary:      base package for rtems binutils
-Group: %{rpmgroup}
+Group: Development/Tools
 Requires(post):		/sbin/install-info
 Requires(preun):	/sbin/install-info
 
diff --git a/contrib/crossrpms/binutils/binutils.add b/contrib/crossrpms/binutils/binutils.add
index 3539778f72..7c535bbc3b 100644
--- a/contrib/crossrpms/binutils/binutils.add
+++ b/contrib/crossrpms/binutils/binutils.add
@@ -4,7 +4,7 @@
 
 Name:		@rpmprefix@@tool_target@-binutils
 Summary:	Binutils for target @tool_target@
-Group:		%{rpmgroup}
+Group:		Development/Tools
 Version:	%{binutils_rpmvers}
 Release:	@BINUTILS_RPMREL@%{?dist}
 License:	GPL/LGPL
diff --git a/contrib/crossrpms/binutils/target-binutils.add b/contrib/crossrpms/binutils/target-binutils.add
index 412ea6bf27..4a1fa5f96a 100644
--- a/contrib/crossrpms/binutils/target-binutils.add
+++ b/contrib/crossrpms/binutils/target-binutils.add
@@ -3,7 +3,7 @@
 # ==============================================================
 # %package -n @rpmprefix@@tool_target@-binutils
 # Summary:      rtems binutils for @tool_target@
-# Group: %{rpmgroup}
+# Group: Development/Tools
 # Requires: @rpmprefix@rtems@osversion@-base-binutils
 
 %description -n @rpmprefix@@tool_target@-binutils
diff --git a/contrib/crossrpms/common/common.add b/contrib/crossrpms/common/common.add
index 7388f18483..83f9873ca7 100644
--- a/contrib/crossrpms/common/common.add
+++ b/contrib/crossrpms/common/common.add
@@ -10,10 +10,9 @@
 %define _mandir			%{_prefix}/man
 %endif
 
-%define rpmgroup		RTEMS/4.7
-
 %ifos cygwin cygwin32 mingw mingw32
 %define _exeext .exe
 %else
 %define _exeext %{nil}
 %endif
+
diff --git a/contrib/crossrpms/cygwin/Makefile.am b/contrib/crossrpms/cygwin/Makefile.am
index 7b9171a662..a2efe01954 100644
--- a/contrib/crossrpms/cygwin/Makefile.am
+++ b/contrib/crossrpms/cygwin/Makefile.am
@@ -36,11 +36,9 @@ $(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) binutils-sources.add
 	  -e "/[@]SOURCES[@]/r ./binutils-sources.add" \
 	  -e "/[@]SOURCES[@]/d" \
 	  -e '/^%define _prefix.*$$/d' \
-	  -e '/^%define rpmgroup.*$$/d' \
 	  -e '/^%define binutils_target.*$$/d' \
 	  -e "s,[@]rpmprefix[@],,g" \
 	  -e "s,rtems[@]osversion[@],rtems,g" \
-	  -e "s,%{rpmgroup},Development/Tools,g" \
 	  > $(TARGET)-binutils.spec.in
 CLEANFILES += $(TARGET)-binutils.spec.in
 
@@ -73,12 +71,10 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) gcc-sources.add
 	  -e "/[@]SOURCES[@]/r ./gcc-sources.add" \
 	  -e "/[@]SOURCES[@]/d" \
 	  -e '/^%define _prefix.*$$/d' \
-	  -e '/^%define rpmgroup.*$$/d' \
 	  -e "s,[@]tool_target[@]-libc,@tool_target@-sys-root,g" \
 	  -e "s,= %{newlib_version}-%{release},," \
 	  -e "s,[@]rpmprefix[@],,g" \
 	  -e "s,rtems[@]osversion[@],rtems,g" \
-	  -e "s,%{rpmgroup},Development/Tools,g" \
 	  > $(TARGET)-gcc.spec.in
 CLEANFILES += $(TARGET)-gcc.spec.in
 
diff --git a/contrib/crossrpms/freebsd5.2/Makefile.am b/contrib/crossrpms/freebsd5.2/Makefile.am
index aec6b6748e..f38b8e43c6 100644
--- a/contrib/crossrpms/freebsd5.2/Makefile.am
+++ b/contrib/crossrpms/freebsd5.2/Makefile.am
@@ -36,11 +36,9 @@ $(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) binutils-sources.add
 	  -e "/[@]SOURCES[@]/r ./binutils-sources.add" \
 	  -e "/[@]SOURCES[@]/d" \
 	  -e '/^%define _prefix.*$$/d' \
-	  -e '/^%define rpmgroup.*$$/d' \
 	  -e '/^%define binutils_target.*$$/d' \
 	  -e "s,[@]rpmprefix[@],,g" \
 	  -e "s,rtems[@]osversion[@],rtems,g" \
-	  -e "s,%{rpmgroup},Development/Tools,g" \
 	  > $(TARGET)-binutils.spec.in
 CLEANFILES += $(TARGET)-binutils.spec.in
 
@@ -73,11 +71,9 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) gcc-sources.add
 	  -e "/[@]SOURCES[@]/r ./gcc-sources.add" \
 	  -e "/[@]SOURCES[@]/d" \
 	  -e '/^%define _prefix.*$$/d' \
-	  -e '/^%define rpmgroup.*$$/d' \
 	  -e '/^%define gcc_target.*$$/d' \
 	  -e "s,[@]rpmprefix[@],,g" \
 	  -e "s,rtems[@]osversion[@],rtems,g" \
-	  -e "s,%{rpmgroup},Development/Tools,g" \
 	  -e "s,[@]tool_target[@]-libc,@tool_target@-sys-root,g" \
 	  -e "s,= %{newlib_version}-%{release},," \
 	  -e "/--with-newlib/d" \
diff --git a/contrib/crossrpms/freebsd6.0/Makefile.am b/contrib/crossrpms/freebsd6.0/Makefile.am
index 61cae4d90f..dde76035be 100644
--- a/contrib/crossrpms/freebsd6.0/Makefile.am
+++ b/contrib/crossrpms/freebsd6.0/Makefile.am
@@ -36,11 +36,9 @@ $(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) binutils-sources.add
 	  -e "/[@]SOURCES[@]/r ./binutils-sources.add" \
 	  -e "/[@]SOURCES[@]/d" \
 	  -e '/^%define _prefix.*$$/d' \
-	  -e '/^%define rpmgroup.*$$/d' \
 	  -e '/^%define binutils_target.*$$/d' \
 	  -e "s,[@]rpmprefix[@],,g" \
 	  -e "s,rtems[@]osversion[@],rtems,g" \
-	  -e "s,%{rpmgroup},Development/Tools,g" \
 	  > $(TARGET)-binutils.spec.in
 CLEANFILES += $(TARGET)-binutils.spec.in
 
@@ -73,11 +71,9 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) gcc-sources.add
 	  -e "/[@]SOURCES[@]/r ./gcc-sources.add" \
 	  -e "/[@]SOURCES[@]/d" \
 	  -e '/^%define _prefix.*$$/d' \
-	  -e '/^%define rpmgroup.*$$/d' \
 	  -e '/^%define gcc_target.*$$/d' \
 	  -e "s,[@]rpmprefix[@],,g" \
 	  -e "s,rtems[@]osversion[@],rtems,g" \
-	  -e "s,%{rpmgroup},Development/Tools,g" \
 	  -e "s,[@]tool_target[@]-libc,@tool_target@-sys-root,g" \
 	  -e "s,= %{newlib_version}-%{release},," \
 	  -e "/--with-newlib/d" \
diff --git a/contrib/crossrpms/gcc/base-g77.add b/contrib/crossrpms/gcc/base-g77.add
index cf92c1bbc4..22c595548a 100644
--- a/contrib/crossrpms/gcc/base-g77.add
+++ b/contrib/crossrpms/gcc/base-g77.add
@@ -5,7 +5,7 @@
 # ==============================================================
 %package -n @rpmprefix@rtems@osversion@-base-g77
 Summary:        Base package for RTEMS gcc/g77 compiler
-Group:          %{rpmgroup}
+Group:          Development/Tools
 Version:        %{gcc_version}
 License:	GPL
 
diff --git a/contrib/crossrpms/gcc/base-gcc.add b/contrib/crossrpms/gcc/base-gcc.add
index d1dbfdbb52..2bee1e4e3e 100644
--- a/contrib/crossrpms/gcc/base-gcc.add
+++ b/contrib/crossrpms/gcc/base-gcc.add
@@ -4,7 +4,7 @@
 # ==============================================================
 %package -n @rpmprefix@rtems@osversion@-base-gcc
 Summary:	Base package for rtems gcc and newlib C Library
-Group:          %{rpmgroup}
+Group:          Development/Tools
 Version:        %{gcc_version}
 License:	GPL
 
diff --git a/contrib/crossrpms/gcc/base-gcj.add b/contrib/crossrpms/gcc/base-gcj.add
index a9534deae2..e08a623c3f 100644
--- a/contrib/crossrpms/gcc/base-gcj.add
+++ b/contrib/crossrpms/gcc/base-gcj.add
@@ -5,7 +5,7 @@
 # ==============================================================
 %package -n @rpmprefix@rtems@osversion@-base-gcj
 Summary:        Base package for rtems gcc/java compiler (gcj)
-Group:          %{rpmgroup}
+Group:          Development/Tools
 Version:        %{gcc_version}
 License:	GPL
 
diff --git a/contrib/crossrpms/gcc/base-gfortran.add b/contrib/crossrpms/gcc/base-gfortran.add
index 15c77672c4..99bbde7ce7 100644
--- a/contrib/crossrpms/gcc/base-gfortran.add
+++ b/contrib/crossrpms/gcc/base-gfortran.add
@@ -5,7 +5,7 @@
 # ==============================================================
 %package -n @rpmprefix@rtems@osversion@-base-gfortran
 Summary:	Base package for RTEMS gcc/gfortran compiler
-Group:          %{rpmgroup}
+Group:          Development/Tools
 License:	GPL
 
 Requires(post): 	/sbin/install-info
diff --git a/contrib/crossrpms/gcc/base-gnat.add b/contrib/crossrpms/gcc/base-gnat.add
index 8835e215bd..827dd6180e 100644
--- a/contrib/crossrpms/gcc/base-gnat.add
+++ b/contrib/crossrpms/gcc/base-gnat.add
@@ -5,7 +5,7 @@
 # ==============================================================
 %package -n @rpmprefix@rtems@osversion@-base-gnat
 Summary:	Base package for RTEMS gcc/gnat compiler
-Group: 		%{rpmgroup}
+Group: 		Development/Tools
 License:	GPL
 
 Requires(post): 	/sbin/install-info
diff --git a/contrib/crossrpms/gcc/gccnewlib.add b/contrib/crossrpms/gcc/gccnewlib.add
index 67c9770cdf..27e4af1739 100644
--- a/contrib/crossrpms/gcc/gccnewlib.add
+++ b/contrib/crossrpms/gcc/gccnewlib.add
@@ -15,7 +15,7 @@
 Name:         	@rpmprefix@@tool_target@-gcc
 Summary:      	@tool_target@ gcc
 
-Group:	      	%{rpmgroup}
+Group:	      	Development/Tools
 Version:        %gcc_rpmvers
 Release:      	@GCC_RPMREL@%{?dist}
 License:      	GPL
diff --git a/contrib/crossrpms/gcc/target-c++.add b/contrib/crossrpms/gcc/target-c++.add
index d27e1870bf..9fe7cacd99 100644
--- a/contrib/crossrpms/gcc/target-c++.add
+++ b/contrib/crossrpms/gcc/target-c++.add
@@ -4,7 +4,7 @@
 # ==============================================================
 %package -n @rpmprefix@@tool_target@-c++
 Summary:	GCC c++ compiler for @tool_target@
-Group:		%{rpmgroup}
+Group:		Development/Tools
 Version:	%{gcc_version}
 License:	GPL
 
diff --git a/contrib/crossrpms/gcc/target-g77.add b/contrib/crossrpms/gcc/target-g77.add
index 689514e9ba..88b8694bd5 100644
--- a/contrib/crossrpms/gcc/target-g77.add
+++ b/contrib/crossrpms/gcc/target-g77.add
@@ -4,7 +4,7 @@
 # ==============================================================
 %package -n @rpmprefix@@tool_target@-g77
 Summary:        Fortran 77 support for @tool_target@-gcc
-Group:          %{rpmgroup}
+Group:          Development/Tools
 Version:	%{gcc_version}
 License:	GPL
 Requires:       @rpmprefix@rtems@osversion@-base-g77
diff --git a/contrib/crossrpms/gcc/target-gcc.add b/contrib/crossrpms/gcc/target-gcc.add
index 3492971cfd..c0c943a478 100644
--- a/contrib/crossrpms/gcc/target-gcc.add
+++ b/contrib/crossrpms/gcc/target-gcc.add
@@ -3,7 +3,7 @@
 # ==============================================================
 %package -n @rpmprefix@@tool_target@-gcc
 Summary:        GNU cc compiler for @tool_target@
-Group:          %{rpmgroup}
+Group:          Development/Tools
 Version:        %{gcc_version}
 Requires:       @rpmprefix@@tool_target@-binutils
 Requires:       @rpmprefix@@tool_target@-libc = %{newlib_version}-%{release}
diff --git a/contrib/crossrpms/gcc/target-gcj.add b/contrib/crossrpms/gcc/target-gcj.add
index bb735eca4a..598335d6a4 100644
--- a/contrib/crossrpms/gcc/target-gcj.add
+++ b/contrib/crossrpms/gcc/target-gcj.add
@@ -4,7 +4,7 @@
 # ==============================================================
 %package -n @rpmprefix@@tool_target@-gcj
 Summary:        Java support (gcj) for @tool_target@-gcc
-Group:          %{rpmgroup}
+Group:          Development/Tools
 Version:	%{gcc_version}
 License:	GPL
 
diff --git a/contrib/crossrpms/gcc/target-gfortran.add b/contrib/crossrpms/gcc/target-gfortran.add
index 988ba3fffb..8abf0db232 100644
--- a/contrib/crossrpms/gcc/target-gfortran.add
+++ b/contrib/crossrpms/gcc/target-gfortran.add
@@ -4,7 +4,7 @@
 # ==============================================================
 %package -n @rpmprefix@@tool_target@-gfortran
 Summary:	Fortran 95 support for @tool_target@-gcc
-Group:          %{rpmgroup}
+Group:          Development/Tools
 Version:	%{gcc_version}
 License:	GPL
 
diff --git a/contrib/crossrpms/gcc/target-gnat.add b/contrib/crossrpms/gcc/target-gnat.add
index f0a3c5d0cc..20fd8a287d 100644
--- a/contrib/crossrpms/gcc/target-gnat.add
+++ b/contrib/crossrpms/gcc/target-gnat.add
@@ -4,7 +4,7 @@
 # ==============================================================
 %package -n @rpmprefix@@tool_target@-gnat
 Summary:        Ada support for for @tool_target@-gcc
-Group:          %{rpmgroup}
+Group:          Development/Tools
 Version:        %{gcc_version}
 License:	GPL
 
diff --git a/contrib/crossrpms/gcc/target-libc.add b/contrib/crossrpms/gcc/target-libc.add
index e081abba77..b23a802944 100644
--- a/contrib/crossrpms/gcc/target-libc.add
+++ b/contrib/crossrpms/gcc/target-libc.add
@@ -3,7 +3,7 @@
 # ==============================================================
 %package -n @rpmprefix@@tool_target@-libc
 Summary:      	C Library (newlib) for @tool_target@
-Group: 		%{rpmgroup}
+Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
 Provides:	@rpmprefix@@tool_target@-newlib = %{newlib_version}-%{release}
diff --git a/contrib/crossrpms/gcc/target-objc.add b/contrib/crossrpms/gcc/target-objc.add
index cdf97f89e3..663aa4e3bb 100644
--- a/contrib/crossrpms/gcc/target-objc.add
+++ b/contrib/crossrpms/gcc/target-objc.add
@@ -4,7 +4,7 @@
 # ==============================================================
 %package -n @rpmprefix@@tool_target@-objc
 Summary:        Objective C support for @tool_target@-gcc
-Group:          %{rpmgroup}
+Group:          Development/Tools
 Version:        %{gcc_version}
 License:	GPL
 Requires:       @rpmprefix@@tool_target@-gcc = %{gcc_version}-%{release}
diff --git a/contrib/crossrpms/mingw32/Makefile.am b/contrib/crossrpms/mingw32/Makefile.am
index c79d0fca61..fac2526ff4 100644
--- a/contrib/crossrpms/mingw32/Makefile.am
+++ b/contrib/crossrpms/mingw32/Makefile.am
@@ -17,7 +17,6 @@ LIBS_SUBPACKAGES += target-libs.add
 $(TARGET)-libs.spec.in: $(LIBS_SUBPACKAGES)
 	cat $(LIBS_SUBPACKAGES) | sed \
 	  -e '/^%define _prefix.*$$/d' \
-	  -e '/^%define rpmgroup.*$$/d' \
 	  -e "s,[@]rpmprefix[@],,g" \
 	> $(TARGET)-libs.spec.in
 CLEANFILES += $(TARGET)-libs.spec.in
@@ -43,7 +42,6 @@ W32API_SUBPACKAGES += target-w32api.add
 $(TARGET)-w32api.spec.in: $(W32API_SUBPACKAGES)
 	cat $(W32API_SUBPACKAGES) | sed \
 	  -e '/^%define _prefix.*$$/d' \
-	  -e '/^%define rpmgroup.*$$/d' \
 	  -e "s,[@]rpmprefix[@],,g" \
 	> $(TARGET)-w32api.spec.in
 CLEANFILES += $(TARGET)-w32api.spec.in
@@ -73,11 +71,9 @@ $(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) binutils-sources.add
 	  -e "/[@]SOURCES[@]/r ./binutils-sources.add" \
 	  -e "/[@]SOURCES[@]/d" \
 	  -e '/^%define _prefix.*$$/d' \
-	  -e '/^%define rpmgroup.*$$/d' \
 	  -e '/^%define binutils_target.*$$/d' \
 	  -e "s,[@]rpmprefix[@],,g" \
 	  -e "s,rtems[@]osversion[@],rtems,g" \
-	  -e "s,%{rpmgroup},Development/Tools,g" \
 	  > $(TARGET)-binutils.spec.in
 CLEANFILES += $(TARGET)-binutils.spec.in
 
@@ -110,11 +106,9 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) gcc-sources.add
 	  -e "/[@]SOURCES[@]/r ./gcc-sources.add" \
 	  -e "/[@]SOURCES[@]/d" \
 	  -e '/^%define _prefix.*$$/d' \
-	  -e '/^%define rpmgroup.*$$/d' \
 	  -e '/^%define gcc_target.*$$/d' \
 	  -e "s,[@]rpmprefix[@],,g" \
 	  -e "s,rtems[@]osversion[@],rtems,g" \
-	  -e "s,%{rpmgroup},Development/Tools,g" \
 	  -e "s,[@]tool_target[@]-libc,@tool_target@-sys-root,g" \
 	  -e "s,= %{newlib_version}-%{release},," \
 	  -e "/^%package -n @tool_target@-gcc/d" \
diff --git a/contrib/crossrpms/rtems/Makefile.am b/contrib/crossrpms/rtems/Makefile.am
index eba0ec7ffb..f93a9d1f60 100644
--- a/contrib/crossrpms/rtems/Makefile.am
+++ b/contrib/crossrpms/rtems/Makefile.am
@@ -21,11 +21,9 @@ $(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) binutils-sources.add
 	  -e "/[@]SOURCES[@]/r ./binutils-sources.add" \
 	  -e "/[@]SOURCES[@]/d" \
 	  -e '/^%define _prefix.*$$/d' \
-	  -e '/^%define rpmgroup.*$$/d' \
 	  -e '/^%define binutils_target.*$$/d' \
 	  -e "s,[@]rpmprefix[@],,g" \
 	  -e "s,rtems[@]osversion[@],rtems,g" \
-	  -e "s,%{rpmgroup},Development/Tools,g" \
 	  > $(TARGET)-binutils.spec.in
 CLEANFILES += $(TARGET)-binutils.spec.in
 
@@ -57,11 +55,9 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) gcc-sources.add
 	  -e "/[@]SOURCES[@]/r ./gcc-sources.add" \
 	  -e "/[@]SOURCES[@]/d" \
 	  -e '/^%define _prefix.*$$/d' \
-	  -e '/^%define rpmgroup.*$$/d' \
 	  -e '/^%define gcc_target.*$$/d' \
 	  -e "s,[@]rpmprefix[@],,g" \
 	  -e "s,rtems[@]osversion[@],rtems,g" \
-	  -e "s,%{rpmgroup},Development/Tools,g" \
 	  -e "/^%package -n @tool_target@-gcc/d" \
 	  -e 's,^%define build_newlib.*$$,%define build_newlib 1,' \
 	  > $(TARGET)-gcc.spec.in
diff --git a/contrib/crossrpms/solaris2.7/Makefile.am b/contrib/crossrpms/solaris2.7/Makefile.am
index 51a259d630..ae7797e5f2 100644
--- a/contrib/crossrpms/solaris2.7/Makefile.am
+++ b/contrib/crossrpms/solaris2.7/Makefile.am
@@ -36,11 +36,9 @@ $(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) binutils-sources.add
 	  -e "/[@]SOURCES[@]/r ./binutils-sources.add" \
 	  -e "/[@]SOURCES[@]/d" \
 	  -e '/^%define _prefix.*$$/d' \
-	  -e '/^%define rpmgroup.*$$/d' \
 	  -e '/^%define binutils_target.*$$/d' \
 	  -e "s,[@]rpmprefix[@],,g" \
 	  -e "s,rtems[@]osversion[@],rtems,g" \
-	  -e "s,%{rpmgroup},Development/Tools,g" \
 	  > $(TARGET)-binutils.spec.in
 CLEANFILES += $(TARGET)-binutils.spec.in
 
@@ -73,11 +71,9 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) gcc-sources.add
 	  -e "/[@]SOURCES[@]/r ./gcc-sources.add" \
 	  -e "/[@]SOURCES[@]/d" \
 	  -e '/^%define _prefix.*$$/d' \
-	  -e '/^%define rpmgroup.*$$/d' \
 	  -e '/^%define gcc_target.*$$/d' \
 	  -e "s,[@]rpmprefix[@],,g" \
 	  -e "s,rtems[@]osversion[@],rtems,g" \
-	  -e "s,%{rpmgroup},Development/Tools,g" \
 	  -e "s,[@]tool_target[@]-libc,@tool_target@-sys-root,g" \
 	  -e "s,= %{newlib_version}-%{release},," \
 	  -e "/--with-newlib/d" \