From ee4ba18f75972d366ee9e8038038615419558d99 Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Tue, 19 Jun 2007 18:56:52 +0000 Subject: [PATCH] =?UTF-8?q?-=20use=20stock=20find-lang.sh=20(#213041)=20-?= =?UTF-8?q?=20arm=20fixes=20(Lennert=20Buytenhek,=20#243523)=20-=20allow?= =?UTF-8?q?=20jar=20repacking=20to=20be=20disabled=20(#219731)=20-=20fix?= =?UTF-8?q?=20running=20dist.sh=20--fc=20(#223651)=20-=20hardlink=20identi?= =?UTF-8?q?cal=20.pyc=20and=20.pyo=20files=20to=20save=20space=20(Ville=20?= =?UTF-8?q?Skytt=C3=A4)=20-=20fix=20TMPDIR=20usage=20(Matthew=20Miller,=20?= =?UTF-8?q?#235614)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .cvsignore | 2 +- redhat-rpm-config.spec | 29 ++++++++++++++++------------- sources | 2 +- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/.cvsignore b/.cvsignore index 5b7b8cf..406b280 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -redhat-rpm-config-8.1.0.tar.gz +redhat-rpm-config-9.0.0.tar.bz2 diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec index 3e8ff8f..dca1103 100644 --- a/redhat-rpm-config.spec +++ b/redhat-rpm-config.spec @@ -1,13 +1,12 @@ Summary: Red Hat specific rpm configuration files. Name: redhat-rpm-config -Version: 8.1.0 +Version: 9.0.0 Release: 1.fc8 License: GPL Group: Development/System -Source: redhat-rpm-config-%{version}.tar.gz +Source: redhat-rpm-config-%{version}.tar.bz2 BuildArch: noarch -#Requires: rpmbuild(VendorConfig) <= 4.1 -#Requires: mktemp +Requires: mktemp BuildRoot: %{_tmppath}/%{name}-root # rpmrc passes -mtune which first appeared in gcc 3.4 %ifarch i386 i686 sparc @@ -18,15 +17,10 @@ Conflicts: gcc < 3.4 Red Hat specific rpm configuration files. %prep +%setup -q %install -rm -rf ${RPM_BUILD_ROOT} -mkdir -p ${RPM_BUILD_ROOT}%{_prefix}/lib/rpm -( cd ${RPM_BUILD_ROOT}%{_prefix}/lib/rpm; tar xzf %{SOURCE0}; mv %{name}-%{version} redhat; rm -f redhat/*.spec ) - -# fix perms of config.{guess,sub} -chmod a+x ${RPM_BUILD_ROOT}%{_prefix}/lib/rpm/redhat/config.{guess,sub} -chmod a+x ${RPM_BUILD_ROOT}%{_prefix}/lib/rpm/redhat/brp* +make DESTDIR=${RPM_BUILD_ROOT} install cat >> ${RPM_BUILD_ROOT}%{_prefix}/lib/rpm/redhat/macros << EOF @@ -45,8 +39,17 @@ rm -rf ${RPM_BUILD_ROOT} %{_prefix}/lib/rpm/redhat %changelog -* Tue Jun 19 2007 Jeremy Katz - 8.1.0-1.fc8 -- integrate patches into upstream CVS. +* Tue Jun 19 2007 Jeremy Katz - 9.0.0-1 +- use stock find-lang.sh (#213041) +- arm fixes (Lennert Buytenhek, #243523) +- allow jar repacking to be disabled (#219731) +- fix running dist.sh --fc (#223651) +- hardlink identical .pyc and .pyo files to save space (Ville Skyttä) +- fix TMPDIR usage (Matthew Miller, #235614) + +* Tue Jun 19 2007 Jeremy Katz - 8.1.0-1 +- add modalias tags to kmod packages and other kmod changes (jcm) +- recompress jars to avoid multilib conflicts (bkonrath) * Fri May 18 2007 Jesse Keating 8.0.45-16 - Update macros for F8 diff --git a/sources b/sources index 25c9774..2a7ace6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -64437c8c3877968040692bc8ef93289f redhat-rpm-config-8.1.0.tar.gz +f09e64a587cabc13cfe018934ed7c537 redhat-rpm-config-9.0.0.tar.bz2