[packages/libhubbub] pass our CC, cleanup bad copy paste

glen glen at pld-linux.org
Sat Apr 27 16:01:36 CEST 2013


commit da5c947e4ca4373ce0f8b33e121b8e505ac74a15
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sat Apr 27 17:01:24 2013 +0300

    pass our CC, cleanup bad copy paste

 libhubbub.spec | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)
---
diff --git a/libhubbub.spec b/libhubbub.spec
index c2f9abd..0554aa4 100644
--- a/libhubbub.spec
+++ b/libhubbub.spec
@@ -1,7 +1,7 @@
 #
 # Conditional build:
 %bcond_without	static_libs	# don't build static library
-#
+
 Summary:	HTML5 compliant parsing library
 Name:		libhubbub
 Version:	0.2.0
@@ -29,7 +29,6 @@ If you are looking for an HTML5 parser in Python or Ruby, you may wish
 to look at html5lib.
 
 Features:
-
 - Parses HTML, good and bad
 - Simple C API
 - Fast
@@ -68,33 +67,32 @@ Statyczna biblioteka libhubbub.
 %setup -q
 
 %build
-CFLAGS="%{rpmcflags}"
-LDFLAGS="%{rpmldflags}"
-export CFLAGS
-export LDFLAGS
+export CC="%{__cc}"
+export CFLAGS="%{rpmcflags}"
+export LDFLAGS="%{rpmldflags}"
+
+%{__make} Q= \
+	PREFIX=%{_prefix} \
+	COMPONENT_TYPE=lib-shared
 
-%{__make} PREFIX=%{_prefix} COMPONENT_TYPE=lib-shared Q='' \
-	-Iinclude -Isrc"
 %if %{with static_libs}
-%{__make} PREFIX=%{_prefix} COMPONENT_TYPE=lib-static Q='' \
-	-Iinclude -Isrc"
+%{__make} Q= \
+	PREFIX=%{_prefix} \
+	COMPONENT_TYPE=lib-static
 %endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
-%{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT \
+%{__make} install Q= \
 	PREFIX=%{_prefix} \
 	COMPONENT_TYPE=lib-shared \
-	Q=''
+	DESTDIR=$RPM_BUILD_ROOT
 
 %if %{with static_libs}
-%{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT \
+%{__make} install Q= \
 	PREFIX=%{_prefix} \
 	COMPONENT_TYPE=lib-static \
-	Q=''
+	DESTDIR=$RPM_BUILD_ROOT
 %endif
 
 %clean
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libhubbub.git/commitdiff/da5c947e4ca4373ce0f8b33e121b8e505ac74a15



More information about the pld-cvs-commit mailing list