From 86e6a8d17a9232849e1601aa0e0c24a09476b92b6a84d76eb8433bb2327e6efb Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Tue, 27 Dec 2011 17:39:53 +0000
Subject: [PATCH] Accepting request 97969 from Base:System

- use configure options for library paths. Also fixes
  the pkg-config file to not have /usr/local bnc#738169 (forwarded request 97895 from msmeissn)

OBS-URL: https://build.opensuse.org/request/show/97969
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/zlib?expand=0&rev=44
---
 zlib.changes |  6 ++++++
 zlib.spec    | 14 ++++++--------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/zlib.changes b/zlib.changes
index ac102d0..37fb486 100644
--- a/zlib.changes
+++ b/zlib.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Dec 22 14:31:42 CET 2011 - meissner@suse.de
+
+- use configure options for library paths. Also fixes
+  the pkg-config file to not have /usr/local bnc#738169
+
 -------------------------------------------------------------------
 Wed Dec  7 15:29:27 UTC 2011 - coolo@suse.com
 
diff --git a/zlib.spec b/zlib.spec
index cf970be..1a8d9d7 100644
--- a/zlib.spec
+++ b/zlib.spec
@@ -15,6 +15,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 Name:           zlib
 Provides:       libz
 Obsoletes:      libz
@@ -89,14 +90,14 @@ export LDFLAGS="-Wl,-z,relro,-z,now"
 %if %{do_profiling}
 profiledir=$(mktemp -d)
 trap "rm -rf $profiledir" EXIT
-CC="%__cc" ./configure --shared
+CC="%__cc" ./configure --shared --prefix=%_prefix --libdir=/%_lib
 %{__make} CFLAGS="$RPM_OPT_FLAGS %{cflags_profile_generate}=$profiledir" %{?_smp_mflags}
 time make check
 make clean
 %{__make} CFLAGS="$RPM_OPT_FLAGS %{cflags_profile_feedback}=$profiledir" %{?_smp_mflags}
 %else
 export CFLAGS="%optflags"
-CC="%__cc" ./configure --shared
+CC="%__cc" ./configure --shared --prefix=%_prefix --libdir=/%_lib
 %{__make} %{?_smp_mflags}
 %endif
 
@@ -104,12 +105,9 @@ CC="%__cc" ./configure --shared
 time make check
 
 %install
-mkdir -p %{buildroot}{/%{_lib},%{_libdir}}
-mkdir -p %{buildroot}%{_mandir}/man3
-mkdir -p %{buildroot}%{_includedir}
-make install \
-	prefix=%{buildroot}%{_prefix} \
-	libdir=%{buildroot}/%{_lib}
+#mkdir -p %{buildroot}%{_mandir}/man3
+mkdir -p %{buildroot}%{_libdir}
+make install DESTDIR=%{buildroot}
 %{__ln_s} -v /%{_lib}/$(readlink %{buildroot}/%{_lib}/libz.so) %{buildroot}%{_libdir}/libz.so
 %{__rm} -v %{buildroot}/%{_lib}/libz.so
 # static lib