File project.diff of Package mingw32-zlib

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package mingw32-zlib

--- mingw32-zlib.spec.orig
+++ mingw32-zlib.spec
@@ -27,6 +27,7 @@ Source:         http://www.zlib.net/zlib
 Patch0:         zlib-1.2.5-nostrip.patch
 Patch1:         zlib-1.2.5-tml.patch
 Patch2:         zlib-1.2.8-nowinrt.patch
+Patch1000:      zlib-1.2.3-wix.patch
 #!BuildIgnore: post-build-checks
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -40,6 +41,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 %_mingw32_package_header_debug
 BuildArch:      noarch
 
+BuildRequires:  wixwine
+
 %description
 zlib is designed to be a free, general-purpose, legally unencumbered -- that
 is, not covered by any patents -- lossless data-compression library for use on
@@ -94,6 +97,8 @@ applications which use minizip.
 %patch1 -p1 -b .tml
 %patch2 -p1 -b .nowinrt
 
+%patch1000 -p1 -b .wix
+
 %build
 %{_mingw32_env}
 ./configure --prefix=%{_mingw32_prefix}
@@ -107,6 +112,12 @@ make -f win32/Makefile.gcc \
   STRIP=%{_mingw32_strip} \
   all
 
+echo "Wixlibs="%{_mingw32_datadir}"/wixlib/zlib.wixlib" >> zlib.pc
+echo "Fualflags=-C zlib -D zlib" >> zlib.pc
+
+candle -o zlib.wixobj zlib.wxs
+lit -o zlib.wixlib -bf zlib.wixobj
+
 cd contrib/minizip
 autoreconf -fi
 echo "lt_cv_deplibs_check_method='pass_all'" >>%{_mingw32_cache}
@@ -124,6 +135,10 @@ make -f win32/Makefile.gcc \
   BINARY_PATH=%{_mingw32_bindir} \
   SHARED_MODE=1 install
 
+mkdir -p $RPM_BUILD_ROOT%{_mingw32_datadir}/wixlib
+install zlib.wixlib $RPM_BUILD_ROOT%{_mingw32_datadir}/wixlib/zlib.wixlib
+
+
 # Remove static library.
 rm %{buildroot}%{_mingw32_libdir}/libz.a
 
@@ -139,6 +154,7 @@ make -C contrib/minizip DESTDIR=%{buildr
 %{_mingw32_includedir}/zlib.h
 %{_mingw32_libdir}/libz.dll.a
 %{_mingw32_libdir}/pkgconfig/zlib.pc
+%{_mingw32_datadir}/wixlib/zlib.wixlib
 
 %files -n mingw32-libminizip1
 %defattr(-,root,root,-)

Places

File project.diff of Package mingw32-zlib

Places