SPECS: mythtv.spec - build fixes for amd64 - fixed cache dir

[glen]

Author: glen                         Date: Sun Sep  4 10:58:54 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- build fixes for amd64
- fixed cache dir

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

---- Diffs:

================================================================
Index: SPECS/mythtv.spec
diff -u SPECS/mythtv.spec:1.18 SPECS/mythtv.spec:1.19
--- SPECS/mythtv.spec:1.18	Sun Sep  4 00:07:56 2005
+++ SPECS/mythtv.spec	Sun Sep  4 12:58:49 2005
@@ -23,7 +23,7 @@
 Name:		mythtv
 Version:	0.18.1
 #define _snap 20050326
-Release:	0.1
+Release:	0.3
 License:	GPL v2
 Group:		Applications/Multimedia
 Source0:	http://www.mythtv.org/mc/%{name}-%{version}.tar.bz2
@@ -33,6 +33,8 @@
 Source3:	mythbackend.logrotate
 Patch0:		%{name}-configure.patch
 Patch1:		%{name}-lib64.patch
+Patch2:		%{name}-x86_64-configure.patch
+Patch3:		%{name}-x11.patch
 URL:		http://www.mythtv.org/
 BuildRequires:	XFree86-devel
 #BuildRequires:	DirectFB-devel
@@ -237,10 +239,23 @@
 %setup -q
 #%patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
+%if %{with cpu_autodetect}
+# Make sure we have /proc mounted
+if [ ! -r /proc/cpuinfo ]; then
+	echo "You need to have /proc mounted in order to build with cpu_autodetect!"
+	exit 1
+fi
+%endif
 export QTDIR="%{_prefix}"
 export QMAKESPEC="linux-g++"
+
+%ifarch %{x8664}
+export QMAKE_LIBDIR_X11=%{_prefix}/X11R6/%{_lib}
+%endif
 #export CFLAGS="%{rpmcflags} -fomit-frame-pointer"
 
 # BTW: this is not autoconf configure
@@ -261,6 +276,9 @@
         --arch=x86_64 \
     %endif
 %endif
+    %ifarch %{x8664}
+        --enable-mmx \
+    %endif
 	--%{?with_arts:en}%{!?with_arts:dis}able-audio-arts \
 	--%{?with_alsa:en}%{!?with_alsa:dis}able-audio-alsa \
 	--%{?with_oss:en}%{!?with_oss:dis}able-audio-oss \
@@ -280,10 +298,10 @@
 
 #sed -i -e 's:OPTFLAGS=.*:OPTFLAGS=%{rpmcflags} -Wno-switch:g' config.mak
 # dunno. the configure doesn't take --prefix...
-sed -i -e 's:PREFIX =.*:PREFIX = %{_prefix}:g' settings.pro
+#sed -i -e 's:PREFIX =.*:PREFIX = %{_prefix}:g' settings.pro
 
 # lib64 hack
-echo "LIBDIR=%{_libdir}" >> settings.pro
+#echo "LIBDIR=%{_libdir}" >> config.mak
 
 # MythTV doesn't support parallel builds
 #qmake -o Makefile mythtv.pro \
@@ -323,7 +341,7 @@
 
 # Various utility directories that we want rpm to keep track of mythtv ownership
 install -d $RPM_BUILD_ROOT/var/lib/mythtv
-install -d $RPM_BUILD_ROOT/var/lib/cache/mythtv
+install -d $RPM_BUILD_ROOT/var/cache/mythtv
 install -d $RPM_BUILD_ROOT%{_localstatedir}/log/mythtv
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
 install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
@@ -363,7 +381,7 @@
 %attr(755,root,root) %{_bindir}/mythfilldatabase
 %attr(755,root,root) %{_bindir}/mythjobqueue
 %attr(755,mythtv,mythtv) %dir /var/lib/mythtv
-%attr(755,mythtv,mythtv) %dir /var/lib/cache/mythtv
+%attr(755,mythtv,mythtv) %dir /var/cache/mythtv
 %attr(754,root,root) /etc/rc.d/init.d/mythbackend
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/mythbackend
 %config /etc/logrotate.d/mythbackend
@@ -417,6 +435,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.19  2005/09/04 10:58:49  glen
+- build fixes for amd64
+- fixed cache dir
+
 Revision 1.18  2005/09/03 22:07:56  glen
 - lib64 fixes
 - CFLAGS passing works, but they get overriden still
================================================================

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