packages: zlib/zlib.spec - fixed shared lib build with asmopt

[qboosh]

Author: qboosh                       Date: Tue Feb 16 17:46:44 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fixed shared lib build with asmopt

---- Files affected:
packages/zlib:
   zlib.spec (1.125 -> 1.126) 

---- Diffs:

================================================================
Index: packages/zlib/zlib.spec
diff -u packages/zlib/zlib.spec:1.125 packages/zlib/zlib.spec:1.126
--- packages/zlib/zlib.spec:1.125	Sun Feb 14 19:10:17 2010
+++ packages/zlib/zlib.spec	Tue Feb 16 18:46:38 2010
@@ -311,7 +311,7 @@
 	--libdir=%{_libdir}
 
 %{__make} \
-	%{?with_asmopt:OBJA=match.o}
+	%{?with_asmopt:OBJA=match.o PIC_OBJA=match.lo}
 
 cd contrib/minizip
 %{__aclocal}
@@ -320,7 +320,7 @@
 %{__autoconf}
 %{__automake}
 %configure \
-	--enable-static=no
+	--disable-static
 # SMP flags are explicitly omitted due to a libtool/autoconf
 # dependency race condition
 %{__make} -j1
@@ -342,7 +342,7 @@
 	DESTDIR=$RPM_BUILD_ROOT \
 
 mv -f $RPM_BUILD_ROOT%{_libdir}/libz.so.* $RPM_BUILD_ROOT/%{_lib}
-ln -sf /%{_lib}/$(cd $RPM_BUILD_ROOT/%{_lib} && echo libz.so.*.*) $RPM_BUILD_ROOT%{_libdir}/libz.so
+ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libz.so.*.*) $RPM_BUILD_ROOT%{_libdir}/libz.so
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -374,8 +374,7 @@
 
 %files -n minizip
 %defattr(644,root,root,755)
-%doc contrib/minizip/MiniZip64_Changes.txt
-%doc contrib/minizip/MiniZip64_info.txt
+%doc contrib/minizip/MiniZip64_{Changes,info}.txt
 %attr(755,root,root) %{_bindir}/miniunzip
 %attr(755,root,root) %{_bindir}/minizip
 %attr(755,root,root) %{_libdir}/libminizip.so.*.*.*
@@ -394,6 +393,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.126  2010/02/16 17:46:38  qboosh
+- fixed shared lib build with asmopt
+
 Revision 1.125  2010/02/14 18:10:17  arekm
 - up to 1.2.3.8 (poldek has still problems with it)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/zlib/zlib.spec?r1=1.125&r2=1.126&f=u