From d95f75e5681918b435c9b4302d858fd177abfe56 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Wed, 9 Dec 2009 20:39:37 +0000 Subject: [PATCH] - New git snapshot - Drop the fd cache patch --- .cvsignore | 2 +- libpciaccess.spec | 21 +++++++++++---------- make-libpciaccess-snapshot.sh | 8 +++++++- sources | 2 +- 4 files changed, 20 insertions(+), 13 deletions(-) diff --git a/.cvsignore b/.cvsignore index bdcd9ad..a85c6d0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libpciaccess-0.10.9.tar.bz2 +libpciaccess-20091209.tar.bz2 diff --git a/libpciaccess.spec b/libpciaccess.spec index 99c87d9..8143e54 100644 --- a/libpciaccess.spec +++ b/libpciaccess.spec @@ -1,9 +1,9 @@ -%define gitdate 20071031 -%define gitrev e392082abb5696c8837224da86cc0af4f21d7010 +%define gitdate 20091209 +%define gitrev 5e8d4c19b4f618e22b6e8e1ad3294d8708067474 Name: libpciaccess Version: 0.10.9 -Release: 1%{?dist} +Release: 2.%{gitdate}%{?dist} Summary: PCI access library Group: System Environment/Libraries @@ -12,12 +12,11 @@ URL: http://gitweb.freedesktop.org/?p=xorg/lib/libpciaccess.git # git snapshot. To recreate, run # % ./make-libpciaccess-snapshot.sh %{gitrev} -#Source0: libpciaccess-20071031.tar.bz2 -Source0: http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2 +Source0: libpciaccess-%{gitdate}.tar.bz2 +#Source0: http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2 Source1: make-libpciaccess-snapshot.sh BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch0: libpciaccess-fd-cache.patch Patch2: libpciaccess-rom-size.patch BuildRequires: autoconf automake libtool pkgconfig xorg-x11-util-macros @@ -37,8 +36,7 @@ Requires: pkgconfig Development package for libpciaccess. %prep -%setup -q -n %{name}-%{version} -%patch0 -p1 -b .cache +%setup -q -n %{name}-%{gitdate} %patch2 -p1 -b .rom-size %build @@ -59,7 +57,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc COPYING AUTHORS ChangeLog +%doc COPYING AUTHORS %{_libdir}/libpciaccess.so.0 %{_libdir}/libpciaccess.so.0.10.* @@ -70,6 +68,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/pciaccess.pc %changelog +* Wed Dec 09 2009 Adam Jackson 0.10.9-2.20091209 +- New git snapshot +- Drop the fd cache patch + * Fri Sep 25 2009 Dave Airlie 0.10.9-1 - rebase to latest upstream release - drop patches @@ -100,7 +102,6 @@ rm -rf $RPM_BUILD_ROOT - rebase to latest release (will do release with VGA bits later) - libpciaccess-boot-vga.patch: add boot vga patch from upstream - * Fri Jul 24 2009 Fedora Release Engineering - 0.10.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/make-libpciaccess-snapshot.sh b/make-libpciaccess-snapshot.sh index f20bf69..a265c3f 100755 --- a/make-libpciaccess-snapshot.sh +++ b/make-libpciaccess-snapshot.sh @@ -12,7 +12,13 @@ else bzip2 -c > $DIRNAME-$DATE.tar.bz2 fi -HASH=$(GIT_DIR=gah.git git-show-ref -s $REV) +HASH=$(GIT_DIR=$DIRNAME.git git show-ref -s $REV) + +echo $HASH + +exit + +# the rest of this is supposed to work? i guess. version=$(sed -n -e "s/^Version: *\(.*\)/\1/p" < libpciaccess.spec) release=$(sed -n -e "s/^Release: *\([^.]*\).*/\1/p" < libpciaccess.spec) diff --git a/sources b/sources index af9fc52..4266e25 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -685cb20e7a6165bc010972f1183addbd libpciaccess-0.10.9.tar.bz2 +945bdd5989282773e0439d0d02f6ef0b libpciaccess-20091209.tar.bz2