[SOIL] Reintroduced the move-one-folder-up workaround - spaces in path still cause

[belegdol]

commit 94263f2f3437cb7a3fcd4137624e13a4f23bb6aa
Author: Julian Sikorski <belegdol at fedoraproject.org>
Date:   Tue Feb 19 20:29:01 2013 +0100

    Reintroduced the move-one-folder-up workaround - spaces in path still cause
    
      problems (Red Hat bug #912831)

 SOIL-link-correctly.patch |    4 ++--
 SOIL.spec                 |   15 +++++++++++----
 2 files changed, 13 insertions(+), 6 deletions(-)
---
diff --git a/SOIL-link-correctly.patch b/SOIL-link-correctly.patch
index 10b1d45..170d726 100644
--- a/SOIL-link-correctly.patch
+++ b/SOIL-link-correctly.patch
@@ -1,5 +1,5 @@
---- SOIL-1.07/Simple OpenGL Image Library/projects/makefile/alternate Makefile.txt.link-correctly	2008-07-07 18:13:28.000000000 +0200
-+++ SOIL-1.07/Simple OpenGL Image Library/projects/makefile/alternate Makefile.txt	2011-12-23 12:59:17.186345220 +0100
+--- SOIL-1.07/projects/makefile/alternate Makefile.txt.link-correctly	2008-07-07 18:13:28.000000000 +0200
++++ SOIL-1.07/projects/makefile/alternate Makefile.txt	2011-12-23 12:59:17.186345220 +0100
 @@ -29,7 +29,7 @@ lib: $(OFILES)
  	# create static library
  	ar -cvq $(LIBNAME).a $(OFILES)
diff --git a/SOIL.spec b/SOIL.spec
index b91e86d..ac03457 100644
--- a/SOIL.spec
+++ b/SOIL.spec
@@ -1,6 +1,6 @@
 Name:           SOIL
 Version:        1.07
-Release:        9.20080706%{?dist}
+Release:        10.20080706%{?dist}
 Summary:        Simple OpenGL Image Library
 
 # src/image_helper.{c,h} are MIT-licensed
@@ -30,11 +30,14 @@ developing applications that use %{name}.
 
 %prep
 %setup -qc
+# workaround for RH bug #912831
+mv Simple\ OpenGL\ Image\ Library/* .
+rmdir Simple\ OpenGL\ Image\ Library
 %patch0 -p1 -b .link-correctly
 
 
 %build
-pushd Simple\ OpenGL\ Image\ Library/src
+pushd src
 make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -c -fPIC" \
     -f ../projects/makefile/alternate\ Makefile.txt
 popd
@@ -42,7 +45,7 @@ popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
-pushd Simple\ OpenGL\ Image\ Library/src
+pushd src
 make -f ../projects/makefile/alternate\ Makefile.txt install \
     DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir} INCLUDEDIR=%{_includedir}/%{name} \
     INSTALL_FILE="install -pm 644" INSTALL_DIR="install -dp"
@@ -62,7 +65,7 @@ chmod 755 $RPM_BUILD_ROOT%{_libdir}/lib%{name}.so.1.07-20071110
 
 
 %files
-%doc Simple\ OpenGL\ Image\ Library/soil.html
+%doc soil.html
 %{_libdir}/lib%{name}.so.*
 
 %files devel
@@ -71,6 +74,10 @@ chmod 755 $RPM_BUILD_ROOT%{_libdir}/lib%{name}.so.1.07-20071110
 
 
 %changelog
+* Tue Feb 19 2013 Julian Sikorski <belegdol at fedoraproject.org> - 1.07-10.20080706
+- Reintroduced the move-one-folder-up workaround - spaces in path still cause
+  problems (Red Hat bug #912831)
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.07-9.20080706
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild