packages: crossmingw32-zlib/crossmingw32-zlib-shared.patch, crossmingw32-zl...

[qboosh]

Author: qboosh                       Date: Mon Mar 15 07:59:06 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 1.2.4 (adds LFS)
- updated shared patch, removed obsolete asmopt patch

---- Files affected:
packages/crossmingw32-zlib:
   crossmingw32-zlib-shared.patch (1.1 -> 1.2) , crossmingw32-zlib.spec (1.21 -> 1.22) , zlib-asmopt.patch (1.2 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/crossmingw32-zlib/crossmingw32-zlib-shared.patch
diff -u packages/crossmingw32-zlib/crossmingw32-zlib-shared.patch:1.1 packages/crossmingw32-zlib/crossmingw32-zlib-shared.patch:1.2
--- packages/crossmingw32-zlib/crossmingw32-zlib-shared.patch:1.1	Thu Dec 25 03:21:47 2003
+++ packages/crossmingw32-zlib/crossmingw32-zlib-shared.patch	Mon Mar 15 08:59:01 2010
@@ -1,12 +1,11 @@
-diff -ruN zlib-1.2.1./Makefile.in zlib-1.2.1/Makefile.in
---- zlib-1.2.1./Makefile.in	2003-12-25 03:08:31.000000000 +0100
-+++ zlib-1.2.1/Makefile.in	2003-12-25 03:10:13.070092968 +0100
-@@ -71,6 +71,9 @@
- 	$(AR) $@ $(OBJS) $(OBJA)
+--- zlib-1.2.4./Makefile.in	2003-12-25 03:08:31.000000000 +0100
++++ zlib-1.2.4/Makefile.in	2003-12-25 03:10:13.070092968 +0100
+@@ -108,6 +108,9 @@
+ 	$(AR) $@ $(OBJS)
  	-@ ($(RANLIB) $@ || true) >/dev/null 2>&1
  
-+z.dll: $(OBJS) $(OBJA)
-+	$(CC) -shared $(OBJS) $(OBJA) -Wl,--enable-auto-image-base -o z.dll -Wl,--out-implib,libz.dll.a
++z.dll: $(OBJS)
++	$(CC) -shared $(OBJS) -Wl,--enable-auto-image-base -o z.dll -Wl,--out-implib,libz.dll.a
 +
  match.o: match.S
  	$(CPP) match.S > _match.s

================================================================
Index: packages/crossmingw32-zlib/crossmingw32-zlib.spec
diff -u packages/crossmingw32-zlib/crossmingw32-zlib.spec:1.21 packages/crossmingw32-zlib/crossmingw32-zlib.spec:1.22
--- packages/crossmingw32-zlib/crossmingw32-zlib.spec:1.21	Fri Jan 11 23:45:53 2008
+++ packages/crossmingw32-zlib/crossmingw32-zlib.spec	Mon Mar 15 08:59:01 2010
@@ -14,14 +14,14 @@
 Summary:	Library for compression and decompression - Ming32 cross version
 Summary(pl.UTF-8):	Biblioteka z podprogramami do kompresji i dekompresji - wersja skrośna dla Ming32
 Name:		crossmingw32-%{realname}
-Version:	1.2.3
-Release:	4
+Version:	1.2.4
+Release:	1
 License:	BSD
 Group:		Development/Libraries
-Source0:	http://www.zlib.net/%{realname}-%{version}.tar.gz
-# Source0-md5:	debc62758716a169df9f62e6ab2bc634
-Patch0:		%{realname}-asmopt.patch
-Patch1:		%{name}-shared.patch
+Source0:	http://www.zlib.net/current/%{realname}-%{version}.tar.gz
+# Source0-md5:	47f6ed51b3c83a8534f9228531effa18
+#Patch0:		%{realname}-asmopt.patch
+Patch0:		%{name}-shared.patch
 URL:		http://www.zlib.org/
 BuildRequires:	crossmingw32-gcc
 BuildRequires:	sed >= 4.0
@@ -36,6 +36,7 @@
 %define		_sysprefix		/usr
 %define		_prefix			%{_sysprefix}/%{target}
 %define		_libdir			%{_prefix}/lib
+%define		_pkgconfigdir		%{_prefix}/lib/pkgconfig
 %define		_dlldir			/usr/share/wine/windows/system
 %define		__cc			%{target}-gcc
 %define		__cxx			%{target}-g++
@@ -89,10 +90,9 @@
 
 %prep
 %setup -q -n %{realname}-%{version}
-%patch1 -p1
+%patch0 -p1
 
 %if %{with asmopt}
-%patch0 -p1
 %ifarch i686 athlon
 cp contrib/asm686/match.S .
 %endif
@@ -111,14 +111,15 @@
 %build
 CC="%{__cc}" \
 CXX="%{__cxx}" \
-AR="%{target}-ar rc" \
+AR="%{target}-ar" \
 RANLIB="%{target}-ranlib" \
 CFLAGS="-D_REENTRANT %{rpmcflags}%{?with_asmopt: -DASMV}" \
 ./configure \
+	--static \
 	--prefix=%{_prefix}
 
-%{__make}
-%{__make} z.dll
+%{__make} static z.dll \
+	%{?with_asmopt:OBJA=match.o}
 
 # used by libtool to detect dependencies
 cat << "EOF" >> libz.la
@@ -184,7 +185,10 @@
 %defattr(644,root,root,755)
 %{_libdir}/libz.dll.a
 %{_libdir}/libz.la
-%{_includedir}/*.h
+%{_includedir}/zconf.h
+%{_includedir}/zlib.h
+%{_includedir}/zutil.h
+%{_pkgconfigdir}/zlib.pc
 
 %files static
 %defattr(644,root,root,755)
@@ -200,6 +204,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.22  2010/03/15 07:59:01  qboosh
+- updated to 1.2.4 (adds LFS)
+- updated shared patch, removed obsolete asmopt patch
+
 Revision 1.21  2008/01/11 22:45:53  qboosh
 - force %{_lib}-independent libdir
 - release 4
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/crossmingw32-zlib/crossmingw32-zlib-shared.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/crossmingw32-zlib/crossmingw32-zlib.spec?r1=1.21&r2=1.22&f=u