- up to 3.16

Changed files:
    crossmingw32-runtime-stdinc.patch -> 1.4
    crossmingw32-runtime.spec -> 1.28

diff --git a/crossmingw32-runtime-stdinc.patch b/crossmingw32-runtime-stdinc.patch
index 0ffe8a7cf06d267f4885aeacb4633fbcaa3e73cf..1ac6527de0bdc711fa58b8cd9840032be3ac5e25 100644 (file)
--- a/crossmingw32-runtime-stdinc.patch
+++ b/crossmingw32-runtime-stdinc.patch
@@ -1,32 +1,30 @@
-diff -urN mingw-runtime-3.5.orig/Makefile.in mingw-runtime-3.5/Makefile.in
---- mingw-runtime-3.5.orig/Makefile.in 2004-09-05 15:51:50.000000000 +0200
-+++ mingw-runtime-3.5/Makefile.in      2004-09-11 22:31:53.906116216 +0200
-@@ -101,7 +101,6 @@
+--- mingwrt-3.16-mingw32/Makefile.in.org       2009-08-23 02:15:25.799505624 +0200
++++ mingwrt-3.16-mingw32/Makefile.in   2009-08-23 02:15:37.278392489 +0200
+@@ -166,7 +166,6 @@
  W32API_INCLUDE = @W32API_INCLUDE@
- INCLUDES+= -I$(srcdir)/include \
+ INCLUDES = -I$(srcdir)/include \
    -I$(srcdir)/../include \
 -  -nostdinc \
    -iwithprefixbefore include
- ALL_CFLAGS = $(CFLAGS) $(W32API_INCLUDE) $(INCLUDES) $(MNO_CYGWIN)
- ALL_CXXFLAGS = $(CXXFLAGS) $(W32API_INCLUDE) $(INCLUDES) -nostdinc++ $(MNO_CYGWIN)
---- mingw-runtime-3.11/mingwex/Makefile.in.orig        2007-02-19 22:27:01.698642398 +0100
-+++ mingw-runtime-3.11/mingwex/Makefile.in     2007-02-19 22:28:17.074937847 +0100
-@@ -105,7 +105,6 @@
+ ALL_CFLAGS = $(CFLAGS) $(INCLUDES) $(W32API_INCLUDE)
+ ALL_CXXFLAGS = $(CXXFLAGS) $(INCLUDES) -nostdinc++ $(W32API_INCLUDE)
+--- mingwrt-3.16-mingw32/mingwex/Makefile.in.org       2009-08-23 02:22:58.068380312 +0200
++++ mingwrt-3.16-mingw32/mingwex/Makefile.in   2009-08-23 02:23:04.203630108 +0200
+@@ -128,7 +128,6 @@
  
  W32API_INCLUDE = @W32API_INCLUDE@
- INCLUDES = -I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../include \
+ INCLUDES = -I${srcdir} -I${top_srcdir} -I${top_srcdir}/include \
 -  -nostdinc \
    -iwithprefixbefore include
- ALL_CFLAGS = $(CFLAGS) $(WARNFLAGS) $(OPTFLAGS) $(W32API_INCLUDE) $(INCLUDES) $(MNO_CYGWIN)
- ALL_CXXFLAGS = $(CXXFLAGS) $(WARNFLAGS) $(OPTFLAGS) $(W32API_INCLUDE) $(INCLUDES) -nostdinc++ $(MNO_CYGWIN)
-diff -urN mingw-runtime-3.5.orig/profile/Makefile.in mingw-runtime-3.5/profile/Makefile.in
---- mingw-runtime-3.5.orig/profile/Makefile.in 2004-09-05 15:37:02.000000000 +0200
-+++ mingw-runtime-3.5/profile/Makefile.in      2004-09-11 22:31:27.078194680 +0200
-@@ -49,7 +49,6 @@
+ ALL_CFLAGS = $(CFLAGS) $(WARNFLAGS) $(OPTFLAGS) $(INCLUDES) $(W32API_INCLUDE)
+ ALL_CXXFLAGS = $(CXXFLAGS) $(WARNFLAGS) $(OPTFLAGS) $(INCLUDES) -nostdinc++ $(W32API_INCLUDE)
+--- mingwrt-3.16-mingw32/profile/Makefile.in.org       2009-08-23 02:23:13.505506761 +0200
++++ mingwrt-3.16-mingw32/profile/Makefile.in   2009-08-23 02:23:18.573631831 +0200
+@@ -67,7 +67,6 @@
  
  W32API_INCLUDE = @W32API_INCLUDE@
- INCLUDES = -I$(srcdir) -I$(srcdir)/../include \
+ INCLUDES = -I${srcdir} -I${top_srcdir}/include \
 -  -nostdinc \
    -iwithprefixbefore include
- ALL_CFLAGS = $(CFLAGS) $(W32API_INCLUDE) $(INCLUDES) $(MNO_CYGWIN)
- ALL_CXXFLAGS = $(CXXFLAGS) $(W32API_INCLUDE) $(INCLUDES) -nostdinc++ $(MNO_CYGWIN)
+ ALL_CFLAGS = $(CFLAGS) $(INCLUDES) $(W32API_INCLUDE)
+ ALL_CXXFLAGS = $(CXXFLAGS) $(INCLUDES) -nostdinc++ $(W32API_INCLUDE)

diff --git a/crossmingw32-runtime.spec b/crossmingw32-runtime.spec
index d0dbd25be52dfda02743ccf1ea4db3722be9f795..1ff7c2945a39dda07abfa164d2aae925227e81cd 100644 (file)
--- a/crossmingw32-runtime.spec
+++ b/crossmingw32-runtime.spec
@@ -1,17 +1,16 @@
 Summary:       Mingw32 Binary Utility Development Utilities - runtime libraries
 Summary(pl.UTF-8):     Zestaw narzędzi mingw32 - biblioteki uruchomieniowe
 Name:          crossmingw32-runtime
-Version:       3.13
+Version:       3.16
 %define runver %{version}
-%define        runsrc  mingw-runtime-%{runver}
+%define        runsrc  mingwrt-%{runver}-mingw32
 Release:       1
 Epoch:         1
 License:       Free
 Group:         Development/Libraries
 Source0:       http://dl.sourceforge.net/mingw/%{runsrc}-src.tar.gz
-# Source0-md5: f7f61ed33e1bd485e97a765c7945cb2a
+# Source0-md5: d56a0712cd4c70a46c27fc20b92ea2c3
 Patch0:                %{name}-stdinc.patch
-Patch1:                %{name}-configure.patch
 URL:           http://www.mingw.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -53,20 +52,12 @@ MinGW32.
 
 %prep
 %setup -q -n %{runsrc}
-dos2unix Makefile.in configure.in mkinstalldirs */Makefile.in */configure.in
+dos2unix Makefile.in configure.in mkinstalldirs */Makefile.in
 %patch0 -p1 
-%patch1 -p1
 
 %build
 cp /usr/share/automake/config.sub .
 %{__autoconf}
-cd mingwex
-cp /usr/share/automake/config.sub .
-%{__autoconf}
-cd ../profile
-cp /usr/share/automake/config.sub .
-%{__autoconf}
-cd ..
 ./configure \
        --prefix=%{_prefix} \
        --host=%{target} \
@@ -77,6 +68,8 @@ cd ..
 %install
 rm -rf $RPM_BUILD_ROOT
 
+# makefile expects dir before creating it
+install -d $RPM_BUILD_ROOT%{_prefix}/bin
 %{__make} install \
        prefix=$RPM_BUILD_ROOT%{_prefix}