rpms/em8300/devel em8300.spec,1.22,1.23

[Ville Skyttä]

Author: scop

Update of /cvs/pkgs/rpms/em8300/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23134

Modified Files:
	em8300.spec 
Log Message:
* Sun Sep 14 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.17.1-2
- Adapt to a couple of different alsa/cards dir locations.



Index: em8300.spec
===================================================================
RCS file: /cvs/pkgs/rpms/em8300/devel/em8300.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- em8300.spec	22 Aug 2008 17:43:10 -0000	1.22
+++ em8300.spec	14 Sep 2008 17:28:24 -0000	1.23
@@ -2,7 +2,7 @@
 
 Name:           em8300
 Version:        0.17.1
-Release:        1%{?prever:.%{prever}}%{?dist}
+Release:        2%{?prever:.%{prever}}%{?dist}
 Summary:        DXR3/Hollywood Plus MPEG decoder card support tools
 
 Group:          Applications/System
@@ -16,9 +16,10 @@
 
 BuildRequires:  gtk2-devel
 BuildRequires:  desktop-file-utils
+BuildRequires:  alsa-lib
 #Requires:       em8300-kmod >= %{version}
 Requires:       udev
-Requires:       %{_sysconfdir}/alsa/cards
+Requires:       alsa-lib
 Requires:       %{_sysconfdir}/security/console.perms.d
 Requires(pre):  shadow-utils
 Provides:       em8300-kmod-common = %{version}-%{release}
@@ -52,7 +53,7 @@
 
 
 %build
-%configure --disable-dependency-tracking --with-alsa-dir=%{_sysconfdir}/alsa
+%configure --disable-dependency-tracking
 make %{?_smp_mflags}
 
 
@@ -77,6 +78,18 @@
 mv $RPM_BUILD_ROOT%{_datadir}/em8300/microcode_extract.pl \
   $RPM_BUILD_ROOT%{_bindir}/em8300-mc_ex
 
+cat /dev/null > %{name}.files
+for alsadir in %{_datadir}/alsa %{_sysconfdir}/alsa ; do
+    if [ -f "$RPM_BUILD_ROOT$alsadir/cards/EM8300.conf" ] ; then
+        echo "$alsadir/cards/EM8300.conf" > %{name}.files
+        break
+    fi
+done
+if [ ! -s %{name}.files ] ; then
+    echo "ERROR: EM8300.conf not installed in expected location"
+    exit 1
+fi
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -100,12 +113,11 @@
 :
 
 
-%files
+%files -f %{name}.files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README* modules/README-modoptions
 %config(noreplace) %{_sysconfdir}/security/console.perms.d/*-%{name}.perms
 %config(noreplace) %{_sysconfdir}/udev/rules.d/*-%{name}.rules
-%config(noreplace) %{_sysconfdir}/alsa/cards/EM8300.conf
 %{_bindir}/em8300setup
 %{_mandir}/man1/em8300setup.1*
 
@@ -126,6 +138,9 @@
 
 
 %changelog
+* Sun Sep 14 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.17.1-2
+- Adapt to a couple of different alsa/cards dir locations.
+
 * Thu Aug 14 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.17.1-1
 - 0.17.1.