[mingw32-zlib] Use the built .pc file instead of manually generating it
by Kalev Lember
commit 3db3beac16546f084c720f6f5ab30855cec6c21e
Author: Kalev Lember <kalev(a)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(a)smartlink.ee> - 1.2.5-4
+- Use the built .pc file instead of manually generating it
+
* Tue Apr 26 2011 Kalev Lember <kalev(a)smartlink.ee> - 1.2.5-3
- Install zlib pkgconfig file
13 years
[mingw32-pixman] Update to 0.22.0
by Kalev Lember
commit 11ac6524c8d3bd0a145601be154705da243f9560
Author: Kalev Lember <kalev(a)smartlink.ee>
Date: Sun May 8 23:03:11 2011 +0300
Update to 0.22.0
.gitignore | 1 +
...n-dont-check-for-mprotect-and-getpagesize.patch | 35 --------------------
mingw32-pixman.spec | 12 +++----
sources | 2 +-
4 files changed, 7 insertions(+), 43 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 928e051..e6af2a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ pixman-0.18.2.tar.bz2
/pixman-0.19.2.tar.bz2
/pixman-0.19.4.tar.gz
/pixman-0.20.2.tar.gz
+/pixman-0.22.0.tar.gz
diff --git a/mingw32-pixman.spec b/mingw32-pixman.spec
index 603e69b..69fe908 100644
--- a/mingw32-pixman.spec
+++ b/mingw32-pixman.spec
@@ -6,7 +6,7 @@
%define __debug_install_post %{_mingw32_debug_install_post}
Name: mingw32-pixman
-Version: 0.20.2
+Version: 0.22.0
Release: 1%{?dist}
Summary: MinGW Windows Pixman library
@@ -17,10 +17,6 @@ Group: Development/Libraries
Source0: http://cairographics.org/releases/pixman-%{version}.tar.gz
Source1: make-pixman-snapshot.sh
-# The configure script checks for the availability of the functions mprotect and getpagesize, but
-# these checks return an invalid result which results in a compile failure
-Patch0: mingw32-pixman-dont-check-for-mprotect-and-getpagesize.patch
-
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -49,14 +45,13 @@ Static version of the MinGW Windows Pixman library.
%prep
%setup -q -n pixman-%{version}
-%patch0 -p0
%build
# Uses GTK for its testsuite, so disable this otherwise
# we have a chicken & egg problem on mingw
%{_mingw32_configure} --disable-gtk --enable-static --enable-shared
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
%install
@@ -85,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun May 08 2011 Kalev Lember <kalev(a)smartlink.ee> - 0.22.0-1
+- Update to 0.22.0
+
* Mon Apr 25 2011 Kalev Lember <kalev(a)smartlink.ee> - 0.20.2-1
- Update to 0.20.2
diff --git a/sources b/sources
index 10fcb1e..5b0e891 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a923c20af88e469ac29ba42cfedb88c2 pixman-0.20.2.tar.gz
+cb8f3cb5ce2c8d7294f73ecb7021fda6 pixman-0.22.0.tar.gz
13 years