SPECS: em8300.spec - post-update cleanup - package firmware in pro...

[qboosh]

Author: qboosh                       Date: Sun Feb 19 13:27:51 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- post-update cleanup
- package firmware in proper place, moved (non-gtk) em8300setup to base
- -devel contains only header file (ioctl API for kernel module),
  libdxr3 has been killed
- init script needs fix (uses script that has been killed)

---- Files affected:
SPECS:
   em8300.spec (1.35 -> 1.36) 

---- Diffs:

================================================================
Index: SPECS/em8300.spec
diff -u SPECS/em8300.spec:1.35 SPECS/em8300.spec:1.36
--- SPECS/em8300.spec:1.35	Sun Feb 12 01:18:20 2006
+++ SPECS/em8300.spec	Sun Feb 19 14:27:46 2006
@@ -1,5 +1,7 @@
 # $Revision$, $Date$
 #
+# TODO: .init script calls em8300_microcode_upload, which has been killed
+#
 # Conditional build:
 %bcond_without	dist_kernel	# without distribution kernel
 %bcond_without	kernel		# don't build kernel modules
@@ -24,7 +26,6 @@
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	gtk+-devel >= 1.2.0
-BuildRequires:	libtool
 %endif
 %if %{with kernel} && %{with dist_kernel}
 BuildRequires:	kernel-headers 
@@ -50,17 +51,15 @@
 formatów video, które te programy rozpoznają.
 
 %package devel
-Summary:	Files required to develop programs using em8300
-Summary(pl):	Pliki potrzebne do tworzenia programów korzystających z em8300
+Summary:	Header file to communicate with em8300 Linux kernel modules
+Summary(pl):	Plik nagłówkowy do komunikacji z modułami jądra Linuksa em8300
 Group:		Development/Libraries
 
 %description devel
-Header files and additional scripts useful for developers of em8300
-apps.
+Header file to communicate with em8300 Linux kernel modules.
 
 %description devel -l pl
-Pliki nagłówkowe i skrypty przydatne dla autorów aplikacji
-korzystających z em8300.
+Plik nagłówkowy do komunikacji z modułami jądra Linuksa em8300.
 
 %package gtk
 Summary:	Utility programs for em8300 using GTK+
@@ -106,7 +105,6 @@
 
 %build
 %if %{with userspace}
-%{__libtoolize}
 %{__aclocal} -I autotools
 %{__autoconf}
 %{__autoheader}
@@ -157,14 +155,8 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-mv -f modules/{INSTALL,INSTALL.modules}
-
-install -D modules/em8300.uc $RPM_BUILD_ROOT%{_datadir}/misc/em8300.uc
-
 install -D %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
 install -D %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
-
-rm -f $RPM_BUILD_ROOT%{_datadir}/em8300/{modules.tar.gz,em8300.sysv}
 %endif
 
 %if %{with kernel}
@@ -180,7 +172,7 @@
 done
 %endif
 %endif
-					
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -215,11 +207,13 @@
 %if %{with userspace}
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog README modules/{README*,INSTALL*,devices.sh}
-%{_datadir}/misc/em8300.uc
+%doc AUTHORS ChangeLog README modules/README*
+%attr(755,root,root) %{_bindir}/em8300setup
+/lib/firmware/em8300.bin
 %dir %{_datadir}/em8300
 %{_datadir}/em8300/em8300.pm
 %attr(755,root,root) %{_datadir}/em8300/*.pl
+%{_mandir}/man1/em8300setup.1*
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
 
@@ -232,7 +226,6 @@
 %attr(755,root,root) %{_bindir}/autocal
 %attr(755,root,root) %{_bindir}/dhc
 %attr(755,root,root) %{_bindir}/dxr3view
-%attr(755,root,root) %{_bindir}/em8300setup
 %endif
 
 %if %{with kernel}
@@ -240,10 +233,12 @@
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/kernel/drivers/video/*.ko*
 
+%if %{with dist_kernel} && %{with smp}
 %files -n kernel-smp-video-em8300
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}smp/kernel/drivers/video/*.ko*
 %endif
+%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -251,6 +246,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.36  2006/02/19 13:27:46  qboosh
+- post-update cleanup
+- package firmware in proper place, moved (non-gtk) em8300setup to base
+- -devel contains only header file (ioctl API for kernel module),
+  libdxr3 has been killed
+- init script needs fix (uses script that has been killed)
+
 Revision 1.35  2006/02/12 00:18:20  matowy
 - kill em8300_microcode_upload because segfaults
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/em8300.spec?r1=1.35&r2=1.36&f=u