diff --git a/flashrom--Makefile_cleanup.diff b/flashrom--Makefile_cleanup.diff index ea85bed..7fdfdea 100644 --- a/flashrom--Makefile_cleanup.diff +++ b/flashrom--Makefile_cleanup.diff @@ -1,30 +1,35 @@ ---- Makefile 2007-08-05 15:15:51.000000000 +0400 -+++ Makefile 2007-08-05 15:18:46.000000000 +0400 -@@ -7,18 +7,10 @@ - PROGRAM = flashrom - +--- Makefile.Makefile_cleanup 2008-05-17 05:08:58.000000000 +0400 ++++ Makefile 2008-05-17 23:33:17.000000000 +0400 +@@ -9,15 +9,15 @@ CC = gcc --STRIP = strip + STRIP = strip INSTALL = /usr/bin/install -PREFIX = /usr/local --#CFLAGS = -O2 -g -Wall -Werror --CFLAGS = -Os -Wall -Werror -DDISABLE_DOC # -DTS5300 +PREFIX = /usr + #CFLAGS = -O2 -g -Wall -Werror +-CFLAGS = -Os -Wall -Werror -DDISABLE_DOC # -DTS5300 ++#CFLAGS = -Os -Wall -Werror -DDISABLE_DOC # -DTS5300 OS_ARCH = $(shell uname) --ifeq ($(OS_ARCH), SunOS) + ifeq ($(OS_ARCH), SunOS) + LDFLAGS = -lpci -lz + else LDFLAGS = -lpci -lz --else --LDFLAGS = -lpci -lz -static -STRIP_ARGS = -s --endif ++#STRIP_ARGS = -s + endif + + OBJS = chipset_enable.o board_enable.o udelay.o jedec.o stm50flw0x0x.c \ +@@ -31,12 +31,11 @@ - OBJS = chipset_enable.o board_enable.o udelay.o jedec.o sst28sf040.o \ - am29f040b.o mx29f002.o sst39sf020.o m29f400bt.o w49f002u.o \ -@@ -30,7 +22,6 @@ + # Set the flashrom version string from the highest revision number + # of the checked out flashrom files. +-SVNDEF := -D'FLASHROM_VERSION="$(shell svnversion -cn . \ ++#SVNDEF := -D'FLASHROM_VERSION="$(shell svnversion -cn . \ + | sed -e "s/.*://" -e "s/\([0-9]*\).*/\1/")"' $(PROGRAM): $(OBJS) $(CC) -o $(PROGRAM) $(OBJS) $(LDFLAGS) - $(STRIP) $(STRIP_ARGS) $(PROGRAM) - clean: - rm -f *.o *~ + flashrom.o: flashrom.c + $(CC) -c $(CFLAGS) $(SVNDEF) $(CPPFLAGS) $< -o $@ diff --git a/flashrom.spec b/flashrom.spec index e3bcdf2..45e5742 100644 --- a/flashrom.spec +++ b/flashrom.spec @@ -1,7 +1,7 @@ Summary: Simple program for reading/writing BIOS chips content Name: flashrom Version: 0 -Release: 0.8.20080517svn3332%{?dist} +Release: 0.9.20080517svn3332%{?dist} License: GPLv2+ Group: Applications/System # svn -r 3332 export svn://linuxbios.org/repos/trunk/util/flashrom flashrom @@ -26,7 +26,7 @@ and write new contents on the chips ("flash the chip"). %build # currently disabling DiscOnChip due to instability -CFLAGS="%{optflags} -DDISABLE_DOC" %{__make} %{?_smp_mflags} +CFLAGS="%{optflags} -D'FLASHROM_VERSION=\"3332\"' -DDISABLE_DOC" %{__make} %{?_smp_mflags} %install %{__rm} -rf $RPM_BUILD_ROOT @@ -44,6 +44,9 @@ install -D -p -m644 %{name}.8 $RPM_BUILD_ROOT%{_mandir}/man8/%{name}.8 %{_mandir}/man8/%{name}.* %changelog +* Sat May 17 2008 Peter Lemenkov 0-0.9.20080517svn3332 +- Fixed %patch0 + * Sat May 17 2008 Peter Lemenkov 0-0.8.20080517svn3332 - Support Pm49FL004/2 Block Locking Registers - Add support for the Atmel AT25DF321 SPI flash