rpms/mingw32-zlib/devel mingw32-zlib.spec,1.7,1.8

[Richard W.M. Jones]

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-zlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22124

Modified Files:
	mingw32-zlib.spec 
Log Message:
* Fri Jun 12 2009 Richard W.M. Jones <rjones at redhat.com> - 1.2.3-18
- Cannot copy current directory into itself, so fix the copy command
  which creates 'x' subdirectory.



Index: mingw32-zlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-zlib/devel/mingw32-zlib.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- mingw32-zlib.spec	1 May 2009 20:36:22 -0000	1.7
+++ mingw32-zlib.spec	12 Jun 2009 09:48:15 -0000	1.8
@@ -6,7 +6,7 @@
 
 Name:           mingw32-zlib
 Version:        1.2.3
-Release:        17%{?dist}
+Release:        18%{?dist}
 Summary:        MinGW Windows zlib compression library
 
 License:        zlib
@@ -51,9 +51,12 @@ MinGW Minizip manipulates files from a .
 
 
 %prep
-%setup -q -n zlib-1.2.3
+%setup -q -n zlib-%{version}
 %patch100 -p1
-cp -r . x || :
+cd ..
+cp -a zlib-%{version} x
+mv x zlib-%{version}
+cd zlib-%{version}
 %patch3 -p1 -b .atools
 # patch cannot create an empty dir
 mkdir m4
@@ -132,6 +135,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Jun 12 2009 Richard W.M. Jones <rjones at redhat.com> - 1.2.3-18
+- Cannot copy current directory into itself, so fix the copy command
+  which creates 'x' subdirectory.
+
 * Thu May  1 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 1.2.3-17
 - BR autoconf, automake, libtool