rpms/mingw32-filesystem/F-10 mingw32-scripts.sh, NONE, 1.1 mingw32-filesystem.spec, 1.5, 1.6 mingw32-macros.mingw32, 1.3, 1.4 mingw32-configure.sh, 1.2, NONE

[Richard W.M. Jones]

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-filesystem/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22496/F-10

Modified Files:
	mingw32-filesystem.spec mingw32-macros.mingw32 
Added Files:
	mingw32-scripts.sh 
Removed Files:
	mingw32-configure.sh 
Log Message:
- Unify mingw32-filesystem packages from all three branches again, and test.
- Fix mingw32-scripts so it can handle extra parameters correctly.
- Remove mingw32-env & mingw32-make since neither of them actually work.



--- NEW FILE mingw32-scripts.sh ---
#!/bin/sh -

# mingw32-configure
# Copyright (C) 2008 Red Hat Inc., Richard W.M. Jones.
# Copyright (C) 2008 Levente Farkas
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

# This is a useful command-line script through which one can use the
# macros from mingw32-macros.mingw32 cross-compilation. 

# XXX This doesn't handle quoting of extra parameters which contain
# spaces correctly.

rpm --eval "%{_"`basename $0|tr "-" "_"`"} $@"|sh


Index: mingw32-filesystem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-filesystem/F-10/mingw32-filesystem.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mingw32-filesystem.spec	23 Nov 2008 22:18:00 -0000	1.5
+++ mingw32-filesystem.spec	24 Nov 2008 16:08:07 -0000	1.6
@@ -1,8 +1,8 @@
 %define debug_package %{nil}
 
 Name:           mingw32-filesystem
-Version:        38
-Release:        1%{?dist}
+Version:        39
+Release:        2%{?dist}
 Summary:        MinGW base filesystem and environment
 
 Group:          Development/Libraries
@@ -17,7 +17,7 @@
 #Source3:        mingw32.csh
 Source4:        mingw32-find-requires.sh
 Source5:        mingw32-find-provides.sh
-Source6:        mingw32-configure.sh
+Source6:        mingw32-scripts.sh
 
 Requires:       setup
 Requires:       rpm
@@ -45,9 +45,6 @@
 Provides:       mingw32(wldap32.dll)
 Provides:       mingw32(glut32.dll)
 
-Obsoletes:      mingw-filesystem = %{version}-%{release}
-Provides:       mingw-filesystem < 26
-
 
 %description
 This package contains the base filesystem layout, RPM macros and
@@ -73,8 +70,15 @@
 
 mkdir -p $RPM_BUILD_ROOT
 
+mkdir -p $RPM_BUILD_ROOT%{_libexecdir}
+install -m 755 %{SOURCE6} $RPM_BUILD_ROOT%{_libexecdir}/mingw32-scripts
+
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
-install -m 755 %{SOURCE6} $RPM_BUILD_ROOT%{_bindir}/mingw32-configure
+pushd $RPM_BUILD_ROOT%{_bindir}
+for i in mingw32-configure; do
+  ln -s %{_libexecdir}/mingw32-scripts $i
+done
+popd
 
 #mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
 #install -m 644 %{SOURCE2} %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/
@@ -132,11 +136,17 @@
 #%config(noreplace) %{_sysconfdir}/profile.d/mingw32.sh
 #%config(noreplace) %{_sysconfdir}/profile.d/mingw32.csh
 %{_bindir}/mingw32-configure
+%{_libexecdir}/mingw32-scripts
 %{_prefix}/i686-pc-mingw32/
 /usr/lib/rpm/mingw32-*
 
 
 %changelog
+* Mon Nov 24 2008 Richard W.M. Jones <rjones at redhat.com> - 39-3
+- Unify mingw32-filesystem packages from all three branches again, and test.
+- Fix mingw32-scripts so it can handle extra parameters correctly.
+- Remove mingw32-env & mingw32-make since neither of them actually work.
+
 * Sun Nov 23 2008 Richard Jones <rjones at redhat.com> - 38-1
 - Added mingw32(glut32.dll).
 


Index: mingw32-macros.mingw32
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-filesystem/F-10/mingw32-macros.mingw32,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mingw32-macros.mingw32	19 Nov 2008 18:02:22 -0000	1.3
+++ mingw32-macros.mingw32	24 Nov 2008 16:08:07 -0000	1.4
@@ -23,16 +23,16 @@
 
 %_mingw32_cflags          -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
 
-%_mingw32_cc		  i686-pc-mingw32-gcc
-%_mingw32_cpp		  i686-pc-mingw32-gcc -E
-%_mingw32_ar		  i686-pc-mingw32-ar
-%_mingw32_as		  i686-pc-mingw32-as
-%_mingw32_dlltool	  i686-pc-mingw32-dlltool
-%_mingw32_ranlib	  i686-pc-mingw32-ranlib
-%_mingw32_strip		  i686-pc-mingw32-strip
-%_mingw32_objdump	  i686-pc-mingw32-objdump
+%_mingw32_cc              i686-pc-mingw32-gcc
+%_mingw32_cpp             i686-pc-mingw32-gcc -E
+%_mingw32_ar              i686-pc-mingw32-ar
+%_mingw32_as              i686-pc-mingw32-as
+%_mingw32_dlltool         i686-pc-mingw32-dlltool
+%_mingw32_ranlib          i686-pc-mingw32-ranlib
+%_mingw32_strip           i686-pc-mingw32-strip
+%_mingw32_objdump         i686-pc-mingw32-objdump
 %_mingw32_nm              i686-pc-mingw32-nm
-%_mingw32_windres	  i686-pc-mingw32-windres
+%_mingw32_windres         i686-pc-mingw32-windres
 %_mingw32_cxx             i686-pc-mingw32-g++
 
 %_mingw32_cache           mingw32-config.cache
@@ -41,13 +41,15 @@
 %_mingw32_findrequires    /usr/lib/rpm/mingw32-find-requires.sh
 
 %_mingw32_env HOST_CC=gcc; export HOST_CC; \
+  AS="%{_mingw32_as}"; export AS; \
+  AR="%{_mingw32_ar}"; export AR; \
   NM="%{_mingw32_nm}"; export NM; \
   OBJDUMP="%{_mingw32_objdump}"; export OBJDUMP; \
   PKG_CONFIG_PATH="%{_mingw32_libdir}/pkgconfig"; export PKG_CONFIG_PATH; \
-  CC="${MINGW_CC:-%_mingw32_cc}"; export CC; \
-  CXX="${MINGW_CXX:-%_mingw32_cxx}"; export CXX; \
-  CFLAGS="${MINGW_CFLAGS:-%_mingw32_cflags}"; export CFLAGS; \
-  CXXFLAGS="${MINGW_CXXFLAGS:-%_mingw32_cflags}"; export CXXFLAGS; \
+  CC="${MINGW32_CC:-%_mingw32_cc}"; export CC; \
+  CXX="${MINGW32_CXX:-%_mingw32_cxx}"; export CXX; \
+  CFLAGS="${MINGW32_CFLAGS:-%_mingw32_cflags}"; export CFLAGS; \
+  CXXFLAGS="${MINGW32_CXXFLAGS:-%_mingw32_cflags}"; export CXXFLAGS; \
   for i in `ls %{_mingw32_bindir}|grep -- "-config\$"` ; do \
     CONFIG_NAME=`echo $i|tr "a-z-" "A-Z_"`; \
     declare -x $CONFIG_NAME="%{_mingw32_bindir}/$i" ; export $CONFIG_NAME; \


--- mingw32-configure.sh DELETED ---