packages: crossmingw32-zlib/crossmingw32-zlib.spec, crossmingw32-zlib/cross...

[wiget]

Author: wiget                        Date: Thu Mar 18 22:47:44 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use win32/Makefile.gcc for building (for compatibility with other zlib DLL distributors)
- drop shared.patch (unused now)
- drop hacking unused configure
- don't include zutil.h in package (zlib internal file)
- release 2
NOTE: DLL file name change

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

---- Diffs:

================================================================
Index: packages/crossmingw32-zlib/crossmingw32-zlib.spec
diff -u packages/crossmingw32-zlib/crossmingw32-zlib.spec:1.22 packages/crossmingw32-zlib/crossmingw32-zlib.spec:1.23
--- packages/crossmingw32-zlib/crossmingw32-zlib.spec:1.22	Mon Mar 15 08:59:01 2010
+++ packages/crossmingw32-zlib/crossmingw32-zlib.spec	Thu Mar 18 23:47:39 2010
@@ -15,13 +15,11 @@
 Summary(pl.UTF-8):	Biblioteka z podprogramami do kompresji i dekompresji - wersja skrośna dla Ming32
 Name:		crossmingw32-%{realname}
 Version:	1.2.4
-Release:	1
+Release:	2
 License:	BSD
 Group:		Development/Libraries
 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
@@ -90,7 +88,6 @@
 
 %prep
 %setup -q -n %{realname}-%{version}
-%patch0 -p1
 
 %if %{with asmopt}
 %ifarch i686 athlon
@@ -101,24 +98,17 @@
 %endif
 %endif
 
-# fix for underline test
-#sed -i -e 's/nm/%{target}-nm/' configure
-# but it's broken anyway (tries to use mmap test remains, but there is no mmap
-# in mingw32) - so hardcode that underline is needed
-sed -i -e 's/.*grep _hello.*/if false; then/' configure
-# vim '
-
 %build
-CC="%{__cc}" \
-CXX="%{__cxx}" \
-AR="%{target}-ar" \
-RANLIB="%{target}-ranlib" \
-CFLAGS="-D_REENTRANT %{rpmcflags}%{?with_asmopt: -DASMV}" \
-./configure \
-	--static \
-	--prefix=%{_prefix}
-
-%{__make} static z.dll \
+%{__make} -fwin32/Makefile.gcc all \
+	CC="%{__cc}" \
+	CXX="%{__cxx}" \
+	AR="%{target}-ar" \
+	RANLIB="%{target}-ranlib" \
+	CFLAGS="-D_REENTRANT %{rpmcflags}%{?with_asmopt: -DASMV}" \
+	DLLWRAP="%{target}-dllwrap" \
+	RC="%{target}-windres" \
+	prefix="%{_prefix}" \
+	CP="install" \
 	%{?with_asmopt:OBJA=match.o}
 
 # used by libtool to detect dependencies
@@ -129,10 +119,10 @@
 # Made by czarny czarny at pld-linux.org
 
 # The name that we can dlopen(3).
-dlname='../bin/libz.dll'
+dlname='../bin/zlib1.dll'
 
 # Names of this library.
-library_names='libz.dll.a'
+library_names='libzdll.a'
 
 # The name of the static archive.
 old_library='libz.a'
@@ -159,22 +149,25 @@
 libdir='%{_libdir}'
 EOF
 
+sed -e 's=@prefix@=%{_prefix}=;s=@exec_prefix@=%{_prefix}=;s=@libdir@=%{_libdir}=;s=@includedir@=%{_includedir}=;s=@VERSION@=%{version}=' \
+	< zlib.pc.in > zlib.pc
+
 %if 0%{!?debug:1}
-%{target}-strip -R.comment -R.note z.dll
+%{target}-strip -R.comment -R.note zlib1.dll
 %{target}-strip -g -R.comment -R.note *.a
 %endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_libdir},%{_includedir},%{_dlldir}}
+install -d $RPM_BUILD_ROOT{%{_libdir},%{_includedir},%{_dlldir},%{_pkgconfigdir}}
 
-%{__make} install \
-	prefix=$RPM_BUILD_ROOT%{_prefix}
-
-install zutil.h $RPM_BUILD_ROOT%{_includedir}
-install libz.dll.a $RPM_BUILD_ROOT%{_libdir}
+install zlib.h $RPM_BUILD_ROOT%{_includedir}
+install zconf.h $RPM_BUILD_ROOT%{_includedir}
+install libzdll.a $RPM_BUILD_ROOT%{_libdir}
+install libz.a $RPM_BUILD_ROOT%{_libdir}
 install libz.la $RPM_BUILD_ROOT%{_libdir}
-install z.dll $RPM_BUILD_ROOT%{_dlldir}/libz.dll
+install zlib1.dll $RPM_BUILD_ROOT%{_dlldir}
+install zlib.pc $RPM_BUILD_ROOT%{_pkgconfigdir}
 
 rm -rf $RPM_BUILD_ROOT%{_datadir}/man
 
@@ -183,11 +176,10 @@
 
 %files
 %defattr(644,root,root,755)
-%{_libdir}/libz.dll.a
+%{_libdir}/libzdll.a
 %{_libdir}/libz.la
 %{_includedir}/zconf.h
 %{_includedir}/zlib.h
-%{_includedir}/zutil.h
 %{_pkgconfigdir}/zlib.pc
 
 %files static
@@ -196,7 +188,7 @@
 
 %files dll
 %defattr(644,root,root,755)
-%{_dlldir}/libz.dll
+%{_dlldir}/zlib1.dll
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -204,6 +196,14 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.23  2010/03/18 22:47:39  wiget
+- use win32/Makefile.gcc for building (for compatibility with other zlib DLL distributors)
+- drop shared.patch (unused now)
+- drop hacking unused configure
+- don't include zutil.h in package (zlib internal file)
+- release 2
+NOTE: DLL file name change
+
 Revision 1.22  2010/03/15 07:59:01  qboosh
 - updated to 1.2.4 (adds LFS)
 - updated shared patch, removed obsolete asmopt patch
================================================================

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