New version rebase patch, use optflags

This commit is contained in:
Paul Nasrat 2005-12-23 10:19:25 +00:00
parent 57dc7e2551
commit 4dedc847a6
2 changed files with 13 additions and 13 deletions

View File

@ -1,11 +1,11 @@
--- iprutils/Makefile.cflags 2004-08-03 17:43:19.781282728 -0400
+++ iprutils/Makefile 2004-08-03 17:44:40.061078344 -0400
--- iprutils/Makefile.cflags 2005-12-23 10:11:42.000000000 +0000
+++ iprutils/Makefile 2005-12-23 10:11:49.000000000 +0000
@@ -9,7 +9,7 @@
include version.mk
-CFLAGS = -g -Wall $(IPR_DEFINES) -DIPR_IPRUTILS
+CFLAGS += -g -Wall $(IPR_DEFINES) -DIPR_IPRUTILS
-CFLAGS = -g -Wall $(IPR_DEFINES)
+CFLAGS += -g -Wall $(IPR_DEFINES)
UTILS_VER = $(IPR_MAJOR_RELEASE).$(IPR_MINOR_RELEASE).$(IPR_FIX_LEVEL)
TAR = cd .. && tar -zcpf iprutils-$(UTILS_VER)-src.tgz --exclude CVS --exclude applied-patches --exclude series --exclude txt --exclude pc --exclude patches --exclude debug --exclude *~* iprutils
all: iprconfig iprupdate iprdump iprinit iprdbg docs

View File

@ -1,11 +1,12 @@
ExclusiveArch: ppc ppc64
Summary: Utilities for the IBM Power Linux RAID adapters
Name: iprutils
Version: 2.0.15.3
Release: 2.1
Version: 2.1.1
Release: 1
License: CPL
Group: System Environment/Base
Source0: iprutils-%{version}-src.tgz
Patch0: iprutils-cflags.patch
URL: http://sourceforge.net/projects/iprdd/
BuildRoot: %{_tmppath}/%{name}-root
Obsoletes: ipr-utils
@ -20,9 +21,10 @@ supported by the ipr SCSI storage device driver.
%prep
%setup -q -n %{name}
%patch0 -p1
%build
make
CFLAGS=$RPM_OPT_FLAGS make
%install
rm -rf $RPM_BUILD_ROOT
@ -53,11 +55,9 @@ rm -rf $RPM_BUILD_ROOT
%{_sysconfdir}/rc.d/init.d/*
%changelog
* Thu Dec 21 2005 Jesse Keating <jkeating@redhat.com> - 2.0.15.3-2
- rebuilt again
* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
- rebuilt
* Fri Dec 23 2005 Paul Nasrat <pnasrat@redhat.com> - 2.1.1-1
- Update to 2.1.1
- Use RPM_OPT_FLAGS
* Tue Aug 02 2005 Paul Nasrat <pnasrat@redhat.com> - 2.0.15.3-1
- update to 2.0.15.3-1