- prefix fixed

- simplify BR

Changed files:
    mythtv.spec -> 1.5

diff --git a/mythtv.spec b/mythtv.spec
index 333e1f8bc68ef0f9ff48ad717b7aa607616a9147..7661c52d20b95f3c45c472bd713b24373f753ee4 100644 (file)
--- a/mythtv.spec
+++ b/mythtv.spec
@@ -46,21 +46,12 @@ BuildRequires:      qt-devel >= 6:3.2.1-4
 BuildRequires: qmake >= 6:3.2.1-4
 BuildRequires: mysql-devel
 BuildRequires: desktop-file-utils
-%if %{with alsa}
-BuildRequires: alsa-lib-devel
-%endif
-%if %{with lirc}
-BuildRequires: lirc-devel
-%endif
-%if %{with arts}
-BuildRequires: arts-devel >= 13:0.9.5
-%endif
-%if %{with xvmc}
-BuildRequires: nvidia-graphics-devel
-%endif
-%if %{with opengl_vsync}
-BuildRequires: nvidia-graphics-devel
-%endif
+BuildRequires: sed >= 4.0
+%{?with_alsa:BuildRequires:    alsa-lib-devel}
+%{?with_lirc:BuildRequires:    lirc-devel}
+%{?with_arts:BuildRequires:    arts-devel >= 13:0.9.5}
+%{?with_xvmc:BuildRequires:    nvidia-graphics-devel}
+%{?with_opengl_vsync:BuildRequires:    nvidia-graphics-devel}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -228,6 +219,8 @@ OPTS=""
 #  --enable-dvb-eit \
 
 #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
 
 # MythTV doesn't support parallel builds
 qmake -o Makefile mythtv.pro \
@@ -247,11 +240,6 @@ install -d $RPM_BUILD_ROOT
 %{__make} install \
        INSTALL_ROOT=$RPM_BUILD_ROOT
 
-mv $RPM_BUILD_ROOT{/usr/local/bin,%{_bindir}}
-mv $RPM_BUILD_ROOT{/usr/local/include,%{_includedir}}
-mv $RPM_BUILD_ROOT{/usr/local/share,%{_datadir}}
-mv $RPM_BUILD_ROOT{/usr/local/lib,%{_libdir}}
-
 # Install the files that we added on top of mythtv's own stuff
 install -pD %{SOURCE2} $RPM_BUILD_ROOT%{_initrddir}/mythbackend
 install -pD %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/mythbackend