SPECS: mplayer.spec - no compiler magic if shared bcond not enable...

glen glen at pld-linux.org
Sat Oct 1 17:27:17 CEST 2005


Author: glen                         Date: Sat Oct  1 15:27:17 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- no compiler magic if shared bcond not enabled (breaks x86 build)

---- Files affected:
SPECS:
   mplayer.spec (1.301 -> 1.302) 

---- Diffs:

================================================================
Index: SPECS/mplayer.spec
diff -u SPECS/mplayer.spec:1.301 SPECS/mplayer.spec:1.302
--- SPECS/mplayer.spec:1.301	Mon Sep 26 00:31:47 2005
+++ SPECS/mplayer.spec	Sat Oct  1 17:27:12 2005
@@ -69,7 +69,7 @@
 Summary(pt_BR):	Reprodutor de filmes
 Name:		mplayer
 Version:	1.0
-%define	_rel 3.11
+%define	_rel 3.12
 Release:	2.%{pre}.%{_rel}
 # DO NOT increase epoch unless it's really neccessary!
 # especially such changes like pre7->pre7try2, increase Release instead!
@@ -284,8 +284,13 @@
 find . -type d -name CVS -print | xargs rm -rf
 
 %build
+%if %{with shared}
 CFLAGS="%{rpmcflags} -fPIC"
 LDFLAGS="%{rpmldflags} -wl,--as-needed"
+%else
+CFLAGS="%{rpmcflags}"
+LDFLAGS="%{rpmldflags}"
+%endif
 CC="%{__cc}"
 export CC CFLAGS
 
@@ -417,7 +422,9 @@
 %endif
 
 # X-files
+%if %{with gui}
 install %{SOURCE5} $RPM_BUILD_ROOT%{_desktopdir}
+%endif
 install %{SOURCE8} $RPM_BUILD_ROOT%{_desktopdir}
 install %{SOURCE7} $RPM_BUILD_ROOT%{_pixmapsdir}
 
@@ -514,6 +521,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.302  2005/10/01 15:27:12  glen
+- no compiler magic if shared bcond not enabled (breaks x86 build)
+
 Revision 1.301  2005/09/25 22:31:47  glen
 - separate gmplayer and mencoder to subpackages, -common package created for sharing common portions
 - skin dropped, as those are available from mplayer-skins.spec
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/mplayer.spec?r1=1.301&r2=1.302&f=u




More information about the pld-cvs-commit mailing list