[mingw-zlib: 17/25] Use the built .pc file instead of manually generating it

Kalev Lember kalev at fedoraproject.org
Tue Mar 6 21:33:40 UTC 2012


commit 3db3beac16546f084c720f6f5ab30855cec6c21e
Author: Kalev Lember <kalev at smartlink.ee>
Date:   Tue May 10 13:32:45 2011 +0300

    Use the built .pc file instead of manually generating it

 mingw32-zlib.spec |   18 ++++++------------
 1 files changed, 6 insertions(+), 12 deletions(-)
---
diff --git a/mingw32-zlib.spec b/mingw32-zlib.spec
index dcf8391..e9e244b 100644
--- a/mingw32-zlib.spec
+++ b/mingw32-zlib.spec
@@ -7,7 +7,7 @@
 
 Name:           mingw32-zlib
 Version:        1.2.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        MinGW Windows zlib compression library
 
 License:        zlib
@@ -70,7 +70,7 @@ pushd x
 CC=%{_mingw32_cc} \
 CFLAGS="%{_mingw32_cflags}" \
 RANLIB=%{_mingw32_ranlib} \
-./configure
+./configure --prefix=%{_mingw32_prefix}
 
 make -f win32/Makefile.gcc \
   CFLAGS="%{_mingw32_cflags}" \
@@ -94,15 +94,6 @@ cp x/libzdll.a .libs/libz.dll.a
 cp x/zlib1.dll .libs/
 make %{?_smp_mflags}
 
-sed \
-  -e 's|@prefix@|%{_mingw32_prefix}|g' \
-  -e 's|@exec_prefix@|${prefix}|g' \
-  -e 's|@libdir@|%{_mingw32_libdir}|g' \
-  -e 's|@sharedlibdir@|${libdir}|g' \
-  -e 's|@includedir@|%{_mingw32_includedir}|g' \
-  -e 's|@VERSION@|%{version}|g' \
-  zlib.pc.in > zlib.pc
-
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -113,7 +104,7 @@ rm -rf $RPM_BUILD_ROOT/%{_mingw32_mandir}
 
 rm -f $RPM_BUILD_ROOT/%{_mingw32_bindir}/libz-1.dll
 install x/zlib1.dll $RPM_BUILD_ROOT/%{_mingw32_bindir}/
-install -m 644 zlib.pc $RPM_BUILD_ROOT%{_mingw32_libdir}/pkgconfig/
+install -m 644 x/zlib.pc $RPM_BUILD_ROOT%{_mingw32_libdir}/pkgconfig/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -145,6 +136,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue May 10 2011 Kalev Lember <kalev at smartlink.ee> - 1.2.5-4
+- Use the built .pc file instead of manually generating it
+
 * Tue Apr 26 2011 Kalev Lember <kalev at smartlink.ee> - 1.2.5-3
 - Install zlib pkgconfig file
 


More information about the mingw mailing list