packages: tinyxml/tinyxml.spec - cleanups

[sparky]

Author: sparky                       Date: Mon Dec  6 15:36:21 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- cleanups

---- Files affected:
packages/tinyxml:
   tinyxml.spec (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: packages/tinyxml/tinyxml.spec
diff -u packages/tinyxml/tinyxml.spec:1.6 packages/tinyxml/tinyxml.spec:1.7
--- packages/tinyxml/tinyxml.spec:1.6	Mon Dec  6 16:27:51 2010
+++ packages/tinyxml/tinyxml.spec	Mon Dec  6 16:36:16 2010
@@ -44,15 +44,18 @@
 %{__make} \
 	CXX="%{__cxx}" \
 	LD="%{__cxx}" \
-	OPTFLAGS="%{rpmcxxflags}" \
+	OPTFLAGS="%{rpmcppflags} %{rpmcxxflags}" \
 	LDFLAGS="%{rpmldflags}"
 
-
-# Not really designed to be build as lib
+# Not really designed to be built as lib
 for i in tinyxml.cpp tinystr.cpp tinyxmlerror.cpp tinyxmlparser.cpp; do
-	libtool --tag=CXX --mode=compile %{__cxx} %{rpmldflags} %{rpmcxxflags} -o $i.lo -c $i
+	libtool --tag=CXX --mode=compile \
+		%{__cxx} %{rpmcppflags} %{rpmcxxflags} -o $i.lo -c $i
 done
-libtool --tag=CXX --mode=link %{__cxx} %{rpmcxxflags} %{rpmldflags} -shared -rpath %{_libdir} -version-info 0:0:0 -o libtinyxml.la *.cpp.lo
+libtool --tag=CXX --mode=link \
+	%{__cxx} %{rpmcxxflags} %{rpmldflags} \
+	-shared -rpath %{_libdir} -version-info 0:0:0 \
+	-o libtinyxml.la *.cpp.lo
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -60,7 +63,7 @@
 
 cp -a xmltest $RPM_BUILD_ROOT%{_bindir}
 cp -a tiny*.h $RPM_BUILD_ROOT%{_includedir}
-libtool --mode=install %{__install} -c libtinyxml.la $RPM_BUILD_ROOT%{_libdir}
+libtool --mode=install %{__install} libtinyxml.la $RPM_BUILD_ROOT%{_libdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -85,6 +88,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2010/12/06 15:36:16  sparky
+- cleanups
+
 Revision 1.6  2010/12/06 15:27:51  sparky
 - use libtool to build library, use 0:0:0 as its version
 - BR: libstdc++-devel, libtool
@@ -103,4 +109,3 @@
 
 Revision 1.1  2010/12/06 14:25:49  lisu
 - added to PLD
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tinyxml/tinyxml.spec?r1=1.6&r2=1.7&f=u