diff --git a/libcrystalhd.spec b/libcrystalhd.spec index 1779cde..f1daeac 100644 --- a/libcrystalhd.spec +++ b/libcrystalhd.spec @@ -41,6 +41,7 @@ License: Redistributable, no modification permitted BuildArch: noarch Group: System Environment/Kernel Requires: %{name} = %{version}-%{release} +Conflicts: filesystem < 3 %description -n crystalhd-firmware Firmwares for the Broadcom Crystal HD (bcm970012 and bcm970015) @@ -73,6 +74,8 @@ pushd linux_lib/libcrystalhd/ > /dev/null 2>&1 make %{?_smp_mflags} popd > /dev/null 2>&1 pushd filters/gst/gst-plugin/ > /dev/null 2>&1 +## FIXME: does not compile without -Wno-unused-but-set-variable +export CFLAGS="%optflags -Wno-unused-but-set-variable" %configure make %{?_smp_mflags} popd > /dev/null 2>&1 @@ -86,8 +89,10 @@ pushd filters/gst/gst-plugin/ > /dev/null 2>&1 make install DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT%{_libdir}/gstreamer-0.10/libgstbcmdec.{a,la} popd > /dev/null 2>&1 -cp -p %{SOURCE2} $RPM_BUILD_ROOT/lib/firmware/ -cp -p %{SOURCE3} $RPM_BUILD_ROOT/lib/firmware/ +mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib +mv $RPM_BUILD_ROOT/lib/firmware $RPM_BUILD_ROOT%{_prefix}/lib/firmware +cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_prefix}/lib/firmware/ +cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_prefix}/lib/firmware/ %clean rm -rf $RPM_BUILD_ROOT @@ -110,8 +115,8 @@ rm -rf $RPM_BUILD_ROOT %files -n crystalhd-firmware %defattr(-,root,root,0755) %doc LICENSE -/lib/firmware/bcm70012fw.bin -/lib/firmware/bcm70015fw.bin +%{_prefix}/lib/firmware/bcm70012fw.bin +%{_prefix}/lib/firmware/bcm70015fw.bin %files -n gstreamer-plugin-crystalhd %defattr(-,root,root,0755)