rpms/mingw32-filesystem/EL-5 mingw32-filesystem.spec, 1.7, 1.8 mingw32-scripts.sh, 1.1, 1.2

[Richard W.M. Jones]

Author: rjones

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

Modified Files:
	mingw32-filesystem.spec mingw32-scripts.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.



Index: mingw32-filesystem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-filesystem/EL-5/mingw32-filesystem.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mingw32-filesystem.spec	21 Nov 2008 18:50:07 -0000	1.7
+++ mingw32-filesystem.spec	24 Nov 2008 16:08:06 -0000	1.8
@@ -1,8 +1,8 @@
 %define debug_package %{nil}
 
 Name:           mingw32-filesystem
-Version:        38
-Release:        2%{?dist}
+Version:        39
+Release:        3%{?dist}
 Summary:        MinGW base filesystem and environment
 
 Group:          Development/Libraries
@@ -43,6 +43,7 @@
 Provides:       mingw32(msvcrt.dll)
 Provides:       mingw32(user32.dll)
 Provides:       mingw32(wldap32.dll)
+Provides:       mingw32(glut32.dll)
 
 
 %description
@@ -71,8 +72,13 @@
 
 mkdir -p $RPM_BUILD_ROOT%{_libexecdir}
 install -m 755 %{SOURCE6} $RPM_BUILD_ROOT%{_libexecdir}/mingw32-scripts
+
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
-(cd $RPM_BUILD_ROOT%{_bindir}; for i in mingw32-env mingw32-configure mingw32-make ; do ln -s %{_libexecdir}/mingw32-scripts $i ; done)
+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/
@@ -129,13 +135,18 @@
 %config(noreplace) %{_sysconfdir}/rpm/macros.mingw32
 #%config(noreplace) %{_sysconfdir}/profile.d/mingw32.sh
 #%config(noreplace) %{_sysconfdir}/profile.d/mingw32.csh
-%{_bindir}/*
+%{_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.
+
 * Fri Nov 21 2008 Levente Farkas <lfarkas at lfarkas.org> 38-2
 - a few more spec file fix
 


Index: mingw32-scripts.sh
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-filesystem/EL-5/mingw32-scripts.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mingw32-scripts.sh	21 Nov 2008 18:13:45 -0000	1.1
+++ mingw32-scripts.sh	24 Nov 2008 16:08:06 -0000	1.2
@@ -21,4 +21,7 @@
 # This is a useful command-line script through which one can use the
 # macros from mingw32-macros.mingw32 cross-compilation. 
 
-rpm --eval "%{_"`basename $0|tr "-" "_"`"}" "$@"|sh
+# XXX This doesn't handle quoting of extra parameters which contain
+# spaces correctly.
+
+rpm --eval "%{_"`basename $0|tr "-" "_"`"} $@"|sh