Merge changes from CVS-HEAD addressing Fedora 11 rpm regressions.

4 files changed, 50 insertions, 27 deletions

diff --git a/contrib/repo-conf/Makefile.am b/contrib/repo-conf/Makefile.am
index 30fc819c9d..6fed23d971 100644
--- a/contrib/repo-conf/Makefile.am
+++ b/contrib/repo-conf/Makefile.am
@@ -29,23 +29,41 @@ yum.repos.d/rtems-@RTEMS_API@.repo: yum.repos.d/rtems.repo.in
 	  -e 's,[@]RTEMS_API[@],@RTEMS_API@,' \
 	  -e 's,[@]OS_SUBDIR[@],@OS_SUBDIR@,' \
 	  -e 's,[@]OS_NAME[@],@OS_NAME@,' \
+	  -e 's,[@]OS_VERS[@],@OS_VERS@,' \
 	  -e 's,[@]YUM_VERDIR[@],@YUM_VERDIR@,' \
 	  < $(srcdir)/yum.repos.d/rtems.repo.in \
 	  > yum.repos.d/rtems-@RTEMS_API@.repo
 CLEANFILES += yum.repos.d/rtems-@RTEMS_API@.repo
 EXTRA_DIST += $(srcdir)/yum.repos.d/*repo.in
 
+gpg/gpg-pubkey-69ce4a83-44cc2b30-@OS_SUBDIR@-@OS_VERS@: gpg/gpg-pubkey-69ce4a83-44cc2b30
+	@$(mkdir_p) gpg
+	sed -e 's,[@]OS_SUBDIR[@],@OS_SUBDIR@,' \
+	  -e 's,[@]OS_VERS[@],@OS_VERS@,' \
+	  < $(srcdir)/gpg/gpg-pubkey-69ce4a83-44cc2b30 \
+	  > gpg/gpg-pubkey-69ce4a83-44cc2b30-@OS_SUBDIR@-@OS_VERS@
+CLEANFILES += gpg/gpg-pubkey-69ce4a83-44cc2b30-@OS_SUBDIR@-@OS_VERS@
+EXTRA_DIST += $(srcdir)/gpg/gpg-pubkey-69ce4a83-44cc2b30
+
+
+gpg/gpg-pubkey-eac29b6f-3fe1f458-@OS_SUBDIR@-@OS_VERS@: gpg/gpg-pubkey-eac29b6f-3fe1f458
+	@$(mkdir_p) gpg
+	sed -e 's,[@]OS_SUBDIR[@],@OS_SUBDIR@,' \
+	  -e 's,[@]OS_VERS[@],@OS_VERS@,' \
+	  < $(srcdir)/gpg/gpg-pubkey-eac29b6f-3fe1f458 \
+	  > gpg/gpg-pubkey-eac29b6f-3fe1f458-@OS_SUBDIR@-@OS_VERS@
+CLEANFILES += gpg/gpg-pubkey-eac29b6f-3fe1f458-@OS_SUBDIR@-@OS_VERS@
+EXTRA_DIST += $(srcdir)/gpg/gpg-pubkey-eac29b6f-3fe1f458
+
 yum_gpgdir = $(sysconfdir)/pki/rpm-gpg
 yum_gpg_DATA =
-yum_gpg_DATA += gpg/gpg-pubkey-69ce4a83-44cc2b30
-yum_gpg_DATA += gpg/gpg-pubkey-eac29b6f-3fe1f458
+yum_gpg_DATA += gpg/gpg-pubkey-69ce4a83-44cc2b30-@OS_SUBDIR@-@OS_VERS@
+yum_gpg_DATA += gpg/gpg-pubkey-eac29b6f-3fe1f458-@OS_SUBDIR@-@OS_VERS@
 
 apt_gpgdir = $(sysconfdir)/apt/gpg
 apt_gpg_DATA =
-apt_gpg_DATA += gpg/gpg-pubkey-69ce4a83-44cc2b30
-apt_gpg_DATA += gpg/gpg-pubkey-eac29b6f-3fe1f458
-
-EXTRA_DIST += $(srcdir)/gpg/gpg-pubkey*
+apt_gpg_DATA += gpg/gpg-pubkey-69ce4a83-44cc2b30-@OS_SUBDIR@-@OS_VERS@
+apt_gpg_DATA += gpg/gpg-pubkey-eac29b6f-3fe1f458-@OS_SUBDIR@-@OS_VERS@
 
 noinst_HEADERS = rtems-@RTEMS_API@-repo-conf.spec
 rtems-@RTEMS_API@-repo-conf.spec: rtems-repo-conf.spec.in configure.ac
diff --git a/contrib/repo-conf/apt/sources.list.d/rtems.list.in b/contrib/repo-conf/apt/sources.list.d/rtems.list.in
index e3c1a595be..e70ab7604b 100644
--- a/contrib/repo-conf/apt/sources.list.d/rtems.list.in
+++ b/contrib/repo-conf/apt/sources.list.d/rtems.list.in
@@ -1,10 +1,10 @@
 ## rtems-@RTEMS_API@ sources.list entries for apt-rpm with repomd support,
 ## http://apt-rpm.laiskiainen.org/
 
-repomd ftp://ftp.rtems.org/pub/rtems/linux/@RTEMS_API@ @OS_SUBDIR@@APT_VERDIR@/$(ARCH)
+repomd ftp://ftp.rtems.org/pub/rtems/linux/@RTEMS_API@ @OS_SUBDIR@/@APT_VERDIR@/$(ARCH)
 
 ## uncomment the line below if you want to access the *.src.rpms
-# repomd-src ftp://ftp.rtems.org/pub/rtems/linux/@RTEMS_API@ @OS_SUBDIR@@APT_VERDIR@/SRPMS
+# repomd-src ftp://ftp.rtems.org/pub/rtems/linux/@RTEMS_API@ @OS_SUBDIR@/@APT_VERDIR@/SRPMS
 
 ## uncomment the line below if you want to access the *-debuginfo*.rpms
-# repomd-debug ftp://ftp.rtems.org/pub/rtems/linux/@RTEMS_API@ @OS_SUBDIR@@APT_VERDIR@/$(ARCH)/debug
+# repomd-debug ftp://ftp.rtems.org/pub/rtems/linux/@RTEMS_API@ @OS_SUBDIR@/@APT_VERDIR@/$(ARCH)/debug
diff --git a/contrib/repo-conf/configure.ac b/contrib/repo-conf/configure.ac
index b802e826f7..b5a140c074 100644
--- a/contrib/repo-conf/configure.ac
+++ b/contrib/repo-conf/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.61)
-AC_INIT([rtems-]_RTEMS_API[-repo-conf],[0.17],[http://www.rtems.org/bugzilla],
+AC_INIT([rtems-]_RTEMS_API[-repo-conf],[0.18],[http://www.rtems.org/bugzilla],
   [rtems-]_RTEMS_API[-repo-conf])
 RTEMS_VERSIONING
 
@@ -19,25 +19,29 @@ AC_ARG_ENABLE(osname,AS_HELP_STRING(
 case $osname in
 fedora-9* | fedora-10* | fedora-11* )
   os_name="Fedora"
-  os_subdir="fedora/"
+  os_subdir="fedora"
+  os_vers=`echo $osname| sed -e 's,^.*-,,'`
   yum_verdir="\$\$releasever"
   apt_verdir="\$\$(VERSION)"
   ;;
 centos-5* | redhat-el5* | fedora-7* | fedora-8* )
   os_name="CentOS"
-  os_subdir="centos/"
+  os_subdir="centos"
+  os_vers=`echo $osname| sed -e 's,^.*-,,'`
   yum_verdir="5"
   apt_verdir="5"
   ;;
 centos-4* | redhat-el4* | fedora-5* | fedora-6* )
   os_name="CentOS"
-  os_subdir="centos/"
+  os_subdir="centos"
+  os_vers=`echo $osname| sed -e 's,^.*-,,'`
   yum_verdir="4"
   apt_verdir="4"
   ;;
 suse-*)
   os_name="openSUSE"
-  os_subdir="suse/"
+  os_subdir="suse"
+  os_vers=`echo $osname| sed -e 's,^.*-,,'`
   yum_verdir="\$\$releasever"
   apt_verdir="\$\$(VERSION)"
   ;;
@@ -45,10 +49,11 @@ suse-*)
   AC_MSG_ERROR([Unsupported OS])
 esac
 
+AC_SUBST([OS_NAME],[$os_name])
 AC_SUBST([OS_SUBDIR],[$os_subdir])
+AC_SUBST([OS_VERS],[$os_vers])
 AC_SUBST([YUM_VERDIR],[$yum_verdir])
 AC_SUBST([APT_VERDIR],[$apt_verdir])
-AC_SUBST([OS_NAME],[$os_name])
 
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
diff --git a/contrib/repo-conf/yum.repos.d/rtems.repo.in b/contrib/repo-conf/yum.repos.d/rtems.repo.in
index 7d34d7c8d9..414b370b08 100644
--- a/contrib/repo-conf/yum.repos.d/rtems.repo.in
+++ b/contrib/repo-conf/yum.repos.d/rtems.repo.in
@@ -1,29 +1,29 @@
 [rtems-@RTEMS_API@]
 name=RTEMS-@RTEMS_API@ for @OS_NAME@ @YUM_VERDIR@ - $basearch
-# baseurl=http://www.rtems.org/ftp/pub/rtems/linux/@RTEMS_API@/@OS_SUBDIR@@YUM_VERDIR@/$basearch
-mirrorlist=http://www.rtems.org/ftp/pub/rtems/linux/@RTEMS_API@/@OS_SUBDIR@@YUM_VERDIR@/mirrorlist
+# baseurl=http://www.rtems.org/ftp/pub/rtems/linux/@RTEMS_API@/@OS_SUBDIR@/@YUM_VERDIR@/$basearch
+mirrorlist=http://www.rtems.org/ftp/pub/rtems/linux/@RTEMS_API@/@OS_SUBDIR@/@YUM_VERDIR@/mirrorlist
 # metadata_expire=0
 enabled=1
 gpgcheck=1
-gpgkey=file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-69ce4a83-44cc2b30
-	file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-eac29b6f-3fe1f458
+gpgkey=file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-69ce4a83-44cc2b30-@OS_SUBDIR@-@OS_VERS@
+	file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-eac29b6f-3fe1f458-@OS_SUBDIR@-@OS_VERS@
 
 [rtems-@RTEMS_API@-source]
 name=RTEMS-@RTEMS_API@ for @OS_NAME@ @YUM_VERDIR@ - $basearch - source
-# baseurl=http://www.rtems.org/ftp/pub/rtems/linux/@RTEMS_API@/@OS_SUBDIR@@YUM_VERDIR@/SRPMS
-mirrorlist=http://www.rtems.org/ftp/pub/rtems/linux/@RTEMS_API@/@OS_SUBDIR@@YUM_VERDIR@/mirrorlist-source
+# baseurl=http://www.rtems.org/ftp/pub/rtems/linux/@RTEMS_API@/@OS_SUBDIR@/@YUM_VERDIR@/SRPMS
+mirrorlist=http://www.rtems.org/ftp/pub/rtems/linux/@RTEMS_API@/@OS_SUBDIR@/@YUM_VERDIR@/mirrorlist-source
 # metadata_expire=0
 enabled=0
 gpgcheck=1
-gpgkey=file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-69ce4a83-44cc2b30
-	file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-eac29b6f-3fe1f458
+gpgkey=file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-69ce4a83-44cc2b30-@OS_SUBDIR@-@OS_VERS@
+	file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-eac29b6f-3fe1f458-@OS_SUBDIR@-@OS_VERS@
 
 [rtems-@RTEMS_API@-debuginfo]
 name=RTEMS-@RTEMS_API@ for @OS_NAME@ @YUM_VERDIR@ - $basearch - debuginfo
-# baseurl=http://www.rtems.org/ftp/pub/rtems/linux/@RTEMS_API@/@OS_SUBDIR@@YUM_VERDIR@/$basearch/debug
-mirrorlist=http://www.rtems.org/ftp/pub/rtems/linux/@RTEMS_API@/@OS_SUBDIR@@YUM_VERDIR@/mirrorlist-debuginfo
+# baseurl=http://www.rtems.org/ftp/pub/rtems/linux/@RTEMS_API@/@OS_SUBDIR@/@YUM_VERDIR@/$basearch/debug
+mirrorlist=http://www.rtems.org/ftp/pub/rtems/linux/@RTEMS_API@/@OS_SUBDIR@/@YUM_VERDIR@/mirrorlist-debuginfo
 # metadata_expire=0
 enabled=0
 gpgcheck=1
-gpgkey=file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-69ce4a83-44cc2b30
-	file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-eac29b6f-3fe1f458
+gpgkey=file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-69ce4a83-44cc2b30-@OS_SUBDIR@-@OS_VERS@
+	file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-eac29b6f-3fe1f458-@OS_SUBDIR@-@OS_VERS@