From 0cec28deb7b2a3feb8dd9b66b6b1562d88d5100f Mon Sep 17 00:00:00 2001
From: Erik van Pienbroek <epienbro@fedoraproject.org>
Date: Jun 06 2012 19:02:08 +0000
Subject: Prevent errors when the folders %{mingw32_prefix} or %{mingw64_prefix} are missing


and fix parse error when -config files containing a . are available in %{mingw32_bindir} or %{mingw64_bindir} (RHBZ #657478)

---

diff --git a/macros.mingw32 b/macros.mingw32
index 8959dbf..fa4ace4 100644
--- a/macros.mingw32
+++ b/macros.mingw32
@@ -78,7 +78,7 @@
   fi; \
   LDFLAGS="${MINGW32_LDFLAGS:-%mingw32_ldflags}"; export LDFLAGS; \
   for i in `ls %{mingw32_bindir}/*|grep -- "-config\$"` ; do \
-    x=`basename $i|tr "a-z+-" "A-ZX_"`; \
+    x=`basename $i|tr "a-z+-." "A-ZX_"`; \
     declare -x $x="$i" ; export $x; \
   done; \
   unset x i
diff --git a/macros.mingw64 b/macros.mingw64
index 31fbb43..3e6fbdd 100644
--- a/macros.mingw64
+++ b/macros.mingw64
@@ -78,7 +78,7 @@
   fi; \
   LDFLAGS="${MINGW64_LDFLAGS:-%mingw64_ldflags}"; export LDFLAGS; \
   for i in `ls %{mingw64_bindir}/*|grep -- "-config\$"` ; do \
-    x=`basename $i|tr "a-z+-" "A-ZX_"`; \
+    x=`basename $i|tr "a-z+-." "A-ZX_"`; \
     declare -x $x="$i" ; export $x; \
   done; \
   unset x i
diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 4b1060f..2ca7afb 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -2,7 +2,7 @@
 
 Name:           mingw-filesystem
 Version:        95
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
 Group:          Development/Libraries
@@ -246,6 +246,11 @@ install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/mingw/
 
 
 %changelog
+* Wed Jun  6 2012 Erik van Pienbroek <epienbro@fedoraproject.org> - 95-10
+- Prevent errors when the folders %%{mingw32_prefix} or %%{mingw64_prefix} are missing
+- Fix parse error when -config files containing a . are available
+  in %%{mingw32_bindir} or %%{mingw64_bindir} (RHBZ #657478)
+
 * Thu Apr 19 2012 Kalev Lember <kalevlember@gmail.com> - 95-9
 - Fix whitespace handling in %%mingw_configure and friends
 
diff --git a/mingw-find-debuginfo.sh b/mingw-find-debuginfo.sh
index 62c0b13..e47df65 100755
--- a/mingw-find-debuginfo.sh
+++ b/mingw-find-debuginfo.sh
@@ -31,6 +31,9 @@ done
 
 for target in $@; do
 	prefix=`rpm --eval "%{${target}_prefix}"`
+	if [ ! -d $RPM_BUILD_ROOT$prefix ] ; then
+		continue
+	fi
 	find $RPM_BUILD_ROOT$prefix -type f -name "*.exe.debug" -or -name "*.dll.debug" |
 		sed -n -e "s#^$RPM_BUILD_ROOT##p" > $BUILDDIR/${target}-debugfiles.list
 done