From 500c813e17d44f26a04797d48ced93be6e58899c Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Sun, 3 Jun 2012 20:22:28 +0200 Subject: [PATCH] Fix Release. - Make yum --enablerepo compatible with at least mock-1.1.21-1.fc16 Rawhide cfg. --- .gitignore | 2 +- gdb-6.6-buildid-locate-rpm.patch | 6 +++--- gdb.spec | 8 ++++++-- sources | 2 +- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 4477a6b..0212964 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ /libstdc++-v3-python-r155978.tar.bz2 -/gdb-7.4.50.20120602.tar.bz2 +/gdb-7.4.50.20120603.tar.bz2 diff --git a/gdb-6.6-buildid-locate-rpm.patch b/gdb-6.6-buildid-locate-rpm.patch index ba64551..f5553f1 100644 --- a/gdb-6.6-buildid-locate-rpm.patch +++ b/gdb-6.6-buildid-locate-rpm.patch @@ -258,7 +258,7 @@ Index: gdb-7.4.50.20120602/gdb/elfread.c + + /* Base package name for `debuginfo-install'. We do not use the + `yum' command directly as the line -+ yum --disablerepo='*' --enablerepo='*-debug*' \ ++ yum --disablerepo='*' --enablerepo='*debug*' \ + install NAME-debuginfo.ARCH + would be more complicated than just: + debuginfo-install NAME-VERSION-RELEASE.ARCH @@ -399,7 +399,7 @@ Index: gdb-7.4.50.20120602/gdb/elfread.c + /* This MISSING_FILEPAIR_HASH tracker is used only for the duplicite messages - Try to install the hash file ... -+ yum --disablerepo='*' --enablerepo='*-debug*' install ... ++ yum --disablerepo='*' --enablerepo='*debug*' install ... avoidance. */ struct missing_filepair @@ -458,7 +458,7 @@ Index: gdb-7.4.50.20120602/gdb/elfread.c + _("Missing separate debuginfo for %s\n"), binary); + if (debug != NULL) + fprintf_unfiltered (gdb_stdlog, _("Try: %s %s\n"), -+ "yum --disablerepo='*' --enablerepo='*-debug*'" ++ "yum --disablerepo='*' --enablerepo='*debug*'" + " install", debug); + } } diff --git a/gdb.spec b/gdb.spec index 559869c..fe920e1 100644 --- a/gdb.spec +++ b/gdb.spec @@ -30,12 +30,12 @@ Name: %{?scl_prefix}gdb # Set version to contents of gdb/version.in. # NOTE: the FSF gdb versions are numbered N.M for official releases, like 6.3 # and, since January 2005, X.Y.Z.date for daily snapshots, like 6.3.50.20050112 # (daily snapshot from mailine), or 6.3.0.20040112 (head of the release branch). -%global snap 20120602 +%global snap 20120603 Version: 7.4.50.%{snap} # The release always contains a leading reserved number, start it at 1. # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing. -Release: 48%{?dist} +Release: 2%{?dist} License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and BSD and Public Domain Group: Development/Debuggers @@ -1336,6 +1336,10 @@ fi %endif # 0%{!?el5:1} || "%{_target_cpu}" == "noarch" %changelog +* Sun Jun 3 2012 Jan Kratochvil - 7.4.50.20120603-2.fc18 +- Fix Release. +- Make yum --enablerepo compatible with at least mock-1.1.21-1.fc16 Rawhide cfg. + * Sun Jun 3 2012 Jan Kratochvil - 7.4.50.20120602-1.fc18 - Rebase to FSF GDB 7.4.50.20120602. - [testsuite] BuildRequire gcc-go. diff --git a/sources b/sources index fa203d1..fd83e6f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 04e5c4b1b9e633422cc48990fe61958d libstdc++-v3-python-r155978.tar.bz2 -2a3a88cc2e92aaaf50f7584331094ad3 gdb-7.4.50.20120602.tar.bz2 +d6766c3ec4444f337cb0d7a0265130f9 gdb-7.4.50.20120603.tar.bz2