packages: vlc/vlc.spec - fix static libs, add bcond

[glen]

Author: glen                         Date: Sun May 23 20:14:14 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix static libs, add bcond

---- Files affected:
packages/vlc:
   vlc.spec (1.220 -> 1.221) 

---- Diffs:

================================================================
Index: packages/vlc/vlc.spec
diff -u packages/vlc/vlc.spec:1.220 packages/vlc/vlc.spec:1.221
--- packages/vlc/vlc.spec:1.220	Sun May 23 20:32:53 2010
+++ packages/vlc/vlc.spec	Sun May 23 22:14:08 2010
@@ -4,6 +4,7 @@
 #   ./modules/misc/freetype.c:#define DEFAULT_FONT "/usr/share/vlc/skins2/fonts/FreeSans.ttf"
 #   ./modules/gui/skins2/parser/builder.cpp:            string path = (*it) + sep + "fonts" + sep + "FreeSans.ttf";
 # - %{_prefix}/lib cleanup for x86_64
+# - configs to /etc (../http/.hosts)
 #
 # Conditional build:
 %bcond_without	aalib		# build without aalib support
@@ -29,6 +30,7 @@
 %bcond_without	rtmp		# RTMP output plugin
 %bcond_without	shout		# shout plugin
 %bcond_without	speex		# don't build speex plugin
+%bcond_without	static_libs	# don't build static libraries
 %bcond_without	svg		# svg plugin
 %bcond_without	svgalib		# build with svgalib video_output
 %bcond_without	twolame		# twolame plugin
@@ -279,7 +281,7 @@
 %configure \
 	CPPFLAGS="%{rpmcppflags} -I/usr/include/ncurses -I/usr/include/xulrunner/stable -I/usr/include/liveMedia" \
 	--enable-shared \
-	--disable-static \
+	%{!?with_static_libs:--disable-static} \
 %ifarch ppc
 	--disable-altivec \
 %endif
@@ -331,7 +333,6 @@
 	--enable-smb \
 	--enable-snapshot \
 	--enable-sout \
-	--enable-static \
 	--enable-switcher \
 	%{!?with_speex:--disable-speex} \
 	%{?with_svg:--enable-svg} \
@@ -370,7 +371,7 @@
 %endif
 
 # rm -f *.{a,la}
-find $RPM_BUILD_ROOT%{_libdir} -type f -regex '.*\.?a$' -exec rm -f {} ';'
+find $RPM_BUILD_ROOT%{_libdir} -type f -regex '.*\.?a$' | xargs rm -f
 
 mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{pt_PT,pt}
 # unsupported:
@@ -808,6 +809,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.221  2010/05/23 20:14:08  glen
+- fix static libs, add bcond
+
 Revision 1.220  2010/05/23 18:32:53  glen
 - rtmp bcond
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/vlc/vlc.spec?r1=1.220&r2=1.221&f=u