[packages/libnsbmp] do not clear CFLAGS, internal include paths are cleared then

glen glen at pld-linux.org
Sat Apr 27 14:43:49 CEST 2013


commit 7fa034fbd45cc181c024a1430877f3859a15ec84
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sat Apr 27 15:40:33 2013 +0300

    do not clear CFLAGS, internal include paths are cleared then

 libnsbmp.spec | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)
---
diff --git a/libnsbmp.spec b/libnsbmp.spec
index c48c02d..3ac1143 100644
--- a/libnsbmp.spec
+++ b/libnsbmp.spec
@@ -12,7 +12,6 @@ Source0:	http://download.netsurf-browser.org/libs/releases/%{name}-%{version}-sr
 # Source0-md5:	5b33ff44dfb48e628bcadbe7e51edf90
 URL:		http://www.netsurf-browser.org/projects/libnsbmp/
 BuildRequires:	netsurf-buildsystem
-BuildRequires:	sed
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -50,28 +49,26 @@ Statyczna biblioteka libnsbmp.
 %setup -q
 
 %build
-%{__make} PREFIX=%{_prefix} COMPONENT_TYPE=lib-shared Q='' \
-	CFLAGS="%{rpmcflags}" LDFLAGS="%{rpmldflags}"
+CFLAGS="%{rpmcflags}" LDFLAGS="%{rpmldflags}" \
+%{__make} PREFIX=%{_prefix} COMPONENT_TYPE=lib-shared Q=''
+
 %if %{with static_libs}
-%{__make} PREFIX=%{_prefix} COMPONENT_TYPE=lib-static Q='' \
-	CFLAGS="%{rpmcflags}" LDFLAGS="%{rpmldflags}"
+CFLAGS="%{rpmcflags}" LDFLAGS="%{rpmldflags}" \
+%{__make} PREFIX=%{_prefix} COMPONENT_TYPE=lib-static Q=''
 %endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
-%{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT \
-	PREFIX=%{_prefix} \
+%{__make} install Q='' \
 	COMPONENT_TYPE=lib-shared \
-	Q=''
+	PREFIX=%{_prefix} \
+	DESTDIR=$RPM_BUILD_ROOT
 
 %if %{with static_libs}
-%{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT \
-	PREFIX=%{_prefix} \
+%{__make} install Q='' \
 	COMPONENT_TYPE=lib-static \
-	Q=''
+	PREFIX=%{_prefix} \
+	DESTDIR=$RPM_BUILD_ROOT
 %endif
 
 %clean
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libnsbmp.git/commitdiff/b6d06bec0c727c56e2121682c19d729ca88dd56a



More information about the pld-cvs-commit mailing list