Attachment 148247 Details for Bug 226671 – simplify %build and %install, remove redundant Prefix

[patch] simplify %build and %install, remove redundant Prefix

zlib.spec.diff (text/plain), 1.80 KB, created by Patrice Dumas on 2007-02-16 21:18:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Patrice Dumas

Created: 2007-02-16 21:18:28 UTC

Size: 1.80 KB

patch

obsolete

>? i386
>? zlib-1.2.3
>? zlib-1.2.3-4.src.rpm
>? zlib-1.2.3-save
>Index: zlib.spec
>===================================================================
>RCS file: /cvs/dist/rpms/zlib/devel/zlib.spec,v
>retrieving revision 1.30
>diff -u -3 -p -r1.30 zlib.spec
>--- zlib.spec	23 Oct 2006 09:25:42 -0000	1.30
>+++ zlib.spec	16 Feb 2007 21:17:38 -0000
>@@ -9,7 +9,6 @@ Patch1: zlib-1.2.3-cflags.patch
> Patch2: zlib-1.2.3-lib.patch
> URL: http://www.gzip.org/zlib/
> License: BSD
>-Prefix: %{_prefix}
> BuildRoot: %{_tmppath}/%{name}-%{version}-root
> 
> %description
>@@ -33,29 +32,23 @@ library.
> %patch2 -p1 -b .lib
> 
> %build
>-CFLAGS="$RPM_OPT_FLAGS -fPIC" ./configure --shared --prefix=%{_prefix}
>+CFLAGS="$RPM_OPT_FLAGS -fPIC" ./configure --shared
> mv Makefile Makefile.shared
> 
> # now build the static lib
>-CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix}
>+CFLAGS="$RPM_OPT_FLAGS" ./configure
> mv Makefile Makefile.static
> 
> %install
> rm -rf ${RPM_BUILD_ROOT}
>-mkdir -p ${RPM_BUILD_ROOT}%{_prefix}
>-mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man3
> 
>-make -f Makefile.shared install prefix=${RPM_BUILD_ROOT}%{_prefix}
>-make -f Makefile.static install prefix=${RPM_BUILD_ROOT}%{_prefix}
>+make -f Makefile.shared install includedir=${RPM_BUILD_ROOT}%{_includedir} \
>+  libdir=${RPM_BUILD_ROOT}%{_libdir} mandir=${RPM_BUILD_ROOT}%{_mandir}
>+make -f Makefile.static install includedir=${RPM_BUILD_ROOT}%{_includedir} \
>+  libdir=${RPM_BUILD_ROOT}%{_libdir} mandir=${RPM_BUILD_ROOT}%{_mandir}
> 
> install -m644 zutil.h ${RPM_BUILD_ROOT}%{_includedir}/zutil.h
> 
>-if [ "%{_prefix}/lib" != "%{_libdir}" ]; then
>-    mkdir -p ${RPM_BUILD_ROOT}%{_libdir}
>-    mv ${RPM_BUILD_ROOT}%{_prefix}/lib/* ${RPM_BUILD_ROOT}%{_libdir}
>-    rmdir ${RPM_BUILD_ROOT}%{_prefix}/lib
>-fi
>-
> %check
> make -f Makefile.shared %{?_smp_mflags} test
> make -f Makefile.static %{?_smp_mflags} test

Actions: View | Diff

Attachments on bug 226671: 148247 | 151869 | 151870