From c46920bba71325183ea3c0ff647147425dcef5b3 Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Thu, 5 Jul 2007 18:42:01 +0000 Subject: [PATCH] - Remove dist defines, fedora-release does that now - Enable post-build buildroot checking by default --- .cvsignore | 2 +- redhat-rpm-config.spec | 20 +++++++++----------- sources | 2 +- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/.cvsignore b/.cvsignore index 406b280..8db6475 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -redhat-rpm-config-9.0.0.tar.bz2 +redhat-rpm-config-9.0.1.tar.bz2 diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec index dca1103..2bcc109 100644 --- a/redhat-rpm-config.spec +++ b/redhat-rpm-config.spec @@ -1,12 +1,15 @@ Summary: Red Hat specific rpm configuration files. Name: redhat-rpm-config -Version: 9.0.0 -Release: 1.fc8 +Version: 9.0.1 +Release: 1%{?dist} License: GPL Group: Development/System Source: redhat-rpm-config-%{version}.tar.bz2 BuildArch: noarch Requires: mktemp +# if rpm-build is present (thus building rpms), we need newer for +# check buildroot +Conflicts: rpm-build < 4.4.2.1-0.4.rc2 BuildRoot: %{_tmppath}/%{name}-root # rpmrc passes -mtune which first appeared in gcc 3.4 %ifarch i386 i686 sparc @@ -22,15 +25,6 @@ Red Hat specific rpm configuration files. %install make DESTDIR=${RPM_BUILD_ROOT} install -cat >> ${RPM_BUILD_ROOT}%{_prefix}/lib/rpm/redhat/macros << EOF - -# -# dist macros -%%fedora 8 -%%dist .fc8 -%%fc8 1 -EOF - %clean rm -rf ${RPM_BUILD_ROOT} @@ -39,6 +33,10 @@ rm -rf ${RPM_BUILD_ROOT} %{_prefix}/lib/rpm/redhat %changelog +* Thu Jul 05 2007 Jesse Keating - 9.0.1-1 +- Remove dist defines, fedora-release does that now +- Enable post-build buildroot checking by default + * Tue Jun 19 2007 Jeremy Katz - 9.0.0-1 - use stock find-lang.sh (#213041) - arm fixes (Lennert Buytenhek, #243523) diff --git a/sources b/sources index 2a7ace6..0d8f29f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f09e64a587cabc13cfe018934ed7c537 redhat-rpm-config-9.0.0.tar.bz2 +195612c04dbf3a514fb1c4e24ea62dc6 redhat-rpm-config-9.0.1.tar.bz2