From aa941f8925705b197167ad44903ec0259055e866 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Thu, 19 Feb 2009 16:49:02 +0000 Subject: Move %{?dist} handling to rtems4.10/*.am. --- contrib/crossrpms/rtems4.10/arm/Makefile.am | 10 +++++----- contrib/crossrpms/rtems4.10/avr/Makefile.am | 10 +++++----- contrib/crossrpms/rtems4.10/bfin/Makefile.am | 10 +++++----- contrib/crossrpms/rtems4.10/binutils.am | 2 +- contrib/crossrpms/rtems4.10/cpukit.am | 2 +- contrib/crossrpms/rtems4.10/gcc.am | 4 ++-- contrib/crossrpms/rtems4.10/gdb.am | 2 +- contrib/crossrpms/rtems4.10/h8300/Makefile.am | 10 +++++----- contrib/crossrpms/rtems4.10/i386/Makefile.am | 10 +++++----- contrib/crossrpms/rtems4.10/m32c/Makefile.am | 10 +++++----- contrib/crossrpms/rtems4.10/m32r/Makefile.am | 10 +++++----- contrib/crossrpms/rtems4.10/m68k/Makefile.am | 10 +++++----- contrib/crossrpms/rtems4.10/mips/Makefile.am | 10 +++++----- contrib/crossrpms/rtems4.10/mipstx39/Makefile.am | 2 +- contrib/crossrpms/rtems4.10/powerpc/Makefile.am | 10 +++++----- contrib/crossrpms/rtems4.10/sh/Makefile.am | 10 +++++----- contrib/crossrpms/rtems4.10/sparc/Makefile.am | 10 +++++----- 17 files changed, 66 insertions(+), 66 deletions(-) (limited to 'contrib/crossrpms') diff --git a/contrib/crossrpms/rtems4.10/arm/Makefile.am b/contrib/crossrpms/rtems4.10/arm/Makefile.am index 636fabbf1a..322af1258d 100644 --- a/contrib/crossrpms/rtems4.10/arm/Makefile.am +++ b/contrib/crossrpms/rtems4.10/arm/Makefile.am @@ -6,27 +6,27 @@ include $(top_srcdir)/mkspec.am BINUTILS_VERS = 2.19.1 BINUTILS_PKGVERS = $(BINUTILS_VERS) -BINUTILS_RPMREL = 1%{?dist} +BINUTILS_RPMREL = 1 include ../binutils.am BINUTILS_OPTS += GCC_VERS = 4.3.3 GCC_PKGVERS = $(GCC_VERS) -GCC_RPMREL = 5%{?dist} +GCC_RPMREL = 5 NEWLIB_VERS = 1.17.0 NEWLIB_PKGVERS = $(NEWLIB_VERS) -NEWLIB_RPMREL = 26%{?dist} +NEWLIB_RPMREL = `expr 21 + $(GCC_RPMREL)` include ../gcc.am GCC_OPTS += --languages=cxx GDB_VERS = 6.8 GDB_PKGVERS = $(GDB_VERS) -GDB_RPMREL = 8%{?dist} +GDB_RPMREL = 8 include ../gdb.am GDB_OPTS += CPUKIT_VERS = 4.9.99.0 CPUKIT_PKGVERS = $(CPUKIT_VERS)-20090206-2 -CPUKIT_RPMREL = 1%{?dist} +CPUKIT_RPMREL = 1 include ../cpukit.am CPUKIT_OPTS += diff --git a/contrib/crossrpms/rtems4.10/avr/Makefile.am b/contrib/crossrpms/rtems4.10/avr/Makefile.am index e30be66d0c..fa887b9e0b 100644 --- a/contrib/crossrpms/rtems4.10/avr/Makefile.am +++ b/contrib/crossrpms/rtems4.10/avr/Makefile.am @@ -6,27 +6,27 @@ include $(top_srcdir)/mkspec.am BINUTILS_VERS = 2.19.1 BINUTILS_PKGVERS = $(BINUTILS_VERS) -BINUTILS_RPMREL = 1%{?dist} +BINUTILS_RPMREL = 1 include ../binutils.am BINUTILS_OPTS += GCC_VERS = 4.3.3 GCC_PKGVERS = $(GCC_VERS) -GCC_RPMREL = 5%{?dist} +GCC_RPMREL = 5 NEWLIB_VERS = 1.17.0 NEWLIB_PKGVERS = $(NEWLIB_VERS) -NEWLIB_RPMREL = 26%{?dist} +NEWLIB_RPMREL = `expr 21 + $(GCC_RPMREL)` include ../gcc.am GCC_OPTS += GDB_VERS = 6.8 GDB_PKGVERS = $(GDB_VERS) -GDB_RPMREL = 8%{?dist} +GDB_RPMREL = 8 include ../gdb.am GDB_OPTS += CPUKIT_VERS = 4.9.99.0 CPUKIT_PKGVERS = $(CPUKIT_VERS)-20090206-2 -CPUKIT_RPMREL = 1%{?dist} +CPUKIT_RPMREL = 1 include ../cpukit.am CPUKIT_OPTS += diff --git a/contrib/crossrpms/rtems4.10/bfin/Makefile.am b/contrib/crossrpms/rtems4.10/bfin/Makefile.am index afb9d68c0a..9a82c3f98f 100644 --- a/contrib/crossrpms/rtems4.10/bfin/Makefile.am +++ b/contrib/crossrpms/rtems4.10/bfin/Makefile.am @@ -6,27 +6,27 @@ include $(top_srcdir)/mkspec.am BINUTILS_VERS = 2.19.1 BINUTILS_PKGVERS = $(BINUTILS_VERS) -BINUTILS_RPMREL = 1%{?dist} +BINUTILS_RPMREL = 1 include ../binutils.am BINUTILS_OPTS += GCC_VERS = 4.3.3 GCC_PKGVERS = $(GCC_VERS) -GCC_RPMREL = 5%{?dist} +GCC_RPMREL = 5 NEWLIB_VERS = 1.17.0 NEWLIB_PKGVERS = $(NEWLIB_VERS) -NEWLIB_RPMREL = 26%{?dist} +NEWLIB_RPMREL = `expr 21 + $(GCC_RPMREL)` include ../gcc.am GCC_OPTS += --languages=cxx GDB_VERS = 6.5 GDB_PKGVERS = $(GDB_VERS) -GDB_RPMREL = 5%{?dist} +GDB_RPMREL = 5 include ../gdb.am GDB_OPTS += CPUKIT_VERS = 4.9.99.0 CPUKIT_PKGVERS = $(CPUKIT_VERS)-20090206-2 -CPUKIT_RPMREL = 1%{?dist} +CPUKIT_RPMREL = 1 include ../cpukit.am CPUKIT_OPTS += diff --git a/contrib/crossrpms/rtems4.10/binutils.am b/contrib/crossrpms/rtems4.10/binutils.am index bf0539e77f..93578ea74a 100644 --- a/contrib/crossrpms/rtems4.10/binutils.am +++ b/contrib/crossrpms/rtems4.10/binutils.am @@ -18,7 +18,7 @@ $(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) Makefile.am $(srcdir)/binuti -e "/[@]SOURCES[@]/d" \ -e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \ -e "s/[@]BINUTILS_PKGVERS[@]/$(BINUTILS_PKGVERS)/g" \ - -e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)/g" \ + -e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)%{?dist}/g" \ -e "/--with-sysroot/d" \ | $(MKSPEC0) > $(TARGET)-binutils.spec.in CLEANFILES += $(TARGET)-binutils.spec.in diff --git a/contrib/crossrpms/rtems4.10/cpukit.am b/contrib/crossrpms/rtems4.10/cpukit.am index 10d411487f..2dbf6d1ddb 100644 --- a/contrib/crossrpms/rtems4.10/cpukit.am +++ b/contrib/crossrpms/rtems4.10/cpukit.am @@ -20,7 +20,7 @@ $(TARGET)-cpukit.spec.in: $(CPUKIT_SUBPACKAGES) Makefile.am $(srcdir)/cpukit-sou -e "/[@]PREP[@]/d" \ -e "s/[@]CPUKIT_VERS[@]/$(CPUKIT_VERS)/g" \ -e "s/[@]CPUKIT_PKGVERS[@]/$(CPUKIT_PKGVERS)/g" \ - -e "s/[@]CPUKIT_RPMREL[@]/$(CPUKIT_RPMREL)/g" \ + -e "s/[@]CPUKIT_RPMREL[@]/$(CPUKIT_RPMREL)%{?dist}/g" \ -e "/--with-sysroot/d" \ -e "/[@]tool_target[@]-sys-root/d" \ -e "/[@]tool_target[@]-w32api-sys-root/d" \ diff --git a/contrib/crossrpms/rtems4.10/gcc.am b/contrib/crossrpms/rtems4.10/gcc.am index dff86e18e4..66cf59b8d0 100644 --- a/contrib/crossrpms/rtems4.10/gcc.am +++ b/contrib/crossrpms/rtems4.10/gcc.am @@ -27,10 +27,10 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add -e "/[@]PREP[@]/d" \ -e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \ -e "s/[@]GCC_PKGVERS[@]/$(GCC_PKGVERS)/g" \ - -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)/g" \ + -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)%{?dist}/g" \ -e "s/[@]NEWLIB_VERS[@]/$(NEWLIB_VERS)/g" \ -e "s/[@]NEWLIB_PKGVERS[@]/$(NEWLIB_PKGVERS)/g" \ - -e "s/[@]NEWLIB_RPMREL[@]/$(NEWLIB_RPMREL)/g" \ + -e "s/[@]NEWLIB_RPMREL[@]/$(NEWLIB_RPMREL)%{?dist}/g" \ -e "/--with-sysroot/d" \ -e "/[@]tool_target[@]-sys-root/d" \ -e "/[@]tool_target[@]-w32api-sys-root/d" \ diff --git a/contrib/crossrpms/rtems4.10/gdb.am b/contrib/crossrpms/rtems4.10/gdb.am index fd6ac388b3..4b509c4547 100644 --- a/contrib/crossrpms/rtems4.10/gdb.am +++ b/contrib/crossrpms/rtems4.10/gdb.am @@ -18,7 +18,7 @@ $(TARGET)-gdb.spec.in: $(GDB_SUBPACKAGES) Makefile.am $(srcdir)/gdb-sources.add -e "/[@]SOURCES[@]/d" \ -e "s/[@]GDB_VERS[@]/$(GDB_VERS)/g" \ -e "s/[@]GDB_PKGVERS[@]/$(GDB_PKGVERS)/g" \ - -e "s/[@]GDB_RPMREL[@]/$(GDB_RPMREL)/g" \ + -e "s/[@]GDB_RPMREL[@]/$(GDB_RPMREL)%{?dist}/g" \ -e "/--with-sysroot/d" \ | $(MKSPEC0) > $(TARGET)-gdb.spec.in CLEANFILES += $(TARGET)-gdb.spec.in diff --git a/contrib/crossrpms/rtems4.10/h8300/Makefile.am b/contrib/crossrpms/rtems4.10/h8300/Makefile.am index 7825343719..d35a9a5520 100644 --- a/contrib/crossrpms/rtems4.10/h8300/Makefile.am +++ b/contrib/crossrpms/rtems4.10/h8300/Makefile.am @@ -6,27 +6,27 @@ include $(top_srcdir)/mkspec.am BINUTILS_VERS = 2.19.1 BINUTILS_PKGVERS = $(BINUTILS_VERS) -BINUTILS_RPMREL = 1%{?dist} +BINUTILS_RPMREL = 1 include ../binutils.am BINUTILS_OPTS += GCC_VERS = 4.3.3 GCC_PKGVERS = $(GCC_VERS) -GCC_RPMREL = 5%{?dist} +GCC_RPMREL = 5 NEWLIB_VERS = 1.17.0 NEWLIB_PKGVERS = $(NEWLIB_VERS) -NEWLIB_RPMREL = 26%{?dist} +NEWLIB_RPMREL = `expr 21 + $(GCC_RPMREL)` include ../gcc.am GCC_OPTS += --languages=cxx GDB_VERS = 6.8 GDB_PKGVERS = $(GDB_VERS) -GDB_RPMREL = 8%{?dist} +GDB_RPMREL = 8 include ../gdb.am GDB_OPTS += CPUKIT_VERS = 4.9.99.0 CPUKIT_PKGVERS = $(CPUKIT_VERS)-20090206-2 -CPUKIT_RPMREL = 1%{?dist} +CPUKIT_RPMREL = 1 include ../cpukit.am CPUKIT_OPTS += diff --git a/contrib/crossrpms/rtems4.10/i386/Makefile.am b/contrib/crossrpms/rtems4.10/i386/Makefile.am index 79da49d6f9..7995a400e6 100644 --- a/contrib/crossrpms/rtems4.10/i386/Makefile.am +++ b/contrib/crossrpms/rtems4.10/i386/Makefile.am @@ -6,27 +6,27 @@ include $(top_srcdir)/mkspec.am BINUTILS_VERS = 2.19.1 BINUTILS_PKGVERS = $(BINUTILS_VERS) -BINUTILS_RPMREL = 1%{?dist} +BINUTILS_RPMREL = 1 include ../binutils.am BINUTILS_OPTS += GCC_VERS = 4.3.3 GCC_PKGVERS = $(GCC_VERS) -GCC_RPMREL = 5%{?dist} +GCC_RPMREL = 5 NEWLIB_VERS = 1.17.0 NEWLIB_PKGVERS = $(NEWLIB_VERS) -NEWLIB_RPMREL = 26%{?dist} +NEWLIB_RPMREL = `expr 21 + $(GCC_RPMREL)` include ../gcc.am GCC_OPTS += --languages=cxx GDB_VERS = 6.8 GDB_PKGVERS = $(GDB_VERS) -GDB_RPMREL = 8%{?dist} +GDB_RPMREL = 8 include ../gdb.am GDB_OPTS += CPUKIT_VERS = 4.9.99.0 CPUKIT_PKGVERS = $(CPUKIT_VERS)-20090206-2 -CPUKIT_RPMREL = 1%{?dist} +CPUKIT_RPMREL = 1 include ../cpukit.am CPUKIT_OPTS += diff --git a/contrib/crossrpms/rtems4.10/m32c/Makefile.am b/contrib/crossrpms/rtems4.10/m32c/Makefile.am index 6ce30c4db0..cfca9f6b10 100644 --- a/contrib/crossrpms/rtems4.10/m32c/Makefile.am +++ b/contrib/crossrpms/rtems4.10/m32c/Makefile.am @@ -6,27 +6,27 @@ include $(top_srcdir)/mkspec.am BINUTILS_VERS = 2.19.1 BINUTILS_PKGVERS = $(BINUTILS_VERS) -BINUTILS_RPMREL = 1%{?dist} +BINUTILS_RPMREL = 1 include ../binutils.am BINUTILS_OPTS += GCC_VERS = 4.3.3 GCC_PKGVERS = $(GCC_VERS) -GCC_RPMREL = 5%{?dist} +GCC_RPMREL = 5 NEWLIB_VERS = 1.17.0 NEWLIB_PKGVERS = $(NEWLIB_VERS) -NEWLIB_RPMREL = 26%{?dist} +NEWLIB_RPMREL = `expr 21 + $(GCC_RPMREL)` include ../gcc.am GCC_OPTS += --disable-infos GDB_VERS = 6.8 GDB_PKGVERS = $(GDB_VERS) -GDB_RPMREL = 8%{?dist} +GDB_RPMREL = 8 include ../gdb.am GDB_OPTS += CPUKIT_VERS = 4.9.99.0 CPUKIT_PKGVERS = $(CPUKIT_VERS)-20090206-2 -CPUKIT_RPMREL = 1%{?dist} +CPUKIT_RPMREL = 1 include ../cpukit.am CPUKIT_OPTS += diff --git a/contrib/crossrpms/rtems4.10/m32r/Makefile.am b/contrib/crossrpms/rtems4.10/m32r/Makefile.am index 5740f3e554..8ac9f82755 100644 --- a/contrib/crossrpms/rtems4.10/m32r/Makefile.am +++ b/contrib/crossrpms/rtems4.10/m32r/Makefile.am @@ -6,27 +6,27 @@ include $(top_srcdir)/mkspec.am BINUTILS_VERS = 2.19.1 BINUTILS_PKGVERS = $(BINUTILS_VERS) -BINUTILS_RPMREL = 1%{?dist} +BINUTILS_RPMREL = 1 include ../binutils.am BINUTILS_OPTS += GCC_VERS = 4.3.3 GCC_PKGVERS = $(GCC_VERS) -GCC_RPMREL = 5%{?dist} +GCC_RPMREL = 5 NEWLIB_VERS = 1.17.0 NEWLIB_PKGVERS = $(NEWLIB_VERS) -NEWLIB_RPMREL = 26%{?dist} +NEWLIB_RPMREL = `expr 21 + $(GCC_RPMREL)` include ../gcc.am GCC_OPTS += --disable-infos GDB_VERS = 6.8 GDB_PKGVERS = $(GDB_VERS) -GDB_RPMREL = 8%{?dist} +GDB_RPMREL = 8 include ../gdb.am GDB_OPTS += CPUKIT_VERS = 4.9.99.0 CPUKIT_PKGVERS = $(CPUKIT_VERS)-20090206-2 -CPUKIT_RPMREL = 1%{?dist} +CPUKIT_RPMREL = 1 include ../cpukit.am CPUKIT_OPTS += diff --git a/contrib/crossrpms/rtems4.10/m68k/Makefile.am b/contrib/crossrpms/rtems4.10/m68k/Makefile.am index efa2a9942e..4a10e05b13 100644 --- a/contrib/crossrpms/rtems4.10/m68k/Makefile.am +++ b/contrib/crossrpms/rtems4.10/m68k/Makefile.am @@ -6,27 +6,27 @@ include $(top_srcdir)/mkspec.am BINUTILS_VERS = 2.19.1 BINUTILS_PKGVERS = $(BINUTILS_VERS) -BINUTILS_RPMREL = 1%{?dist} +BINUTILS_RPMREL = 1 include ../binutils.am BINUTILS_OPTS += GCC_VERS = 4.3.3 GCC_PKGVERS = $(GCC_VERS) -GCC_RPMREL = 5%{?dist} +GCC_RPMREL = 5 NEWLIB_VERS = 1.17.0 NEWLIB_PKGVERS = $(NEWLIB_VERS) -NEWLIB_RPMREL = 26%{?dist} +NEWLIB_RPMREL = `expr 21 + $(GCC_RPMREL)` include ../gcc.am GCC_OPTS += --languages=cxx GDB_VERS = 6.8 GDB_PKGVERS = $(GDB_VERS) -GDB_RPMREL = 8%{?dist} +GDB_RPMREL = 8 include ../gdb.am GDB_OPTS += CPUKIT_VERS = 4.9.99.0 CPUKIT_PKGVERS = $(CPUKIT_VERS)-20090206-2 -CPUKIT_RPMREL = 1%{?dist} +CPUKIT_RPMREL = 1 include ../cpukit.am CPUKIT_OPTS += diff --git a/contrib/crossrpms/rtems4.10/mips/Makefile.am b/contrib/crossrpms/rtems4.10/mips/Makefile.am index 9a027eaf21..3e0742c75b 100644 --- a/contrib/crossrpms/rtems4.10/mips/Makefile.am +++ b/contrib/crossrpms/rtems4.10/mips/Makefile.am @@ -6,27 +6,27 @@ include $(top_srcdir)/mkspec.am BINUTILS_VERS = 2.19.1 BINUTILS_PKGVERS = $(BINUTILS_VERS) -BINUTILS_RPMREL = 1%{?dist} +BINUTILS_RPMREL = 1 include ../binutils.am BINUTILS_OPTS += GCC_VERS = 4.3.3 GCC_PKGVERS = $(GCC_VERS) -GCC_RPMREL = 5%{?dist} +GCC_RPMREL = 5 NEWLIB_VERS = 1.17.0 NEWLIB_PKGVERS = $(NEWLIB_VERS) -NEWLIB_RPMREL = 26%{?dist} +NEWLIB_RPMREL = `expr 21 + $(GCC_RPMREL)` include ../gcc.am GCC_OPTS += --languages=cxx GDB_VERS = 6.8 GDB_PKGVERS = $(GDB_VERS) -GDB_RPMREL = 8%{?dist} +GDB_RPMREL = 8 include ../gdb.am GDB_OPTS += CPUKIT_VERS = 4.9.99.0 CPUKIT_PKGVERS = $(CPUKIT_VERS)-20090206-2 -CPUKIT_RPMREL = 1%{?dist} +CPUKIT_RPMREL = 1 include ../cpukit.am CPUKIT_OPTS += diff --git a/contrib/crossrpms/rtems4.10/mipstx39/Makefile.am b/contrib/crossrpms/rtems4.10/mipstx39/Makefile.am index 92e6918104..18671b09f7 100644 --- a/contrib/crossrpms/rtems4.10/mipstx39/Makefile.am +++ b/contrib/crossrpms/rtems4.10/mipstx39/Makefile.am @@ -7,6 +7,6 @@ include $(top_srcdir)/mkspec.am # We only want a gdb with a tx39 simulator in it. We share the other tools GDB_VERS = 6.8 GDB_PKGVERS = $(GDB_VERS) -GDB_RPMREL = 8%{?dist} +GDB_RPMREL = 8 include ../gdb.am GDB_OPTS += diff --git a/contrib/crossrpms/rtems4.10/powerpc/Makefile.am b/contrib/crossrpms/rtems4.10/powerpc/Makefile.am index 989019a521..3612eb2cc6 100644 --- a/contrib/crossrpms/rtems4.10/powerpc/Makefile.am +++ b/contrib/crossrpms/rtems4.10/powerpc/Makefile.am @@ -6,27 +6,27 @@ include $(top_srcdir)/mkspec.am BINUTILS_VERS = 2.19.1 BINUTILS_PKGVERS = $(BINUTILS_VERS) -BINUTILS_RPMREL = 1%{?dist} +BINUTILS_RPMREL = 1 include ../binutils.am BINUTILS_OPTS += GCC_VERS = 4.3.3 GCC_PKGVERS = $(GCC_VERS) -GCC_RPMREL = 5%{?dist} +GCC_RPMREL = 5 NEWLIB_VERS = 1.17.0 NEWLIB_PKGVERS = $(NEWLIB_VERS) -NEWLIB_RPMREL = 26%{?dist} +NEWLIB_RPMREL = `expr 21 + $(GCC_RPMREL)` include ../gcc.am GCC_OPTS += --languages=cxx GDB_VERS = 6.8 GDB_PKGVERS = $(GDB_VERS) -GDB_RPMREL = 8%{?dist} +GDB_RPMREL = 8 include ../gdb.am GDB_OPTS += CPUKIT_VERS = 4.9.99.0 CPUKIT_PKGVERS = $(CPUKIT_VERS)-20090206-2 -CPUKIT_RPMREL = 1%{?dist} +CPUKIT_RPMREL = 1 include ../cpukit.am CPUKIT_OPTS += diff --git a/contrib/crossrpms/rtems4.10/sh/Makefile.am b/contrib/crossrpms/rtems4.10/sh/Makefile.am index 4cd65e5039..6af122d851 100644 --- a/contrib/crossrpms/rtems4.10/sh/Makefile.am +++ b/contrib/crossrpms/rtems4.10/sh/Makefile.am @@ -6,27 +6,27 @@ include $(top_srcdir)/mkspec.am BINUTILS_VERS = 2.19.1 BINUTILS_PKGVERS = $(BINUTILS_VERS) -BINUTILS_RPMREL = 1%{?dist} +BINUTILS_RPMREL = 1 include ../binutils.am BINUTILS_OPTS += GCC_VERS = 4.3.3 GCC_PKGVERS = $(GCC_VERS) -GCC_RPMREL = 5%{?dist} +GCC_RPMREL = 5 NEWLIB_VERS = 1.17.0 NEWLIB_PKGVERS = $(NEWLIB_VERS) -NEWLIB_RPMREL = 26%{?dist} +NEWLIB_RPMREL = `expr 21 + $(GCC_RPMREL)` include ../gcc.am GCC_OPTS += --languages=cxx GDB_VERS = 6.8 GDB_PKGVERS = $(GDB_VERS) -GDB_RPMREL = 8%{?dist} +GDB_RPMREL = 8 include ../gdb.am GDB_OPTS += CPUKIT_VERS = 4.9.99.0 CPUKIT_PKGVERS = $(CPUKIT_VERS)-20090206-2 -CPUKIT_RPMREL = 1%{?dist} +CPUKIT_RPMREL = 1 include ../cpukit.am CPUKIT_OPTS += diff --git a/contrib/crossrpms/rtems4.10/sparc/Makefile.am b/contrib/crossrpms/rtems4.10/sparc/Makefile.am index 18f35f456a..082b674d71 100644 --- a/contrib/crossrpms/rtems4.10/sparc/Makefile.am +++ b/contrib/crossrpms/rtems4.10/sparc/Makefile.am @@ -6,27 +6,27 @@ include $(top_srcdir)/mkspec.am BINUTILS_VERS = 2.19.1 BINUTILS_PKGVERS = $(BINUTILS_VERS) -BINUTILS_RPMREL = 1%{?dist} +BINUTILS_RPMREL = 1 include ../binutils.am BINUTILS_OPTS += GCC_VERS = 4.3.3 GCC_PKGVERS = $(GCC_VERS) -GCC_RPMREL = 5%{?dist} +GCC_RPMREL = 5 NEWLIB_VERS = 1.17.0 NEWLIB_PKGVERS = $(NEWLIB_VERS) -NEWLIB_RPMREL = 26%{?dist} +NEWLIB_RPMREL = `expr 21 + $(GCC_RPMREL)` include ../gcc.am GCC_OPTS += --languages=cxx GDB_VERS = 6.8 GDB_PKGVERS = $(GDB_VERS) -GDB_RPMREL = 8%{?dist} +GDB_RPMREL = 8 include ../gdb.am GDB_OPTS += CPUKIT_VERS = 4.9.99.0 CPUKIT_PKGVERS = $(CPUKIT_VERS)-20090206-2 -CPUKIT_RPMREL = 1%{?dist} +CPUKIT_RPMREL = 1 include ../cpukit.am CPUKIT_OPTS += -- cgit v1.2.3