Hello community, here is the log from the commit of package zlib for openSUSE:12.1:Update:Test checked in at 2012-02-08 14:51:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update:Test/zlib (Old) and /work/SRC/openSUSE:12.1:Update:Test/.zlib.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "zlib", Maintainer is "mvysko...@suse.com" Changes: -------- --- /work/SRC/openSUSE:12.1:Update:Test/zlib/zlib.changes 2012-02-08 14:51:22.000000000 +0100 +++ /work/SRC/openSUSE:12.1:Update:Test/.zlib.new/zlib.changes 2012-02-08 14:51:22.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Dec 22 14:31:42 CET 2011 - meiss...@suse.de + +- use configure options for library paths. Also fixes + the pkg-config file to not have /usr/local bnc#738169 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zlib.spec ++++++ --- /var/tmp/diff_new_pack.vO1rzn/_old 2012-02-08 14:51:22.000000000 +0100 +++ /var/tmp/diff_new_pack.vO1rzn/_new 2012-02-08 14:51:22.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package zlib # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,11 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: zlib -License: Other uncritical OpenSource License -Group: System/Libraries Provides: libz Obsoletes: libz # bug437293 @@ -28,8 +24,10 @@ %endif # Version: 1.2.5_git201105272030 -Release: 17 +Release: 0 Summary: Data Compression Library +License: Other uncritical OpenSource License +Group: System/Libraries Url: http://www.zlib.net/ # git://github.com/kaffeemonster/zlib_adler32_vec.git Source: zlib-%{version}.tar.bz2 @@ -54,7 +52,6 @@ ftp://ftp.uu.net/graphics/png/documents/zlib/zdoc-index.html. %package devel -License: Other uncritical OpenSource License Summary: Include Files and Libraries mandatory for Development Group: Development/Languages/C and C++ Requires: glibc-devel @@ -72,7 +69,6 @@ libraries. %package devel-static -License: Other uncritical OpenSource License Summary: Include Files and Libraries mandatory for Development Group: Development/Languages/C and C++ Requires: %{name}-devel = %{version} @@ -98,14 +94,14 @@ %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 @@ -113,12 +109,9 @@ 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 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
