SPECS: mythtv.spec - lib64 fixes - CFLAGS passing works, but they ...

[glen]

Author: glen                         Date: Sat Sep  3 22:08:01 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- lib64 fixes
- CFLAGS passing works, but they get overriden still

---- Files affected:
SPECS:
   mythtv.spec (1.17 -> 1.18) 

---- Diffs:

================================================================
Index: SPECS/mythtv.spec
diff -u SPECS/mythtv.spec:1.17 SPECS/mythtv.spec:1.18
--- SPECS/mythtv.spec:1.17	Sat Sep  3 21:58:45 2005
+++ SPECS/mythtv.spec	Sun Sep  4 00:07:56 2005
@@ -32,6 +32,7 @@
 Source2:	mythbackend.init
 Source3:	mythbackend.logrotate
 Patch0:		%{name}-configure.patch
+Patch1:		%{name}-lib64.patch
 URL:		http://www.mythtv.org/
 BuildRequires:	XFree86-devel
 #BuildRequires:	DirectFB-devel
@@ -235,19 +236,20 @@
 %prep
 %setup -q
 #%patch0 -p1
+%patch1 -p1
 
 %build
 export QTDIR="%{_prefix}"
 export QMAKESPEC="linux-g++"
-export CFLAGS="%{rpmcflags} -fomit-frame-pointer"
+#export CFLAGS="%{rpmcflags} -fomit-frame-pointer"
 
 # BTW: this is not autoconf configure
 %configure \
     --compile-type=%{?debug:debug}%{!?debug:release} \
     --disable-audio-jack \
     --enable-dvb --dvb-path=%{_includedir} \
-	--extra-cflags="%{rpmcflags}" \
-	--extra-cxxflags="%{rpmcxxflags}" \
+	--extra-cflags="%{rpmcflags} -fomit-frame-pointer" \
+	--extra-cxxflags="%{rpmcxxflags} -fomit-frame-pointer" \
 %if %{with cpu_autodetect}
     %ifarch i386 i686
 		--cpu=i386 --tune=pentium4 --enable-mmx \
@@ -280,6 +282,9 @@
 # dunno. the configure doesn't take --prefix...
 sed -i -e 's:PREFIX =.*:PREFIX = %{_prefix}:g' settings.pro
 
+# lib64 hack
+echo "LIBDIR=%{_libdir}" >> settings.pro
+
 # MythTV doesn't support parallel builds
 #qmake -o Makefile mythtv.pro \
 #    QMAKE_CXX="%{__cxx}" \
@@ -290,9 +295,6 @@
 
 %{__make} qmake
 
-# We don't want rpm to add perl requirements to anything in contrib
-find contrib -type f | xargs -r chmod a-x
-
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT
@@ -415,6 +417,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.18  2005/09/03 22:07:56  glen
+- lib64 fixes
+- CFLAGS passing works, but they get overriden still
+
 Revision 1.17  2005/09/03 19:58:45  glen
 - cleanups
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/mythtv.spec?r1=1.17&r2=1.18&f=u