rpms/em8300/FC-6 .cvsignore, 1.4, 1.5 em8300.spec, 1.5, 1.6 sources, 1.4, 1.5

[Ville Skytta (scop)]

Author: scop

Update of /cvs/extras/rpms/em8300/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3754/FC-6

Modified Files:
	.cvsignore em8300.spec sources 
Log Message:
* Sun Nov 26 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.16.0-1
- 0.16.0.
- Drop X-Fedora category from desktop entries.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/em8300/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	16 Sep 2006 12:58:06 -0000	1.4
+++ .cvsignore	18 Dec 2006 21:06:33 -0000	1.5
@@ -1,2 +1 @@
-em8300-nofirmware-0.16.0-rc1.tar.bz2
-EM8300.conf
+em8300-nofirmware-0.16.0.tar.gz


Index: em8300.spec
===================================================================
RCS file: /cvs/extras/rpms/em8300/FC-6/em8300.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- em8300.spec	2 Oct 2006 18:36:30 -0000	1.5
+++ em8300.spec	18 Dec 2006 21:06:33 -0000	1.6
@@ -1,18 +1,14 @@
 Name:           em8300
 Version:        0.16.0
-Release:        0.3.rc1%{?dist}
+Release:        1%{?dist}
 Summary:        DXR3/Hollywood Plus MPEG decoder card support tools
 
 Group:          Applications/System
 License:        GPL
 URL:            http://dxr3.sourceforge.net/
-#Source0:        http://dl.sf.net/dxr3/%{name}-nofirmware-%{version}.tar.gz
-# http://dxr3.sourceforge.net/download/em8300-0.16.0-rc1.tar.gz
-# with modules/em8300.uc removed
-Source0:        %{name}-nofirmware-%{version}-rc1.tar.bz2
+Source0:        http://downloads.sourceforge.net/dxr3/%{name}-nofirmware-%{version}.tar.gz
 Source1:        %{name}.console.perms
 Source2:        http://cachalot.mine.nu/src/dxr3/em8300-README-modprobe.conf
-Source3:        http://dxr3.cvs.sourceforge.net/*checkout*/dxr3/em8300/modules/EM8300.conf
 Patch0:         http://cachalot.mine.nu/src/dxr3/em8300-adv7170-wss.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -47,16 +43,15 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}-rc1
+%setup -q
 %patch0
 install -pm 644 %{SOURCE2} README-modprobe.conf
-install -pm 644 %{SOURCE3} modules/EM8300.conf
 echo "Icon=redhat-sound_video" >> overlay/dxr3view.desktop
 sed -i -e 's/microcode_extract.pl/em8300-mc_ex/' scripts/microcode_extract.pl
 
 
 %build
-%configure --disable-dependency-tracking
+%configure --disable-dependency-tracking --with-alsa-dir=%{_sysconfdir}/alsa
 make %{?_smp_mflags}
 
 
@@ -66,19 +61,12 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 for f in */*.desktop ; do
-  desktop-file-install \
-    --vendor fedora \
-    --mode 644 \
-    --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-    --add-category X-Fedora \
-    $f
+  desktop-file-install --vendor=fedora --mode=644 \
+    --dir=$RPM_BUILD_ROOT%{_datadir}/applications $f
 done
 install -Dpm 644 dhc/dhc.xpm \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/dhc.xpm
 
-install -Dpm 644 modules/EM8300.conf \
-  $RPM_BUILD_ROOT%{_sysconfdir}/alsa/cards/EM8300.conf
-
 install -Dpm 644 modules/em8300-udev.rules \
   $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/60-%{name}.rules
 
@@ -129,6 +117,10 @@
 
 
 %changelog
+* Sun Nov 26 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.16.0-1
+- 0.16.0.
+- Drop X-Fedora category from desktop entries.
+
 * Mon Oct  2 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.16.0-0.3.rc1
 - Rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/em8300/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	16 Sep 2006 12:58:06 -0000	1.4
+++ sources	18 Dec 2006 21:06:33 -0000	1.5
@@ -1,2 +1 @@
-969ba9fd1aebea7ef6549ebdb0f5ef4d  em8300-nofirmware-0.16.0-rc1.tar.bz2
-b4936b2535abe48d2e8e866f63102b3c  EM8300.conf
+61a3405d31e260d9159d189f649e5d48  em8300-nofirmware-0.16.0.tar.gz