Eliminate osversion

6 files changed, 0 insertions, 12 deletions

diff --git a/contrib/crossrpms/cygwin/Makefile.am b/contrib/crossrpms/cygwin/Makefile.am
index 6d493f150c..e06e06ac8c 100644
--- a/contrib/crossrpms/cygwin/Makefile.am
+++ b/contrib/crossrpms/cygwin/Makefile.am
@@ -48,7 +48,6 @@ $(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) Makefile.am binutils-sources
 	  -e "/[@]SOURCES[@]/d" \
 	  -e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \
 	  -e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)/g" \
-	  -e "s,rtems[@]osversion[@],rtems,g" \
 	  > $(TARGET)-binutils.spec.in
 CLEANFILES += $(TARGET)-binutils.spec.in
 
@@ -78,7 +77,6 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am gcc-sources.add
 	  -e "/[@]SOURCES[@]/d" \
 	  -e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \
 	  -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)/g" \
-	  -e "s,rtems[@]osversion[@],rtems,g" \
 	  -e "s,[@]tool_target[@]-libc,@tool_target@-sys-root,g" \
 	  -e "/^%package -n @rpmprefix@@tool_target@-gcc/d" \
 	  -e "s/-n @rpmprefix@@tool_target@-gcc//" \
diff --git a/contrib/crossrpms/freebsd5.2/Makefile.am b/contrib/crossrpms/freebsd5.2/Makefile.am
index 0c98dd4a8f..6ebf32a8dc 100644
--- a/contrib/crossrpms/freebsd5.2/Makefile.am
+++ b/contrib/crossrpms/freebsd5.2/Makefile.am
@@ -48,7 +48,6 @@ $(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) Makefile.am binutils-sources
 	  -e "/[@]SOURCES[@]/d" \
 	  -e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \
 	  -e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)/g" \
-	  -e "s,rtems[@]osversion[@],rtems,g" \
 	  > $(TARGET)-binutils.spec.in
 CLEANFILES += $(TARGET)-binutils.spec.in
 
@@ -78,7 +77,6 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am gcc-sources.add
 	  -e "/[@]SOURCES[@]/d" \
 	  -e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \
 	  -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)/g" \
-	  -e "s,rtems[@]osversion[@],rtems,g" \
 	  -e "s,[@]tool_target[@]-libc,@tool_target@-sys-root,g" \
 	  -e "/--with-newlib/d" \
 	  -e "/^%package -n @rpmprefix@@tool_target@-gcc/d" \
diff --git a/contrib/crossrpms/freebsd6.0/Makefile.am b/contrib/crossrpms/freebsd6.0/Makefile.am
index 0ca0cb3e09..9944050812 100644
--- a/contrib/crossrpms/freebsd6.0/Makefile.am
+++ b/contrib/crossrpms/freebsd6.0/Makefile.am
@@ -48,7 +48,6 @@ $(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) Makefile.am binutils-sources
 	  -e "/[@]SOURCES[@]/d" \
 	  -e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \
 	  -e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)/g" \
-	  -e "s,rtems[@]osversion[@],rtems,g" \
 	  > $(TARGET)-binutils.spec.in
 CLEANFILES += $(TARGET)-binutils.spec.in
 
@@ -78,7 +77,6 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am gcc-sources.add
 	  -e "/[@]SOURCES[@]/d" \
 	  -e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \
 	  -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)/g" \
-	  -e "s,rtems[@]osversion[@],rtems,g" \
 	  -e "s,[@]tool_target[@]-libc,@tool_target@-sys-root,g" \
 	  -e "/--with-newlib/d" \
 	  -e "/^%package -n @rpmprefix@@tool_target@-gcc/d" \
diff --git a/contrib/crossrpms/mingw32/Makefile.am b/contrib/crossrpms/mingw32/Makefile.am
index c6253c2bcd..67b495db87 100644
--- a/contrib/crossrpms/mingw32/Makefile.am
+++ b/contrib/crossrpms/mingw32/Makefile.am
@@ -69,7 +69,6 @@ $(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) Makefile.am binutils-sources
 	  -e "/[@]SOURCES[@]/d" \
 	  -e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \
 	  -e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)/g" \
-	  -e "s,rtems[@]osversion[@],rtems,g" \
 	  > $(TARGET)-binutils.spec.in
 CLEANFILES += $(TARGET)-binutils.spec.in
 
@@ -99,7 +98,6 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am gcc-sources.add
 	  -e "/[@]SOURCES[@]/d" \
 	  -e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \
 	  -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)/g" \
-	  -e "s,rtems[@]osversion[@],rtems,g" \
 	  -e "/[@]rpmprefix[@][@]tool_target[@]-libc/d" \
 	  -e "s,^%define[ ]*_cxx[ 	]*1,%define _cxx		0," \
 	  -e "/^%package -n @rpmprefix@@tool_target@-gcc/d" \
diff --git a/contrib/crossrpms/rtems/Makefile.am b/contrib/crossrpms/rtems/Makefile.am
index e689776575..d6ba5031b3 100644
--- a/contrib/crossrpms/rtems/Makefile.am
+++ b/contrib/crossrpms/rtems/Makefile.am
@@ -24,7 +24,6 @@ $(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) Makefile.am binutils-sources
 	cat $(BINUTILS_SUBPACKAGES) | sed \
 	  -e "/[@]SOURCES[@]/r ./binutils-sources.add" \
 	  -e "/[@]SOURCES[@]/d" \
-	  -e "s,rtems[@]osversion[@],rtems,g" \
 	  > $(TARGET)-binutils.spec.in
 CLEANFILES += $(TARGET)-binutils.spec.in
 
@@ -55,7 +54,6 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am gcc-sources.add
 	cat $(GCC_SUBPACKAGES) | sed \
 	  -e "/[@]SOURCES[@]/r ./gcc-sources.add" \
 	  -e "/[@]SOURCES[@]/d" \
-	  -e "s,rtems[@]osversion[@],rtems,g" \
 	  -e "/^%package -n @rpmprefix@@tool_target@-gcc/d" \
 	  -e "s/-n @rpmprefix@@tool_target@-gcc//" \
 	  -e "/--with-sysroot/d" \
diff --git a/contrib/crossrpms/solaris2.7/Makefile.am b/contrib/crossrpms/solaris2.7/Makefile.am
index fdcc89697a..99ca801b92 100644
--- a/contrib/crossrpms/solaris2.7/Makefile.am
+++ b/contrib/crossrpms/solaris2.7/Makefile.am
@@ -48,7 +48,6 @@ $(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) Makefile.am binutils-sources
 	  -e "/[@]SOURCES[@]/d" \
 	  -e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \
 	  -e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)/g" \
-	  -e "s,rtems[@]osversion[@],rtems,g" \
 	  > $(TARGET)-binutils.spec.in
 CLEANFILES += $(TARGET)-binutils.spec.in
 
@@ -78,7 +77,6 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am gcc-sources.add
 	  -e "/[@]SOURCES[@]/d" \
 	  -e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \
 	  -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)/g" \
-	  -e "s,rtems[@]osversion[@],rtems,g" \
 	  -e "s,[@]tool_target[@]-libc,@tool_target@-sys-root,g" \
 	  -e "/--with-newlib/d" \
 	  -e "/^%package -n @rpmprefix@@tool_target@-gcc/d" \