rpms/mtd-utils/devel mtd-utils-make-ubi.patch, NONE, 1.1 mtd-utils.spec, 1.7, 1.8

[David Woodhouse (dwmw2)]

Author: dwmw2

Update of /cvs/pkgs/rpms/mtd-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18104

Modified Files:
	mtd-utils.spec 
Added Files:
	mtd-utils-make-ubi.patch 
Log Message:
Build UBI utils

mtd-utils-make-ubi.patch:

--- NEW FILE mtd-utils-make-ubi.patch ---
--- mtd-utils-1.1.0/Makefile~	2007-08-28 20:42:45.000000000 +0100
+++ mtd-utils-1.1.0/Makefile	2007-08-28 20:45:58.000000000 +0100
@@ -6,7 +6,8 @@ MANDIR=/usr/man
 INCLUDEDIR=/usr/include
 #CROSS=arm-linux-
 CC := $(CROSS)gcc
-CFLAGS := -I./include -O2 -Wall
+OPTFLAGS := -O2 -Wall
+CFLAGS := -I./include $(OPTFLAGS)
 
 ifeq ($(origin CROSS),undefined)
   BUILDDIR := .
--- mtd-utils-1.1.0/ubi-utils/Makefile~	2007-08-03 14:55:51.000000000 +0100
+++ mtd-utils-1.1.0/ubi-utils/Makefile	2007-08-28 20:46:29.000000000 +0100
@@ -12,7 +12,8 @@ DESTDIR := /usr/local
 SBINDIR := bin
 
 CC := $(CROSS)gcc
-CFLAGS := -I./inc -I./src -I$(KERNELHDR) -O2 -g -Wall -Werror \
+OPTFLAGS := -O2 -g -Wall -Werror
+CFLAGS := -I./inc -I./src -I$(KERNELHDR) $(OPTFLAGS) \
 	-Wwrite-strings -W -std=gnu99 \
         -DHOST_OS_NAME=\"$(HOST_OS_NAME)\" \
         -DHOST_VERSION_NAME=\"$(HOST_VERSION_NAME)\" \


Index: mtd-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mtd-utils/devel/mtd-utils.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mtd-utils.spec	22 Aug 2007 16:01:13 -0000	1.7
+++ mtd-utils.spec	28 Aug 2007 19:48:22 -0000	1.8
@@ -1,12 +1,13 @@
 Summary: Utilities for dealing with MTD (flash) devices
 Name: mtd-utils
 Version: 1.1.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://www.linux-mtd.infradead.org/
 Source0: ftp://ftp.infradead.org/pub/mtd-utils/%{name}-%{version}.tar.bz2
 Patch0: mtd-utils-1.1.0-mcast-git.patch
+Patch1: mtd-utils-make-ubi.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: zlib-devel libacl-devel lzo-devel
 
@@ -17,12 +18,16 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+
 %build
-make CFLAGS="$RPM_OPT_FLAGS -I./include"
+make OPTFLAGS="$RPM_OPT_FLAGS"
+make OPTFLAGS="$RPM_OPT_FLAGS" -C ubi-utils
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT SBINDIR=%{_sbindir} MANDIR=%{_mandir} install
+make DESTDIR=$RPM_BUILD_ROOT SBINDIR=%{_sbindir} MANDIR=%{_mandir} install -C ubi-utils
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -36,11 +41,14 @@
 
 
 %changelog
+* Tue Aug 28 2007 David Woodhouse <dwmw2 at infradead.org> - 1.1.0-2
+- Build ubi-utils
+
 * Wed Aug 22 2007 David Woodhouse <dwmw2 at infradead.org> - 1.1.0-1
 - Update to 1.1.0 + nandtest + multicast utils
 
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> - 1.0.1-2
- - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+- rebuilt for unwind info generation, broken in gcc-4.1.1-21
 
 * Mon Sep 18 2006 David Woodhouse <dwmw2 at infradead.org> - 1.0.1-1
 - Update to 1.0.1