[svn] r6349 - in branches/rpms/brian: . LBRC dkms-golden
dkms-linuxdvb dkms-openafs-kernel dkms-qc-usb dkms-sundance
dkms-truecrypt dkms-wis-go7007-linux dvb-apps libdvb novi
nozomi opencv player pybluez python-json stage thinkfinger
tsrpm vdr vdr-analogtv vdr-burn vdr-clock vdr-dvd vdr-femon
vdr-ffnetdev vdr-freecell vdr-mp3 vdr-osdteletext
vdr-reelchannelscan vdr-remote vdr-screenshot vdr-skinelchi
vdr-skinreel vdr-skins vdr-skinsoppalusikka vdr-softdevice
vdr-streamdev vdr-subtitles vdr-sudoku vdr-text2skin
vdr-timeline vdr-vdrrip vdr-wapd vdr-weather vdr-xine
vdradmin-am vdrsync xine xine-lib xournal
packagers at lists.rpmforge.net
packagers at lists.rpmforge.net
Tue Jun 10 01:04:09 CEST 2008
Author: bschueler
Date: 2008-06-10 00:04:09 +0100 (Tue, 10 Jun 2008)
New Revision: 6349
Added:
branches/rpms/brian/LBRC/
branches/rpms/brian/LBRC/lbrc.spec
branches/rpms/brian/dkms-golden/
branches/rpms/brian/dkms-golden/dkms-golden.spec
branches/rpms/brian/dkms-linuxdvb/
branches/rpms/brian/dkms-linuxdvb/dkms-linuxdvb.spec
branches/rpms/brian/dkms-openafs-kernel/
branches/rpms/brian/dkms-openafs-kernel/dkms-openafs-kernel.spec
branches/rpms/brian/dkms-qc-usb/
branches/rpms/brian/dkms-qc-usb/dkms-qc-usb.spec
branches/rpms/brian/dkms-sundance/
branches/rpms/brian/dkms-sundance/dkms-sundance.spec
branches/rpms/brian/dkms-truecrypt/
branches/rpms/brian/dkms-truecrypt/dkms-truecrypt.spec
branches/rpms/brian/dkms-truecrypt/dm.h.patch
branches/rpms/brian/dkms-truecrypt/truecrypt-4.3b-kernel-2.6.23.patch
branches/rpms/brian/dkms-wis-go7007-linux/
branches/rpms/brian/dkms-wis-go7007-linux/go7007-update.patch
branches/rpms/brian/dkms-wis-go7007-linux/wis-go7007-linux-0.9.8-makefile.patch
branches/rpms/brian/dkms-wis-go7007-linux/wis-go7007-linux.spec
branches/rpms/brian/dkms-wis-go7007-linux/wis-go7007_0.9.8_2.6.21.patch
branches/rpms/brian/dvb-apps/
branches/rpms/brian/dvb-apps/COPYING
branches/rpms/brian/dvb-apps/dvb-apps-optflags.patch
branches/rpms/brian/dvb-apps/dvb-apps-paths.patch
branches/rpms/brian/dvb-apps/dvb-apps-tuningfiles-snapshot.sh
branches/rpms/brian/dvb-apps/dvb-apps.spec
branches/rpms/brian/libdvb/
branches/rpms/brian/libdvb/errno.patch
branches/rpms/brian/libdvb/libdvb-0.5.5-gentoo.patch
branches/rpms/brian/libdvb/libdvb.spec
branches/rpms/brian/novi/
branches/rpms/brian/novi/novi.spec
branches/rpms/brian/nozomi/
branches/rpms/brian/nozomi/chap-secrets
branches/rpms/brian/nozomi/ifcfg-umts
branches/rpms/brian/nozomi/nozomi.spec
branches/rpms/brian/nozomi/umts
branches/rpms/brian/nozomi/umts-interface
branches/rpms/brian/nozomi/wvdial-umts.conf
branches/rpms/brian/opencv/
branches/rpms/brian/opencv/opencv-1.0.0-autotools.diff
branches/rpms/brian/opencv/opencv-1.0.0-configure.in.diff
branches/rpms/brian/opencv/opencv-1.0.0-pythondir.diff
branches/rpms/brian/opencv/opencv-samples-Makefile
branches/rpms/brian/opencv/opencv.spec
branches/rpms/brian/player/
branches/rpms/brian/player/player-2.spec
branches/rpms/brian/pybluez/
branches/rpms/brian/pybluez/pybluez.spec
branches/rpms/brian/python-json/
branches/rpms/brian/python-json/python-json.spec
branches/rpms/brian/stage/
branches/rpms/brian/stage/stage-2.spec
branches/rpms/brian/thinkfinger/
branches/rpms/brian/thinkfinger/README.thinkfinger
branches/rpms/brian/thinkfinger/thinkfinger-0.3-birdir.patch
branches/rpms/brian/thinkfinger/thinkfinger.spec
branches/rpms/brian/tsrpm/
branches/rpms/brian/tsrpm/cygwin.tshint
branches/rpms/brian/tsrpm/tsrpm.spec
branches/rpms/brian/vdr-analogtv/
branches/rpms/brian/vdr-analogtv/cpu_accel.c.patch
branches/rpms/brian/vdr-analogtv/cpuinfo.c.patch
branches/rpms/brian/vdr-analogtv/player-analogtv.c.patch
branches/rpms/brian/vdr-analogtv/vdr-analogtv.spec
branches/rpms/brian/vdr-burn/
branches/rpms/brian/vdr-burn/vdr-burn-0.1.0-pre21-config.patch
branches/rpms/brian/vdr-burn/vdr-burn-0.1.0-pre21-finnish.patch
branches/rpms/brian/vdr-burn/vdr-burn-cvs-subpicture-id.diff.gz
branches/rpms/brian/vdr-burn/vdr-burn.conf
branches/rpms/brian/vdr-burn/vdr-burn.spec
branches/rpms/brian/vdr-clock/
branches/rpms/brian/vdr-clock/vdr-clock.spec
branches/rpms/brian/vdr-dvd/
branches/rpms/brian/vdr-dvd/vdr-dvd.conf
branches/rpms/brian/vdr-dvd/vdr-dvd.spec
branches/rpms/brian/vdr-femon/
branches/rpms/brian/vdr-femon/vdr-femon.conf
branches/rpms/brian/vdr-femon/vdr-femon.spec
branches/rpms/brian/vdr-ffnetdev/
branches/rpms/brian/vdr-ffnetdev/vdr-ffnetdev.conf
branches/rpms/brian/vdr-ffnetdev/vdr-ffnetdev.spec
branches/rpms/brian/vdr-freecell/
branches/rpms/brian/vdr-freecell/vdr-freecell.conf
branches/rpms/brian/vdr-freecell/vdr-freecell.spec
branches/rpms/brian/vdr-freecell/vdr-plugin-freecell_0.0.2-24.diff.gz
branches/rpms/brian/vdr-mp3/
branches/rpms/brian/vdr-mp3/vdr-mp3-0.9.15-lastdir.patch
branches/rpms/brian/vdr-mp3/vdr-mp3-mediasources.sh
branches/rpms/brian/vdr-mp3/vdr-mp3-mp3.conf
branches/rpms/brian/vdr-mp3/vdr-mp3-mplayer-minimal.sh
branches/rpms/brian/vdr-mp3/vdr-mp3-mplayer.conf
branches/rpms/brian/vdr-mp3/vdr-mp3-mplayer.sh-0.8.7-defaults.patch
branches/rpms/brian/vdr-mp3/vdr-mp3-mplayer.sh-0.8.7-lircrc.patch
branches/rpms/brian/vdr-mp3/vdr-mp3-mplayer.sh-framedrop.patch
branches/rpms/brian/vdr-mp3/vdr-mp3-mplayer.sh-identify.patch
branches/rpms/brian/vdr-mp3/vdr-mp3.spec
branches/rpms/brian/vdr-osdteletext/
branches/rpms/brian/vdr-osdteletext/vdr-osdteletext-0.5.1-i18n.patch
branches/rpms/brian/vdr-osdteletext/vdr-osdteletext.conf
branches/rpms/brian/vdr-osdteletext/vdr-osdteletext.spec
branches/rpms/brian/vdr-reelchannelscan/
branches/rpms/brian/vdr-reelchannelscan/04_reelchannelscan-0.3.0-configdir.dpatch
branches/rpms/brian/vdr-reelchannelscan/vdr-reelchannelscan.spec
branches/rpms/brian/vdr-remote/
branches/rpms/brian/vdr-remote/vdr-plugin-remote_0.3.8-2.ds.diff.gz
branches/rpms/brian/vdr-remote/vdr-remote.conf
branches/rpms/brian/vdr-remote/vdr-remote.spec
branches/rpms/brian/vdr-screenshot/
branches/rpms/brian/vdr-screenshot/vdr-screenshot.spec
branches/rpms/brian/vdr-skinelchi/
branches/rpms/brian/vdr-skinelchi/vdr-skinelchi.spec
branches/rpms/brian/vdr-skinreel/
branches/rpms/brian/vdr-skinreel/vdr-skinreel.spec
branches/rpms/brian/vdr-skins/
branches/rpms/brian/vdr-skins/sttng-blue.theme
branches/rpms/brian/vdr-skins/vdr-skins-aluminium-i18n.patch
branches/rpms/brian/vdr-skins/vdr-skins-egalsimple-i18n.patch
branches/rpms/brian/vdr-skins/vdr-skins-izegrey16-i18n.patch
branches/rpms/brian/vdr-skins/vdr-skins-prepare-tarballs.sh
branches/rpms/brian/vdr-skins/vdr-skins.spec
branches/rpms/brian/vdr-skinsoppalusikka/
branches/rpms/brian/vdr-skinsoppalusikka/vdr-skinsoppalusikka.spec
branches/rpms/brian/vdr-softdevice/
branches/rpms/brian/vdr-softdevice/vdr-softdevice.conf
branches/rpms/brian/vdr-softdevice/vdr-softdevice.spec
branches/rpms/brian/vdr-streamdev/
branches/rpms/brian/vdr-streamdev/vdr-streamdev.conf
branches/rpms/brian/vdr-streamdev/vdr-streamdev.spec
branches/rpms/brian/vdr-subtitles/
branches/rpms/brian/vdr-subtitles/vdr-plugin-subtitles_0.4.0-1.ds.diff.gz
branches/rpms/brian/vdr-subtitles/vdr-subtitles.conf
branches/rpms/brian/vdr-subtitles/vdr-subtitles.spec
branches/rpms/brian/vdr-sudoku/
branches/rpms/brian/vdr-sudoku/vdr-sudoku.conf
branches/rpms/brian/vdr-sudoku/vdr-sudoku.spec
branches/rpms/brian/vdr-text2skin/
branches/rpms/brian/vdr-text2skin/vdr-text2skin-1.1cvs-cvsfixes.patch
branches/rpms/brian/vdr-text2skin/vdr-text2skin-1.1cvs-freetype22.patch
branches/rpms/brian/vdr-text2skin/vdr-text2skin-1.1cvs-skindir.patch
branches/rpms/brian/vdr-text2skin/vdr-text2skin.conf
branches/rpms/brian/vdr-text2skin/vdr-text2skin.spec
branches/rpms/brian/vdr-timeline/
branches/rpms/brian/vdr-timeline/vdr-timeline.spec
branches/rpms/brian/vdr-vdrrip/
branches/rpms/brian/vdr-vdrrip/02_maketempdir.dpatch
branches/rpms/brian/vdr-vdrrip/03_greppid2.dpatch
branches/rpms/brian/vdr-vdrrip/05_fix-dvdparameter.dpatch
branches/rpms/brian/vdr-vdrrip/06_fix-ogm-ac3-vdrsync-dev.dpatch
branches/rpms/brian/vdr-vdrrip/07_preserve-queue-owner.dpatch
branches/rpms/brian/vdr-vdrrip/11_fix-identify-aspect.dpatch
branches/rpms/brian/vdr-vdrrip/91_vdrrip+dvd-0.3.0-1.3.7.dpatch
branches/rpms/brian/vdr-vdrrip/vdr-vdrrip.spec
branches/rpms/brian/vdr-vdrrip/vdrrip-0.3.0-paths.patch
branches/rpms/brian/vdr-vdrrip/vdrrip-0.3.0-queue-bg.patch
branches/rpms/brian/vdr-vdrrip/vdrrip-dvdnav2dvdread.patch
branches/rpms/brian/vdr-vdrrip/vdrrip-dvdread-inttypes.patch
branches/rpms/brian/vdr-vdrrip/vdrrip.init
branches/rpms/brian/vdr-vdrrip/vdrrip.sysconfig
branches/rpms/brian/vdr-vdrrip/vdrripsplit.sh
branches/rpms/brian/vdr-wapd/
branches/rpms/brian/vdr-wapd/vdr-wapd-0.8-1338i18n.patch
branches/rpms/brian/vdr-wapd/vdr-wapd-0.8-1341.patch
branches/rpms/brian/vdr-wapd/vdr-wapd-proxy.conf
branches/rpms/brian/vdr-wapd/vdr-wapd-wapaccess
branches/rpms/brian/vdr-wapd/vdr-wapd-waphosts
branches/rpms/brian/vdr-wapd/vdr-wapd.conf
branches/rpms/brian/vdr-wapd/vdr-wapd.spec
branches/rpms/brian/vdr-weather/
branches/rpms/brian/vdr-weather/vdr-weather.spec
branches/rpms/brian/vdr-weather/weather-02_vdr_1.3-fix.dpatch
branches/rpms/brian/vdr-weather/weather-03_g++4.1-fix.dpatch
branches/rpms/brian/vdr-weather/weather-04_ftp-location.dpatch
branches/rpms/brian/vdr-xine/
branches/rpms/brian/vdr-xine/vdr-xine.conf
branches/rpms/brian/vdr-xine/vdr-xine2.spec
branches/rpms/brian/vdr/
branches/rpms/brian/vdr/channelscan-vdr.patch
branches/rpms/brian/vdr/vdr-1.4.1-dumpable.patch
branches/rpms/brian/vdr/vdr-1.4.1-paths.patch
branches/rpms/brian/vdr/vdr-1.4.5-1.diff
branches/rpms/brian/vdr/vdr-1.4.5-2.diff
branches/rpms/brian/vdr/vdr-1.4.5-liemikuutio-1.13.diff.gz
branches/rpms/brian/vdr/vdr-README.package
branches/rpms/brian/vdr/vdr-channel+epg.patch
branches/rpms/brian/vdr/vdr-commands.conf
branches/rpms/brian/vdr/vdr-config.sh
branches/rpms/brian/vdr/vdr-reccmds.conf
branches/rpms/brian/vdr/vdr-runvdr.sh
branches/rpms/brian/vdr/vdr-shutdown.sh
branches/rpms/brian/vdr/vdr-skincurses.conf
branches/rpms/brian/vdr/vdr-sky.conf
branches/rpms/brian/vdr/vdr-timercmds.conf
branches/rpms/brian/vdr/vdr-udev.rules
branches/rpms/brian/vdr/vdr.consoleperms
branches/rpms/brian/vdr/vdr.init
branches/rpms/brian/vdr/vdr.spec
branches/rpms/brian/vdr/vdr.sysconfig
branches/rpms/brian/vdr/vdr_1.4.5-1.ds.diff.gz
branches/rpms/brian/vdradmin-am/
branches/rpms/brian/vdradmin-am/vdradmin-am-3.4.5a-proctitle.patch
branches/rpms/brian/vdradmin-am/vdradmin-am-3.5.3-config.patch
branches/rpms/brian/vdradmin-am/vdradmin-am-httpd.conf
branches/rpms/brian/vdradmin-am/vdradmin-am.init
branches/rpms/brian/vdradmin-am/vdradmin-am.rwtab
branches/rpms/brian/vdradmin-am/vdradmin-am.spec
branches/rpms/brian/vdrsync/
branches/rpms/brian/vdrsync/vdrsync-recpath.patch
branches/rpms/brian/vdrsync/vdrsync.spec
branches/rpms/brian/xine-lib/
branches/rpms/brian/xine-lib/xine-lib.patch
branches/rpms/brian/xine-lib/xine-lib.spec
branches/rpms/brian/xine/
branches/rpms/brian/xine/xine-ui.patch
branches/rpms/brian/xine/xine.spec
branches/rpms/brian/xournal/
branches/rpms/brian/xournal/x-xoj.desktop
branches/rpms/brian/xournal/xournal-configure.in-freetype.patch
branches/rpms/brian/xournal/xournal.desktop
branches/rpms/brian/xournal/xournal.spec
branches/rpms/brian/xournal/xournal.xml
Log:
Added specs for dkms, vdr and some other stuff. A lot of non-URL-sources to be fixed (until enough webspace is provided by my supplier). Initial version for pre-check in rpmforge-like build environment.
Added: branches/rpms/brian/LBRC/lbrc.spec
===================================================================
--- branches/rpms/brian/LBRC/lbrc.spec (rev 0)
+++ branches/rpms/brian/LBRC/lbrc.spec 2008-06-09 23:04:09 UTC (rev 6349)
@@ -0,0 +1,63 @@
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
+Name: LBRC
+Version: 0.4
+Release: 1%{?dist}
+Summary: Linux Bluetooth Remote Control (LBRC)
+
+Group: Applications/System
+License: GPL
+URL: http://lbrc.berlios.de/
+Source0: http://download.berlios.de/lbrc/%{name}-%{version}.tgz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildArch: noarch
+BuildRequires: python-devel
+Requires: pygobject2, pybluez
+Requires: python-json, dbus-python
+Requires: notify-python, gnome-python2-extras
+
+%description
+LBRC allows you to control you Linux Computer with a Java capable phone.
+
+Linux Bluetooth Remote Control (LBRC) is a remote control program that
+allows a Linux computer to be controlled by a J2ME device via Bluetooth.
+It is divided into a server part that runs on the computer and reacts
+to input events and a client part that runs on the J2ME device.
+The J2ME client sends the device's keycodes, which are translated
+to keystrokes, mouse movements, mouse clicks, or other input events
+on the controlled computer.
+
+%prep
+%setup -q
+
+
+%build
+python setup.py build
+
+%install
+rm -rf $RPM_BUILD_ROOT
+python setup.py install --skip-build --root $RPM_BUILD_ROOT
+
+rm -rf $RPM_BUILD_ROOT%{_docdir}/python-lbrc
+
+%find_lang %{name}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%files -f %{name}.lang
+%defattr(-,root,root,-)
+%doc doc/* README CHANGELOG
+%{_bindir}/*
+/usr/lib/debug/usr/bin/uinputbridge.debug
+%{_datadir}/lbrc
+%{_datadir}/dbus-1/services/%{name}dbus.service
+%{python_sitelib}/%{name}
+%{python_sitelib}/%{name}_gtk_gui
+
+%changelog
+* Mon May 14 2007 Xavier Lamien < lxtnow[at]gmail.com > - 0.4-1
+- Initial RPM Release.
+
Added: branches/rpms/brian/dkms-golden/dkms-golden.spec
===================================================================
--- branches/rpms/brian/dkms-golden/dkms-golden.spec (rev 0)
+++ branches/rpms/brian/dkms-golden/dkms-golden.spec 2008-06-09 23:04:09 UTC (rev 6349)
@@ -0,0 +1,64 @@
+%define module_name golden
+%define version 1.08
+
+Name: dkms-%{module_name}
+Version: %version
+Release: 1.omb%{?dist}
+Summary: DKMS-ready driver for SUNIX Serial Universal PCI 4037T
+License: GPL
+Source: %{module_name}-%{version}.tar.gz
+Group: Development/Kernel
+Requires(pre): dkms
+Requires(post): dkms
+BuildRequires: ncurses-devel
+BuildArch: noarch
+Buildroot: %{_tmppath}/%{name}-%{version}-root
+Obsoletes: %{module_name}-dkms
+Provides: %{module_name}-dkms
+
+%description
+This driver kit contains Linux drivers for the SUNIX Golden I/O Serial
+Universal PCI Card 4037T.
+
+%prep
+%setup -q -n %{module_name}-%{version}
+
+
+%build
+# empty. dkms makes and installs
+
+%install
+rm -rf %{buildroot}
+mkdir -p %{buildroot}%{_usrsrc}/%{module_name}-%{version}-%{release}
+cp -rf * %{buildroot}/usr/src/%{module_name}-%{version}-%{release}
+make clean
+%{__cat} > %{buildroot}%{_usrsrc}/%{module_name}-%{version}-%{release}/dkms.conf << 'EOF'
+# Items below here should not have to change with each driver version
+PACKAGE_NAME="%{module_name}"
+PACKAGE_VERSION="%{version}-%{release}"
+CLEAN="make clean"
+MAKE[0]="make"
+BUILT_MODULE_LOCATION[0]=driver # location of driver
+BUILT_MODULE_NAME[0]=snx_golden
+DEST_MODULE_LOCATION[0]=/kernel/drivers/char
+AUTOINSTALL="YES"
+EOF
+
+%post
+ dkms add -m %{module_name} -v %{version}-%{release} --rpm_safe_upgrade
+ dkms build -m %{module_name} -v %{version}-%{release} --rpm_safe_upgrade
+ dkms install -m %{module_name} -v %{version}-%{release} --rpm_safe_upgrade
+
+%preun
+ dkms remove -m %{module_name} -v %{version}-%{release} --rpm_safe_upgrade --all
+
+%clean
+rm -rf %{buildroot}
+
+%files
+%defattr(-,root,root)
+%{_usrsrc}/%{module_name}-%{version}-%{release}
+
+%changelog
+* Sat May 24 2008 omb
+initial version
Added: branches/rpms/brian/dkms-linuxdvb/dkms-linuxdvb.spec
===================================================================
--- branches/rpms/brian/dkms-linuxdvb/dkms-linuxdvb.spec (rev 0)
+++ branches/rpms/brian/dkms-linuxdvb/dkms-linuxdvb.spec 2008-06-09 23:04:09 UTC (rev 6349)
@@ -0,0 +1,95 @@
+Summary: Linux DVB kernel drivers
+Name: dkms-linuxdvb
+Version: 0.5.14
+Release: 2.bs%{?dist}
+License: GPL
+Group: System Environment/Kernel
+URL: http://www.linuxtv.org/
+Packager: Brian Schueler <brian.schueler at gmx.de>
+Vendor: LinuxTV, http://www.linuxtv.org
+
+Source: %{name}-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildArch: noarch
+Requires: gcc, make
+Requires(post): dkms
+Requires(preun): dkms
+Provides: linuxdvb = %{version}-%{release}
+
+%description
+linuxdvb is a set of linux DVB drivers from the official Linux TV project
+for receiving TV streams from terristrial, satellite and cable DVB
+(Digital Video Broadcast) equipment.
+
+
+
+%prep
+%setup
+
+
+%build
+
+%install
+%{__rm} -rf %{buildroot}
+
+%define dkms_name linuxdvb
+%define dkms_vers %{version}-%{release}
+%define quiet -q
+
+# Kernel module sources install for dkms
+%{__mkdir_p} %{buildroot}%{_usrsrc}/%{dkms_name}-%{dkms_vers}/
+%{__cp} -a linux-dvb %{buildroot}%{_usrsrc}/%{dkms_name}-%{dkms_vers}/
+
+# Configuration for dkms
+%{__cat} > %{buildroot}%{_usrsrc}/%{dkms_name}-%{dkms_vers}/dkms.conf << 'EOF'
+PACKAGE_NAME=%{dkms_name}
+PACKAGE_VERSION=%{dkms_vers}
+MAKE[0]="cd linux-dvb && make distclean && make && make install && /sbin/depmod -a"
+CLEAN="cd linux-dvb && make distclean"
+AUTOINSTALL=yes
+BUILT_MODULE_NAME[0]="dvb-ttpci"
+BUILT_MODULE_LOCATION[0]="linux-dvb/v4l"
+DEST_MODULE_NAME[0]="dvb-ttpci"
+DEST_MODULE_LOCATION[0]="/kernel/drivers/media/dvb/ttpci"
+EOF
+
+# Firmware installation
+%{__mkdir_p} %{buildroot}/lib/firmware/
+%{__cp} -a firmware/* %{buildroot}/lib/firmware/
+
+%clean
+%{__rm} -rf %{buildroot}
+
+
+%post
+# Add to DKMS registry
+dkms add -m %{dkms_name} -v %{dkms_vers} %{?quiet} || :
+# Rebuild and make available for the currenty running kernel
+dkms build -m %{dkms_name} -v %{dkms_vers} %{?quiet} || :
+dkms install -m %{dkms_name} -v %{dkms_vers} %{?quiet} --force || :
+
+%preun
+# Remove all versions from DKMS registry
+dkms remove -m %{dkms_name} -v %{dkms_vers} %{?quiet} --all || :
+
+
+%files
+%defattr(-, root, root, 0755)
+%{_usrsrc}/%{dkms_name}-%{dkms_vers}/
+/lib/firmware/
+
+
+%changelog
+* Wed Mar 12 2008 Brian Schueler 0.5.14-1
+- Hauppauge HVR4000 tuner switch without reloading driver
+
+* Mon Dec 10 2007 Brian Schueler 0.5.13-1
+- Updated to 2.5.13
+- Add support for Hauppauge HVR4000
+
+* Sat Sep 29 2007 Brian Schueler 0.5.12-1
+- Updated to 2.5.12
+
+* Mon May 28 2007 Brian Schueler 0.5.11-1
+- Initial RPM release.
+
Added: branches/rpms/brian/dkms-openafs-kernel/dkms-openafs-kernel.spec
===================================================================
--- branches/rpms/brian/dkms-openafs-kernel/dkms-openafs-kernel.spec (rev 0)
+++ branches/rpms/brian/dkms-openafs-kernel/dkms-openafs-kernel.spec 2008-06-09 23:04:09 UTC (rev 6349)
@@ -0,0 +1,78 @@
+
+Summary: OpenAFS Kernel Module
+Name: dkms-openafs-kernel
+Version: 1.4.4
+Release: bs
+License: IBM Public License
+Group: System Environment/Kernel
+URL: http://www.openafs.org
+Packager: Brian Schueler <brian.schueler at gmx.de>
+Vendor: BS Repository
+
+Source: openafs-kernel-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildArch: noarch
+Requires: gcc
+Requires(post): dkms
+Requires(preun): dkms
+
+%description
+OpenAFS filesystem kernel module for the machine to act as an AFS client with caching support
+
+
+%prep
+%setup -n openafs-kernel-%{version}
+
+
+%build
+
+
+%install
+%{__rm} -rf %{buildroot}
+
+%define dkms_name openafs-kernel
+%define dkms_vers %{version}-%{release}
+%define quiet -q
+
+# Kernel module sources install for dkms
+%{__mkdir_p} %{buildroot}%{_usrsrc}/%{dkms_name}-%{dkms_vers}/
+%{__cp} -a . %{buildroot}%{_usrsrc}/%{dkms_name}-%{dkms_vers}/.
+
+# Configuration for dkms
+%{__cat} > %{buildroot}%{_usrsrc}/%{dkms_name}-%{dkms_vers}/dkms.conf << 'EOF'
+MAKE[0]="cd src && make clean ; ./configure && make && cd src/libafs && rm -f MODLOAD && ln -s MODLOAD-`uname -r`* MODLOAD && cd ../../../"
+PACKAGE_NAME=%{dkms_name}
+PACKAGE_VERSION=%{dkms_vers}
+BUILT_MODULE_NAME[0]=openafs
+BUILT_MODULE_LOCATION[0]=src/src/libafs/MODLOAD
+DEST_MODULE_LOCATION[0]=/kernel/fs/openafs
+AUTOINSTALL="YES"
+EOF
+
+
+%clean
+%{__rm} -rf %{buildroot}
+
+
+%post
+# Add to DKMS registry
+dkms add -m %{dkms_name} -v %{dkms_vers} %{?quiet} || :
+# Rebuild and make available for the currenty running kernel
+dkms build -m %{dkms_name} -v %{dkms_vers} %{?quiet} || :
+dkms install -m %{dkms_name} -v %{dkms_vers} %{?quiet} --force || :
+
+%preun
+# Remove all versions from DKMS registry
+dkms remove -m %{dkms_name} -v %{dkms_vers} %{?quiet} --all || :
+
+
+%files
+%defattr(-, root, root, 0755)
+%doc README
+%{_usrsrc}/%{dkms_name}-%{dkms_vers}/
+
+
+%changelog
+* Tue Dec 11 2007 Brian Schueler <brian.schueler at gmx.de> 1.4.4
+- Initial RPM release.
+
Added: branches/rpms/brian/dkms-qc-usb/dkms-qc-usb.spec
===================================================================
--- branches/rpms/brian/dkms-qc-usb/dkms-qc-usb.spec (rev 0)
+++ branches/rpms/brian/dkms-qc-usb/dkms-qc-usb.spec 2008-06-09 23:04:09 UTC (rev 6349)
@@ -0,0 +1,78 @@
+%define module_name qc-usb
+%define version 0.6.6
+
+Name: dkms-%{module_name}
+Version: %version
+Release: 1.bs
+Summary: DKMS-ready driver for the QuickCam-compatible USB web cameras
+License: GPL
+Source: http://qce-ga.sourceforge.net/%{module_name}-%{version}.tar.gz
+Group: Development/Kernel
+Requires(pre): dkms
+Requires(post): dkms
+Buildroot: %{_tmppath}/%{name}-%{version}-root
+Buildarch: noarch
+Obsoletes: %{module_name}-dkms
+Provides: %{module_name}-dkms
+
+%description
+This package contains a DKMS-ready linux driver for the QuickCam Express
+and other QuickCam-related and QuickCam-compatible USB web cameras.
+
+The qc-usb driver is known to work with the following webcams:
+
+ * Dexxa Webcam
+ * Labtec Webcam (old model)
+ * LegoCam
+ * Logitech QuickCam Express (old model)
+ * Logitech QuickCam Notebook (some models)
+ * Logitech QuickCam Web
+
+Generally, any USB camera with a USB vendor ID of 0x46d and a USB product ID of
+0x840, 0x850, or 0x870 (so, 0x46d:0x840, for example), should work. You can see
+the USB ID using operating system utilities such as lsusb in Linux.
+
+%prep
+%setup -q -c -n %{module_name}-%{version}
+chmod -R go=u-w .
+
+%build
+
+%install
+rm -rf %{buildroot}
+mkdir -p %{buildroot}/usr/src/
+cp -rf * %{buildroot}/usr/src/%{module_name}-%{version}-%{release}
+cat > %{buildroot}/usr/src/%{module_name}-%{version}-%{release}/dkms.conf <<EOF
+
+PACKAGE_VERSION="%{version}-%{release}"
+
+# Items below here should not have to change with each driver version
+PACKAGE_NAME="%{module_name}"
+MAKE[0]="make quickcam.ko"
+CLEAN="make clean"
+BUILT_MODULE_NAME[0]="quickcam"
+DEST_MODULE_LOCATION[0]="/kernel/3rdparty/qc-usb/"
+DEST_MODULE_NAME[0]="quickcam"
+AUTOINSTALL=yes
+EOF
+
+%post
+ dkms add -m %{module_name} -v %{version}-%{release} --rpm_safe_upgrade
+ dkms build -m %{module_name} -v %{version}-%{release} --rpm_safe_upgrade
+ dkms install -m %{module_name} -v %{version}-%{release} --rpm_safe_upgrade
+
+%preun
+ dkms remove -m %{module_name} -v %{version}-%{release} --rpm_safe_upgrade --all
+
+%clean
+rm -rf %{buildroot}
+
+%files
+%defattr(-,root,root)
+/usr/src/%{module_name}-%{version}-%{release}
+
+%changelog
+* Thu Nov 15 2007 Brian Schueler <brian.schueler at gmx.de> rebuild for RHEL5/FC6
+* Tue Apr 17 2007 ocilent1 <ocilent1 at gmail dot com> 0.6.6-1pclos2007
+- Build for PCLinuxOS 2007
+
Added: branches/rpms/brian/dkms-sundance/dkms-sundance.spec
===================================================================
--- branches/rpms/brian/dkms-sundance/dkms-sundance.spec (rev 0)
+++ branches/rpms/brian/dkms-sundance/dkms-sundance.spec 2008-06-09 23:04:09 UTC (rev 6349)
@@ -0,0 +1,79 @@
+
+Summary: Driver for D-Link DFE-580TX 4-Port Ethernet controllers
+Name: dkms-sundance
+Version: 0.1
+Release: 0.bs%{?dist}
+License: GPL
+Group: System Environment/Kernel
+URL: http://www.d-link.de/
+Packager: Brian Schueler <brian.schueler at gmx.de>
+Vendor: Dag Apt Repository, http://dag.wieers.com/apt/
+
+#Source: ftp://ftp.dlink.de/dfe/dfe-580tx/driver_software/DFE-580tx_drv_revALL_linux24_ALL_en_021107.zip
+Source: sundance-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildArch: noarch
+Requires: gcc
+Requires(post): dkms
+Requires(preun): dkms
+
+%description
+Driver (Linux kernel module) for D-Link DFE-580TX 4-Port Ethernet controllers.
+
+
+%prep
+%setup -n sundance-%{version}
+
+
+%build
+
+
+%install
+%{__rm} -rf %{buildroot}
+
+%define dkms_name sundance
+%define dkms_vers %{version}-%{release}
+%define quiet -q
+
+# Kernel module sources install for dkms
+%{__mkdir_p} %{buildroot}%{_usrsrc}/%{dkms_name}-%{dkms_vers}/
+%{__cp} -a 2.[46] Makefile %{buildroot}%{_usrsrc}/%{dkms_name}-%{dkms_vers}/
+
+# Configuration for dkms
+%{__cat} > %{buildroot}%{_usrsrc}/%{dkms_name}-%{dkms_vers}/dkms.conf << 'EOF'
+MAKE[0]="make dkms"
+PACKAGE_NAME=%{dkms_name}
+PACKAGE_VERSION=%{dkms_vers}
+BUILT_MODULE_NAME[0]=%{dkms_name}
+BUILT_MODULE_LOCATION[0]=build
+DEST_MODULE_LOCATION[0]=/kernel/drivers/net
+AUTOINSTALL="YES"
+EOF
+
+
+%clean
+%{__rm} -rf %{buildroot}
+
+
+%post
+# Add to DKMS registry
+dkms add -m %{dkms_name} -v %{dkms_vers} %{?quiet} || :
+# Rebuild and make available for the currenty running kernel
+dkms build -m %{dkms_name} -v %{dkms_vers} %{?quiet} || :
+dkms install -m %{dkms_name} -v %{dkms_vers} %{?quiet} --force || :
+
+%preun
+# Remove all versions from DKMS registry
+dkms remove -m %{dkms_name} -v %{dkms_vers} %{?quiet} --all || :
+
+
+%files
+%defattr(-, root, root, 0755)
+%doc README
+%{_usrsrc}/%{dkms_name}-%{dkms_vers}/
+
+
+%changelog
+* Wed Aug 15 2007 Brian Schueler <brian.schueler at gmx.de> 0.0.1
+- Initial RPM release.
+
Added: branches/rpms/brian/dkms-truecrypt/dkms-truecrypt.spec
===================================================================
--- branches/rpms/brian/dkms-truecrypt/dkms-truecrypt.spec (rev 0)
+++ branches/rpms/brian/dkms-truecrypt/dkms-truecrypt.spec 2008-06-09 23:04:09 UTC (rev 6349)
@@ -0,0 +1,95 @@
+%define dkms_name truecrypt
+%define dkms_vers %{version}-%{release}
+%define quiet -q
+
+Summary: Free open-source disk encryption software
+Name: dkms-truecrypt
+Version: 4.3b
+Release: 3.am%{?dist}
+License: GPLv2
+Group: System Environment/Kernel
+URL: http://www.truecrypt.org/
+Source: truecrypt-%{version}-source-code.tar.gz
+Patch1: dm.h.patch
+Patch2: truecrypt-%{version}-kernel-2.6.23.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Requires: gcc, make
+Requires(post): dkms
+Requires(preun): dkms
+Provides: truecrypt = %{version}-%{release}
+ExclusiveArch: i386 x86_64
+
+%description
+Manages encrypted TrueCrypt volumes, which can be mapped as virtual block
+devices and used as any other standard block device. All data being read from
+a mapped TrueCrypt volume is transparently decrypted and all data
+being written to it is transparently encrypted.
+
+%prep
+%setup -n truecrypt-%{version}-source-code
+%patch1 -p1
+%patch2 -p1
+mkdir dkms
+cp -a Common Crypto Linux dkms
+
+%build
+cd Linux/Cli
+%{__make} NO_WARNINGS=1
+cd ../../
+
+%install
+%{__rm} -rf %{buildroot}
+
+%{__install} -D -m 0755 Linux/Cli/truecrypt %{buildroot}%{_bindir}/truecrypt
+%{__install} -D -m 0644 Linux/Cli/Man/truecrypt.1 %{buildroot}%{_mandir}/man1/truecrypt.1
+
+# Kernel module sources install for dkms
+%{__mkdir_p} %{buildroot}%{_usrsrc}/%{dkms_name}-%{dkms_vers}/
+%{__cp} -a dkms/* %{buildroot}%{_usrsrc}/%{dkms_name}-%{dkms_vers}/
+
+# Configuration for dkms
+%{__cat} > %{buildroot}%{_usrsrc}/%{dkms_name}-%{dkms_vers}/dkms.conf << 'EOF'
+PACKAGE_NAME=%{dkms_name}
+PACKAGE_VERSION=%{dkms_vers}
+MAKE[0]="cd Linux/Kernel ; make KERNEL_SRC=${kernel_source_dir}"
+CLEAN[0]="cd Linux/Kernel ; make clean KERNEL_SRC=${kernel_source_dir}"
+BUILT_MODULE_NAME[0]=truecrypt
+BUILT_MODULE_LOCATION[0]="Linux/Kernel"
+DEST_MODULE_LOCATION[0]=/kernel/extra/truecrypt
+AUTOINSTALL="YES"
+EOF
+
+%clean
+%{__rm} -rf %{buildroot}
+
+
+%post
+# Add to DKMS registry
+dkms add -m %{dkms_name} -v %{dkms_vers} %{?quiet} || :
+# Rebuild and make available for the currenty running kernel
+dkms build -m %{dkms_name} -v %{dkms_vers} %{?quiet} || :
+dkms install -m %{dkms_name} -v %{dkms_vers} %{?quiet} --force || :
+
+
+%preun
+# Remove all versions from DKMS registry
+dkms remove -m %{dkms_name} -v %{dkms_vers} %{?quiet} --all || :
+
+
+%files
+%defattr(-,root,root,-)
+%doc License.txt Readme.txt
+%{_usrsrc}/%{dkms_name}-%{dkms_vers}/
+%{_bindir}/truecrypt
+%{_mandir}/man1/truecrypt.1*
+
+
+%changelog
+* Fri Nov 30 2007 Adam Miller <kirov.sama at gmail.com> 4.3a-3
+- Fix inclusion of binaries in dkms source
+
+* Fri Nov 30 2007 Adam Miller <kirov.sama at gmail.com> 4.3a-2
+- Narrow the parts of truecrypt source dkms needs
+
+* Thu Nov 29 2007 Adam Miller <kirov.sama at gmail.com> 4.3a-1
+- Initial spec
Added: branches/rpms/brian/dkms-truecrypt/dm.h.patch
===================================================================
--- branches/rpms/brian/dkms-truecrypt/dm.h.patch (rev 0)
+++ branches/rpms/brian/dkms-truecrypt/dm.h.patch 2008-06-09 23:04:09 UTC (rev 6349)
@@ -0,0 +1,134 @@
+diff -Naur truecrypt-4.3b-orig/Common/dm.h truecrypt-4.3b-new/Common/dm.h
+--- truecrypt-4.3b-orig/Common/dm.h 1969-12-31 16:00:00.000000000 -0800
++++ truecrypt-4.3b-new/Common/dm.h 2007-11-29 21:37:34.000000000 -0800
+@@ -0,0 +1,130 @@
++/*
++ * Internal header file for device mapper
++ *
++ * Copyright (C) 2001, 2002 Sistina Software
++ * Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved.
++ *
++ * This file is released under the LGPL.
++ */
++
++#ifndef DM_INTERNAL_H
++#define DM_INTERNAL_H
++
++#include <linux/fs.h>
++#include <linux/device-mapper.h>
++#include <linux/list.h>
++#include <linux/blkdev.h>
++#include <linux/hdreg.h>
++
++#define DM_NAME "device-mapper"
++
++#define DMERR(f, arg...) printk(KERN_ERR DM_NAME ": " DM_MSG_PREFIX ": " f "\n", ## arg)
++#define DMWARN(f, arg...) printk(KERN_WARNING DM_NAME ": " DM_MSG_PREFIX ": " f "\n", ## arg)
++#define DMINFO(f, arg...) printk(KERN_INFO DM_NAME ": " DM_MSG_PREFIX ": " f "\n", ## arg)
++
++#define DMEMIT(x...) sz += ((sz >= maxlen) ? \
++ 0 : scnprintf(result + sz, maxlen - sz, x))
++
++#define SECTOR_SHIFT 9
++
++/*
++ * List of devices that a metadevice uses and should open/close.
++ */
++struct dm_dev {
++ struct list_head list;
++
++ atomic_t count;
++ int mode;
++ struct block_device *bdev;
++ char name[16];
++};
++
++struct dm_table;
++
++/*-----------------------------------------------------------------
++ * Internal table functions.
++ *---------------------------------------------------------------*/
++void dm_table_event_callback(struct dm_table *t,
++ void (*fn)(void *), void *context);
++struct dm_target *dm_table_get_target(struct dm_table *t, unsigned int index);
++struct dm_target *dm_table_find_target(struct dm_table *t, sector_t sector);
++void dm_table_set_restrictions(struct dm_table *t, struct request_queue *q);
++struct list_head *dm_table_get_devices(struct dm_table *t);
++void dm_table_presuspend_targets(struct dm_table *t);
++void dm_table_postsuspend_targets(struct dm_table *t);
++void dm_table_resume_targets(struct dm_table *t);
++int dm_table_any_congested(struct dm_table *t, int bdi_bits);
++void dm_table_unplug_all(struct dm_table *t);
++int dm_table_flush_all(struct dm_table *t);
++
++/*-----------------------------------------------------------------
++ * A registry of target types.
++ *---------------------------------------------------------------*/
++int dm_target_init(void);
++void dm_target_exit(void);
++struct target_type *dm_get_target_type(const char *name);
++void dm_put_target_type(struct target_type *t);
++int dm_target_iterate(void (*iter_func)(struct target_type *tt,
++ void *param), void *param);
++
++/*-----------------------------------------------------------------
++ * Useful inlines.
++ *---------------------------------------------------------------*/
++static inline int array_too_big(unsigned long fixed, unsigned long obj,
++ unsigned long num)
++{
++ return (num > (ULONG_MAX - fixed) / obj);
++}
++
++/*
++ * Ceiling(n / sz)
++ */
++#define dm_div_up(n, sz) (((n) + (sz) - 1) / (sz))
++
++#define dm_sector_div_up(n, sz) ( \
++{ \
++ sector_t _r = ((n) + (sz) - 1); \
++ sector_div(_r, (sz)); \
++ _r; \
++} \
++)
++
++/*
++ * ceiling(n / size) * size
++ */
++#define dm_round_up(n, sz) (dm_div_up((n), (sz)) * (sz))
++
++static inline sector_t to_sector(unsigned long n)
++{
++ return (n >> 9);
++}
++
++static inline unsigned long to_bytes(sector_t n)
++{
++ return (n << 9);
++}
++
++int dm_split_args(int *argc, char ***argvp, char *input);
++
++/*
++ * The device-mapper can be driven through one of two interfaces;
++ * ioctl or filesystem, depending which patch you have applied.
++ */
++int dm_interface_init(void);
++void dm_interface_exit(void);
++
++/*
++ * Targets for linear and striped mappings
++ */
++int dm_linear_init(void);
++void dm_linear_exit(void);
++
++int dm_stripe_init(void);
++void dm_stripe_exit(void);
++
++void *dm_vcalloc(unsigned long nmemb, unsigned long elem_size);
++union map_info *dm_get_mapinfo(struct bio *bio);
++int dm_open_count(struct mapped_device *md);
++int dm_lock_for_deletion(struct mapped_device *md);
++
++#endif
Added: branches/rpms/brian/dkms-truecrypt/truecrypt-4.3b-kernel-2.6.23.patch
===================================================================
--- branches/rpms/brian/dkms-truecrypt/truecrypt-4.3b-kernel-2.6.23.patch (rev 0)
+++ branches/rpms/brian/dkms-truecrypt/truecrypt-4.3b-kernel-2.6.23.patch 2008-06-09 23:04:09 UTC (rev 6349)
@@ -0,0 +1,15 @@
+diff -up ./Linux/Kernel/Dm-target.c.lfarkas ./Linux/Kernel/Dm-target.c
+--- ./Linux/Kernel/Dm-target.c.lfarkas 2007-10-31 23:05:41.000000000 +0100
++++ ./Linux/Kernel/Dm-target.c 2007-10-31 23:07:33.000000000 +0100
+@@ -656,7 +656,11 @@ int __init dm_truecrypt_init(void)
+ goto err;
+ }
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
+ bio_ctx_cache = kmem_cache_create ("truecrypt-bioctx", sizeof (struct bio_ctx), 0, 0, NULL, NULL);
++#else
++ bio_ctx_cache = kmem_cache_create ("truecrypt-bioctx", sizeof (struct bio_ctx), 0, 0, NULL);
++#endif
+ if (!bio_ctx_cache)
+ {
+ error ("kmem_cache_create failed");
Added: branches/rpms/brian/dkms-wis-go7007-linux/go7007-update.patch
===================================================================
--- branches/rpms/brian/dkms-wis-go7007-linux/go7007-update.patch (rev 0)
+++ branches/rpms/brian/dkms-wis-go7007-linux/go7007-update.patch 2008-06-09 23:04:09 UTC (rev 6349)
@@ -0,0 +1,273 @@
+Only in wis-go7007-linux-0.9.8-new/apps: gorecord
+Only in wis-go7007-linux-0.9.8-new/apps: modet
+Only in wis-go7007-linux-0.9.8-new/hotplug: wis-ezusb
+diff -ru wis-go7007-linux-0.9.8/kernel/go7007-driver.c wis-go7007-linux-0.9.8-new/kernel/go7007-driver.c
+--- wis-go7007-linux-0.9.8/kernel/go7007-driver.c 2006-04-02 00:35:48.000000000 +0200
++++ wis-go7007-linux-0.9.8-new/kernel/go7007-driver.c 2006-08-19 10:55:47.000000000 +0200
+@@ -18,7 +18,9 @@
+ #include <linux/module.h>
+ #include <linux/version.h>
+ #include <linux/init.h>
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+ #include <linux/config.h>
++#endif
+ #include <linux/delay.h>
+ #include <linux/sched.h>
+ #include <linux/spinlock.h>
+Only in wis-go7007-linux-0.9.8-new/kernel: go7007-driver.o
+Only in wis-go7007-linux-0.9.8-new/kernel: .go7007-driver.o.cmd
+diff -ru wis-go7007-linux-0.9.8/kernel/go7007-fw.c wis-go7007-linux-0.9.8-new/kernel/go7007-fw.c
+--- wis-go7007-linux-0.9.8/kernel/go7007-fw.c 2006-04-02 00:35:55.000000000 +0200
++++ wis-go7007-linux-0.9.8-new/kernel/go7007-fw.c 2006-08-19 11:01:51.000000000 +0200
+@@ -26,7 +26,10 @@
+
+ #include <linux/module.h>
+ #include <linux/init.h>
++#include <linux/version.h>
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+ #include <linux/config.h>
++#endif
+ #include <linux/time.h>
+ #include <linux/mm.h>
+ #include <linux/device.h>
+Only in wis-go7007-linux-0.9.8-new/kernel: go7007-fw.o
+Only in wis-go7007-linux-0.9.8-new/kernel: .go7007-fw.o.cmd
+diff -ru wis-go7007-linux-0.9.8/kernel/go7007-i2c.c wis-go7007-linux-0.9.8-new/kernel/go7007-i2c.c
+--- wis-go7007-linux-0.9.8/kernel/go7007-i2c.c 2006-04-02 00:36:00.000000000 +0200
++++ wis-go7007-linux-0.9.8-new/kernel/go7007-i2c.c 2006-08-19 11:01:28.000000000 +0200
+@@ -15,9 +15,11 @@
+ * Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
+ */
+
++#include <linux/version.h>
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+ #include <linux/config.h>
++#endif
+ #include <linux/module.h>
+-#include <linux/version.h>
+ #include <linux/init.h>
+ #include <linux/delay.h>
+ #include <linux/sched.h>
+Only in wis-go7007-linux-0.9.8-new/kernel: go7007-i2c.o
+Only in wis-go7007-linux-0.9.8-new/kernel: .go7007-i2c.o.cmd
+Only in wis-go7007-linux-0.9.8-new/kernel: go7007.ko
+Only in wis-go7007-linux-0.9.8-new/kernel: .go7007.ko.cmd
+Only in wis-go7007-linux-0.9.8-new/kernel: go7007.mod.c
+Only in wis-go7007-linux-0.9.8-new/kernel: go7007.mod.o
+Only in wis-go7007-linux-0.9.8-new/kernel: .go7007.mod.o.cmd
+Only in wis-go7007-linux-0.9.8-new/kernel: go7007.o
+Only in wis-go7007-linux-0.9.8-new/kernel: .go7007.o.cmd
+diff -ru wis-go7007-linux-0.9.8/kernel/go7007-usb.c wis-go7007-linux-0.9.8-new/kernel/go7007-usb.c
+--- wis-go7007-linux-0.9.8/kernel/go7007-usb.c 2006-04-02 00:57:04.000000000 +0200
++++ wis-go7007-linux-0.9.8-new/kernel/go7007-usb.c 2006-04-03 12:58:44.000000000 +0200
+@@ -27,7 +27,7 @@
+ #include <linux/usb.h>
+ #include <linux/i2c.h>
+ #include <asm/byteorder.h>
+-#include <media/audiochip.h>
++#include <media/tvaudio.h>
+
+ #include "go7007-priv.h"
+ #include "wis-i2c.h"
+@@ -225,17 +225,17 @@
+ .inputs = {
+ {
+ .video_input = 1,
+- .audio_input = AUDIO_EXTERN,
++ .audio_input = TVAUDIO_INPUT_EXTERN,
+ .name = "Composite",
+ },
+ {
+ .video_input = 8,
+- .audio_input = AUDIO_EXTERN,
++ .audio_input = TVAUDIO_INPUT_EXTERN,
+ .name = "S-Video",
+ },
+ {
+ .video_input = 3,
+- .audio_input = AUDIO_TUNER,
++ .audio_input = TVAUDIO_INPUT_TUNER,
+ .name = "Tuner",
+ },
+ },
+Only in wis-go7007-linux-0.9.8-new/kernel: go7007-usb.ko
+Only in wis-go7007-linux-0.9.8-new/kernel: .go7007-usb.ko.cmd
+Only in wis-go7007-linux-0.9.8-new/kernel: go7007-usb.mod.c
+Only in wis-go7007-linux-0.9.8-new/kernel: go7007-usb.mod.o
+Only in wis-go7007-linux-0.9.8-new/kernel: .go7007-usb.mod.o.cmd
+Only in wis-go7007-linux-0.9.8-new/kernel: go7007-usb.o
+Only in wis-go7007-linux-0.9.8-new/kernel: .go7007-usb.o.cmd
+diff -ru wis-go7007-linux-0.9.8/kernel/go7007-v4l2.c wis-go7007-linux-0.9.8-new/kernel/go7007-v4l2.c
+--- wis-go7007-linux-0.9.8/kernel/go7007-v4l2.c 2006-04-02 01:22:03.000000000 +0200
++++ wis-go7007-linux-0.9.8-new/kernel/go7007-v4l2.c 2006-08-19 11:01:14.000000000 +0200
+@@ -17,8 +17,10 @@
+
+ #include <linux/module.h>
+ #include <linux/init.h>
+-#include <linux/config.h>
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
++#include <linux/config.h>
++#endif
+ #include <linux/delay.h>
+ #include <linux/sched.h>
+ #include <linux/spinlock.h>
+@@ -939,7 +941,7 @@
+ if (go->i2c_adapter_online) {
+ i2c_clients_command(&go->i2c_adapter, DECODER_SET_INPUT,
+ &go->board_info->inputs[*input].video_input);
+- i2c_clients_command(&go->i2c_adapter, AUDC_SET_INPUT,
++ i2c_clients_command(&go->i2c_adapter, VIDIOC_S_AUDIO,
+ &go->board_info->inputs[*input].audio_input);
+ }
+ return 0;
+Only in wis-go7007-linux-0.9.8-new/kernel: go7007-v4l2.o
+Only in wis-go7007-linux-0.9.8-new/kernel: .go7007-v4l2.o.cmd
+Only in wis-go7007-linux-0.9.8-new/kernel: Modules.symvers
+Only in wis-go7007-linux-0.9.8-new/kernel: Module.symvers
+diff -ru wis-go7007-linux-0.9.8/kernel/snd-go7007.c wis-go7007-linux-0.9.8-new/kernel/snd-go7007.c
+--- wis-go7007-linux-0.9.8/kernel/snd-go7007.c 2006-04-02 00:36:38.000000000 +0200
++++ wis-go7007-linux-0.9.8-new/kernel/snd-go7007.c 2006-08-19 10:57:31.000000000 +0200
+@@ -20,7 +20,9 @@
+ #include <linux/version.h>
+ #include <linux/moduleparam.h>
+ #include <linux/init.h>
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17)
+ #include <linux/config.h>
++#endif
+ #include <linux/delay.h>
+ #include <linux/sched.h>
+ #include <linux/vmalloc.h>
+Only in wis-go7007-linux-0.9.8-new/kernel: snd-go7007.ko
+Only in wis-go7007-linux-0.9.8-new/kernel: .snd-go7007.ko.cmd
+Only in wis-go7007-linux-0.9.8-new/kernel: snd-go7007.mod.c
+Only in wis-go7007-linux-0.9.8-new/kernel: snd-go7007.mod.o
+Only in wis-go7007-linux-0.9.8-new/kernel: .snd-go7007.mod.o.cmd
+Only in wis-go7007-linux-0.9.8-new/kernel: snd-go7007.o
+Only in wis-go7007-linux-0.9.8-new/kernel: .snd-go7007.o.cmd
+Only in wis-go7007-linux-0.9.8-new/kernel: .tmp_versions
+Only in wis-go7007-linux-0.9.8-new/kernel: wis-ov7640.ko
+Only in wis-go7007-linux-0.9.8-new/kernel: .wis-ov7640.ko.cmd
+Only in wis-go7007-linux-0.9.8-new/kernel: wis-ov7640.mod.c
+Only in wis-go7007-linux-0.9.8-new/kernel: wis-ov7640.mod.o
+Only in wis-go7007-linux-0.9.8-new/kernel: .wis-ov7640.mod.o.cmd
+Only in wis-go7007-linux-0.9.8-new/kernel: wis-ov7640.o
+Only in wis-go7007-linux-0.9.8-new/kernel: .wis-ov7640.o.cmd
+diff -ru wis-go7007-linux-0.9.8/kernel/wis-saa7113.c wis-go7007-linux-0.9.8-new/kernel/wis-saa7113.c
+--- wis-go7007-linux-0.9.8/kernel/wis-saa7113.c 2006-04-02 00:37:06.000000000 +0200
++++ wis-go7007-linux-0.9.8-new/kernel/wis-saa7113.c 2006-08-19 11:03:04.000000000 +0200
+@@ -21,6 +21,7 @@
+ #include <linux/i2c.h>
+ #include <linux/videodev.h>
+ #include <linux/video_decoder.h>
++#include <linux/ioctl.h>
+
+ #include "wis-i2c.h"
+
+Only in wis-go7007-linux-0.9.8-new/kernel: wis-saa7113.ko
+Only in wis-go7007-linux-0.9.8-new/kernel: .wis-saa7113.ko.cmd
+Only in wis-go7007-linux-0.9.8-new/kernel: wis-saa7113.mod.c
+Only in wis-go7007-linux-0.9.8-new/kernel: wis-saa7113.mod.o
+Only in wis-go7007-linux-0.9.8-new/kernel: .wis-saa7113.mod.o.cmd
+Only in wis-go7007-linux-0.9.8-new/kernel: wis-saa7113.o
+Only in wis-go7007-linux-0.9.8-new/kernel: .wis-saa7113.o.cmd
+diff -ru wis-go7007-linux-0.9.8/kernel/wis-saa7115.c wis-go7007-linux-0.9.8-new/kernel/wis-saa7115.c
+--- wis-go7007-linux-0.9.8/kernel/wis-saa7115.c 2006-04-02 00:37:12.000000000 +0200
++++ wis-go7007-linux-0.9.8-new/kernel/wis-saa7115.c 2006-08-19 11:02:28.000000000 +0200
+@@ -21,6 +21,7 @@
+ #include <linux/i2c.h>
+ #include <linux/videodev.h>
+ #include <linux/video_decoder.h>
++#include <linux/ioctl.h>
+
+ #include "wis-i2c.h"
+
+Only in wis-go7007-linux-0.9.8-new/kernel: wis-saa7115.ko
+Only in wis-go7007-linux-0.9.8-new/kernel: .wis-saa7115.ko.cmd
+Only in wis-go7007-linux-0.9.8-new/kernel: wis-saa7115.mod.c
+Only in wis-go7007-linux-0.9.8-new/kernel: wis-saa7115.mod.o
+Only in wis-go7007-linux-0.9.8-new/kernel: .wis-saa7115.mod.o.cmd
+Only in wis-go7007-linux-0.9.8-new/kernel: wis-saa7115.o
+Only in wis-go7007-linux-0.9.8-new/kernel: .wis-saa7115.o.cmd
+Only in wis-go7007-linux-0.9.8-new/kernel: wis-sony-tuner.ko
+Only in wis-go7007-linux-0.9.8-new/kernel: .wis-sony-tuner.ko.cmd
+Only in wis-go7007-linux-0.9.8-new/kernel: wis-sony-tuner.mod.c
+Only in wis-go7007-linux-0.9.8-new/kernel: wis-sony-tuner.mod.o
+Only in wis-go7007-linux-0.9.8-new/kernel: .wis-sony-tuner.mod.o.cmd
+Only in wis-go7007-linux-0.9.8-new/kernel: wis-sony-tuner.o
+Only in wis-go7007-linux-0.9.8-new/kernel: .wis-sony-tuner.o.cmd
+diff -ru wis-go7007-linux-0.9.8/kernel/wis-tw2804.c wis-go7007-linux-0.9.8-new/kernel/wis-tw2804.c
+--- wis-go7007-linux-0.9.8/kernel/wis-tw2804.c 2006-04-02 00:37:22.000000000 +0200
++++ wis-go7007-linux-0.9.8-new/kernel/wis-tw2804.c 2006-08-19 11:02:43.000000000 +0200
+@@ -21,6 +21,7 @@
+ #include <linux/i2c.h>
+ #include <linux/videodev.h>
+ #include <linux/video_decoder.h>
++#include <linux/ioctl.h>
+
+ #include "wis-i2c.h"
+
+Only in wis-go7007-linux-0.9.8-new/kernel: wis-tw2804.ko
+Only in wis-go7007-linux-0.9.8-new/kernel: .wis-tw2804.ko.cmd
+Only in wis-go7007-linux-0.9.8-new/kernel: wis-tw2804.mod.c
+Only in wis-go7007-linux-0.9.8-new/kernel: wis-tw2804.mod.o
+Only in wis-go7007-linux-0.9.8-new/kernel: .wis-tw2804.mod.o.cmd
+Only in wis-go7007-linux-0.9.8-new/kernel: wis-tw2804.o
+Only in wis-go7007-linux-0.9.8-new/kernel: .wis-tw2804.o.cmd
+diff -ru wis-go7007-linux-0.9.8/kernel/wis-tw9903.c wis-go7007-linux-0.9.8-new/kernel/wis-tw9903.c
+--- wis-go7007-linux-0.9.8/kernel/wis-tw9903.c 2006-04-02 00:37:28.000000000 +0200
++++ wis-go7007-linux-0.9.8-new/kernel/wis-tw9903.c 2006-08-19 11:02:47.000000000 +0200
+@@ -21,6 +21,7 @@
+ #include <linux/i2c.h>
+ #include <linux/videodev.h>
+ #include <linux/video_decoder.h>
++#include <linux/ioctl.h>
+
+ #include "wis-i2c.h"
+
+Only in wis-go7007-linux-0.9.8-new/kernel: wis-tw9903.ko
+Only in wis-go7007-linux-0.9.8-new/kernel: .wis-tw9903.ko.cmd
+Only in wis-go7007-linux-0.9.8-new/kernel: wis-tw9903.mod.c
+Only in wis-go7007-linux-0.9.8-new/kernel: wis-tw9903.mod.o
+Only in wis-go7007-linux-0.9.8-new/kernel: .wis-tw9903.mod.o.cmd
+Only in wis-go7007-linux-0.9.8-new/kernel: wis-tw9903.o
+Only in wis-go7007-linux-0.9.8-new/kernel: .wis-tw9903.o.cmd
+diff -ru wis-go7007-linux-0.9.8/kernel/wis-uda1342.c wis-go7007-linux-0.9.8-new/kernel/wis-uda1342.c
+--- wis-go7007-linux-0.9.8/kernel/wis-uda1342.c 2006-04-02 00:37:32.000000000 +0200
++++ wis-go7007-linux-0.9.8-new/kernel/wis-uda1342.c 2006-04-03 13:07:04.000000000 +0200
+@@ -20,7 +20,7 @@
+ #include <linux/version.h>
+ #include <linux/i2c.h>
+ #include <linux/videodev.h>
+-#include <media/audiochip.h>
++#include <media/tvaudio.h>
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
+ #include <media/v4l2-common.h>
+ #endif
+@@ -38,15 +38,15 @@
+ unsigned int cmd, void *arg)
+ {
+ switch (cmd) {
+- case AUDC_SET_INPUT:
++ case VIDIOC_S_AUDIO:
+ {
+ int *inp = arg;
+
+ switch (*inp) {
+- case AUDIO_TUNER:
++ case TVAUDIO_INPUT_TUNER:
+ write_reg(client, 0x00, 0x1441); /* select input 2 */
+ break;
+- case AUDIO_EXTERN:
++ case TVAUDIO_INPUT_EXTERN:
+ write_reg(client, 0x00, 0x1241); /* select input 1 */
+ break;
+ default:
+Only in wis-go7007-linux-0.9.8-new/kernel: wis-uda1342.ko
+Only in wis-go7007-linux-0.9.8-new/kernel: .wis-uda1342.ko.cmd
+Only in wis-go7007-linux-0.9.8-new/kernel: wis-uda1342.mod.c
+Only in wis-go7007-linux-0.9.8-new/kernel: wis-uda1342.mod.o
+Only in wis-go7007-linux-0.9.8-new/kernel: .wis-uda1342.mod.o.cmd
+Only in wis-go7007-linux-0.9.8-new/kernel: wis-uda1342.o
+Only in wis-go7007-linux-0.9.8-new/kernel: .wis-uda1342.o.cmd
+Only in wis-go7007-linux-0.9.8-new/udev: wis-ezusb.rules
Added: branches/rpms/brian/dkms-wis-go7007-linux/wis-go7007-linux-0.9.8-makefile.patch
===================================================================
--- branches/rpms/brian/dkms-wis-go7007-linux/wis-go7007-linux-0.9.8-makefile.patch (rev 0)
+++ branches/rpms/brian/dkms-wis-go7007-linux/wis-go7007-linux-0.9.8-makefile.patch 2008-06-09 23:04:09 UTC (rev 6349)
@@ -0,0 +1,37 @@
+--- wis-go7007-linux-0.9.8/Makefile~ 2005-11-05 18:58:07.000000000 +0100
++++ wis-go7007-linux-0.9.8/Makefile 2006-04-04 00:47:27.000000000 +0200
+@@ -44,11 +44,15 @@
+ @false
+ endif
+
+-all:
++all: all_kmdl all_non_kmdl
++
++all_kmdl:
+ @echo
+ @echo '*****' Using kernel source in $(KSRC) '*****'
+ @echo
+ $(MAKE) modules -C $(KSRC) M=$(shell pwd)/kernel
++
++all_non_kmdl:
+ sed -e s/@FIRMWARE_DIR@/$(FIRMWARE_DIR_ESCAPED)/ \
+ -e s/@FXLOAD@/$(FXLOAD_ESCAPED)/ \
+ <hotplug/wis-ezusb.in >hotplug/wis-ezusb
+@@ -57,12 +61,16 @@
+ <udev/wis-ezusb.rules.in >udev/wis-ezusb.rules
+ $(MAKE) -C apps CFLAGS="-I$(KSRC)/include -I../include"
+
+-install:
++install: install_kmdl install_non_kmdl
++
++install_kmdl:
+ $(MAKE) modules_install INSTALL_MOD_PATH=$(DESTDIR) \
+ -C $(KSRC) M=$(shell pwd)/kernel
+ ifeq ($(SKIP_DEPMOD),)
+ /sbin/depmod -a
+ endif
++
++install_non_kmdl:
+ @echo
+ @echo "Installing include files into $(KSRC)/include/linux"
+ @echo
Added: branches/rpms/brian/dkms-wis-go7007-linux/wis-go7007-linux.spec
===================================================================
--- branches/rpms/brian/dkms-wis-go7007-linux/wis-go7007-linux.spec (rev 0)
+++ branches/rpms/brian/dkms-wis-go7007-linux/wis-go7007-linux.spec 2008-06-09 23:04:09 UTC (rev 6349)
@@ -0,0 +1,108 @@
+%define module_name wis-go7007-linux
+%define version 0.9.8
+
+Name: dkms-%{module_name}
+Version: %version
+Release: 1.bs%{?dist}
+Summary: DKMS-ready driver for WIS go7007 frame grabbers
+License: GPL
+Source: http://oss.wischip.com/%{module_name}-%{version}.tar.bz2
+Patch0: wis-go7007-linux-0.9.8-makefile.patch
+Patch1: http://bart.ulyssis.org/go7007-update.patch
+Patch2: wis-go7007_0.9.8_2.6.21.patch
+Group: Development/Kernel
+Requires(pre): dkms
+Requires(post): dkms
+#BuildArch: noarch
+Buildroot: %{_tmppath}/%{name}-%{version}-root
+Obsoletes: %{module_name}-dkms
+Provides: %{module_name}-dkms
+
+%description
+This driver kit contains Linux drivers for the WIS GO7007SB multi-format
+video encoder. Only kernel version 2.6.x is supported. The video stream
+is available through the Video4Linux2 API and the audio stream is available
+through the ALSA API (or the OSS emulation layer of the ALSA system).
+
+%prep
+%setup -q -n %{module_name}-%{version}
+#%patch1 -p1
+%patch0 -p1
+%patch2 -p1
+# too late in the game
+#perl -pi -e's,(-I\$\(shell pwd\)),-I%{_includedir}/v4l -I%{_includedir}/alsa-driver -H $1,' kernel/Makefile
+perl -pi -e's,(-I\$\(shell pwd\)),-H $1,' kernel/Makefile
+
+
+%build
+make
+
+%install
+rm -rf %{buildroot}
+mkdir -p %{buildroot}%{_usrsrc}/%{module_name}-%{version}-%{release}
+mkdir -p %{buildroot}/lib/firmware
+mkdir -p %{buildroot}/usr/bin
+cp -rvi firmware/* %{buildroot}/lib/firmware
+cp -rvi apps/gorecord apps/modet %{buildroot}/usr/bin/
+cp -rf * %{buildroot}/usr/src/%{module_name}-%{version}-%{release}
+make clean
+%{__cat} > %{buildroot}%{_usrsrc}/%{module_name}-%{version}-%{release}/dkms.conf << 'EOF'
+# Items below here should not have to change with each driver version
+PACKAGE_NAME="%{module_name}"
+PACKAGE_VERSION="%{version}-%{release}"
+CLEAN="make clean"
+MAKE[0]="make KERNELSRC=${kernel_source_dir}"
+BUILT_MODULE_LOCATION[0]=kernel
+BUILT_MODULE_LOCATION[1]=kernel
+BUILT_MODULE_LOCATION[2]=kernel
+BUILT_MODULE_LOCATION[3]=kernel
+BUILT_MODULE_LOCATION[4]=kernel
+BUILT_MODULE_LOCATION[5]=kernel
+BUILT_MODULE_LOCATION[6]=kernel
+BUILT_MODULE_LOCATION[7]=kernel
+BUILT_MODULE_LOCATION[8]=kernel
+BUILT_MODULE_LOCATION[9]=kernel
+BUILT_MODULE_NAME[0]=go7007
+BUILT_MODULE_NAME[1]=wis-saa7113
+BUILT_MODULE_NAME[2]=wis-tw9903
+BUILT_MODULE_NAME[3]=go7007-usb
+BUILT_MODULE_NAME[4]=wis-saa7115
+BUILT_MODULE_NAME[5]=wis-uda1342
+BUILT_MODULE_NAME[6]=snd-go7007
+BUILT_MODULE_NAME[7]=wis-sony-tuner
+BUILT_MODULE_NAME[8]=wis-ov7640
+BUILT_MODULE_NAME[9]=wis-tw2804
+DEST_MODULE_LOCATION[0]=/kernel/extra
+DEST_MODULE_LOCATION[1]=/kernel/extra
+DEST_MODULE_LOCATION[2]=/kernel/extra
+DEST_MODULE_LOCATION[3]=/kernel/extra
+DEST_MODULE_LOCATION[4]=/kernel/extra
+DEST_MODULE_LOCATION[5]=/kernel/extra
+DEST_MODULE_LOCATION[6]=/kernel/extra
+DEST_MODULE_LOCATION[7]=/kernel/extra
+DEST_MODULE_LOCATION[8]=/kernel/extra
+DEST_MODULE_LOCATION[9]=/kernel/extra
+AUTOINSTALL="YES"
+EOF
+
+%post
+ dkms add -m %{module_name} -v %{version}-%{release} --rpm_safe_upgrade
+ dkms build -m %{module_name} -v %{version}-%{release} --rpm_safe_upgrade
+ dkms install -m %{module_name} -v %{version}-%{release} --rpm_safe_upgrade
+
+%preun
+ dkms remove -m %{module_name} -v %{version}-%{release} --rpm_safe_upgrade --all
+
+%clean
+rm -rf %{buildroot}
+
+%files
+%defattr(-,root,root)
+%{_usrsrc}/%{module_name}-%{version}-%{release}
+/lib/firmware
+%{_bindir}
+
+%changelog
+* Fri May 2 2008 Brian Schueler <brian.schueler at gmx.de>
+initial version
+
Added: branches/rpms/brian/dkms-wis-go7007-linux/wis-go7007_0.9.8_2.6.21.patch
===================================================================
--- branches/rpms/brian/dkms-wis-go7007-linux/wis-go7007_0.9.8_2.6.21.patch (rev 0)
+++ branches/rpms/brian/dkms-wis-go7007-linux/wis-go7007_0.9.8_2.6.21.patch 2008-06-09 23:04:09 UTC (rev 6349)
@@ -0,0 +1,773 @@
+diff -ur wis-go7007-linux-0.9.8/kernel/go7007-driver.c wis-go7007-linux-0.9.8-new/kernel/go7007-driver.c
+--- wis-go7007-linux-0.9.8/kernel/go7007-driver.c 2006-04-02 00:35:48.000000000 +0200
++++ wis-go7007-linux-0.9.8-new/kernel/go7007-driver.c 2007-02-18 23:30:59.000000000 +0100
+@@ -18,7 +18,6 @@
+ #include <linux/module.h>
+ #include <linux/version.h>
+ #include <linux/init.h>
+-#include <linux/config.h>
+ #include <linux/delay.h>
+ #include <linux/sched.h>
+ #include <linux/spinlock.h>
+@@ -34,9 +33,7 @@
+ #include <asm/system.h>
+ #include <linux/videodev.h>
+ #include <media/tuner.h>
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
+ #include <media/v4l2-common.h>
+-#endif
+
+ #include "go7007-priv.h"
+ #include "wis-i2c.h"
+diff -ur wis-go7007-linux-0.9.8/kernel/go7007-fw.c wis-go7007-linux-0.9.8-new/kernel/go7007-fw.c
+--- wis-go7007-linux-0.9.8/kernel/go7007-fw.c 2006-04-02 00:35:55.000000000 +0200
++++ wis-go7007-linux-0.9.8-new/kernel/go7007-fw.c 2007-02-18 23:31:34.000000000 +0100
+@@ -26,7 +26,7 @@
+
+ #include <linux/module.h>
+ #include <linux/init.h>
+-#include <linux/config.h>
++#include <linux/version.h>
+ #include <linux/time.h>
+ #include <linux/mm.h>
+ #include <linux/device.h>
+diff -ur wis-go7007-linux-0.9.8/kernel/go7007-i2c.c wis-go7007-linux-0.9.8-new/kernel/go7007-i2c.c
+--- wis-go7007-linux-0.9.8/kernel/go7007-i2c.c 2006-04-02 00:36:00.000000000 +0200
++++ wis-go7007-linux-0.9.8-new/kernel/go7007-i2c.c 2007-02-18 23:34:41.000000000 +0100
+@@ -15,9 +15,8 @@
+ * Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
+ */
+
+-#include <linux/config.h>
+-#include <linux/module.h>
+ #include <linux/version.h>
++#include <linux/module.h>
+ #include <linux/init.h>
+ #include <linux/delay.h>
+ #include <linux/sched.h>
+@@ -288,10 +287,6 @@
+ }
+
+ static struct i2c_algorithm go7007_algo = {
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14)
+- .name = "go7007",
+- .id = I2C_ALGO_GO7007,
+-#endif
+ .smbus_xfer = go7007_smbus_xfer,
+ .master_xfer = go7007_i2c_master_xfer,
+ .algo_control = go7007_algo_control,
+diff -ur wis-go7007-linux-0.9.8/kernel/go7007-usb.c wis-go7007-linux-0.9.8-new/kernel/go7007-usb.c
+--- wis-go7007-linux-0.9.8/kernel/go7007-usb.c 2006-04-02 00:57:04.000000000 +0200
++++ wis-go7007-linux-0.9.8-new/kernel/go7007-usb.c 2007-02-18 23:34:20.000000000 +0100
+@@ -27,7 +27,7 @@
+ #include <linux/usb.h>
+ #include <linux/i2c.h>
+ #include <asm/byteorder.h>
+-#include <media/audiochip.h>
++#include <media/tvaudio.h>
+
+ #include "go7007-priv.h"
+ #include "wis-i2c.h"
+@@ -225,17 +225,17 @@
+ .inputs = {
+ {
+ .video_input = 1,
+- .audio_input = AUDIO_EXTERN,
++ .audio_input = TVAUDIO_INPUT_EXTERN,
+ .name = "Composite",
+ },
+ {
+ .video_input = 8,
+- .audio_input = AUDIO_EXTERN,
++ .audio_input = TVAUDIO_INPUT_EXTERN,
+ .name = "S-Video",
+ },
+ {
+ .video_input = 3,
+- .audio_input = AUDIO_TUNER,
++ .audio_input = TVAUDIO_INPUT_TUNER,
+ .name = "Tuner",
+ },
+ },
+@@ -502,11 +502,7 @@
+ int value, int index, void *transfer_buffer, int length, int in)
+ {
+ struct go7007_usb *usb = go->hpi_context;
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,12)
+- int timeout = 5 * HZ;
+-#else
+ int timeout = 5000;
+-#endif
+
+ if (in) {
+ return usb_control_msg(usb->usbdev,
+@@ -562,11 +558,7 @@
+ struct go7007_usb *usb = go->hpi_context;
+ int i, r;
+ u16 status_reg;
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,12)
+- int timeout = HZ / 2;
+-#else
+ int timeout = 500;
+-#endif
+
+ #ifdef GO7007_USB_DEBUG
+ printk(KERN_DEBUG
+@@ -615,11 +607,7 @@
+ struct go7007_usb *usb = go->hpi_context;
+ u8 *tbuf;
+ int r;
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,12)
+- int timeout = HZ / 2;
+-#else
+ int timeout = 500;
+-#endif
+
+ #ifdef GO7007_USB_DEBUG
+ printk(KERN_DEBUG
+@@ -645,8 +633,7 @@
+ return 0;
+ }
+
+-static void go7007_usb_readinterrupt_complete(struct urb *urb,
+- struct pt_regs *pt_regs)
++static void go7007_usb_readinterrupt_complete(struct urb *urb)
+ {
+ struct go7007 *go = (struct go7007 *)urb->context;
+ u16 *regs = (u16 *)urb->transfer_buffer;
+@@ -690,8 +677,7 @@
+ return 0;
+ }
+
+-static void go7007_usb_read_video_pipe_complete(struct urb *urb,
+- struct pt_regs *pt_regs)
++static void go7007_usb_read_video_pipe_complete(struct urb *urb)
+ {
+ struct go7007 *go = (struct go7007 *)urb->context;
+ int r;
+@@ -715,8 +701,7 @@
+ printk(KERN_ERR "go7007-usb: error in video pipe: %d\n", r);
+ }
+
+-static void go7007_usb_read_audio_pipe_complete(struct urb *urb,
+- struct pt_regs *pt_regs)
++static void go7007_usb_read_audio_pipe_complete(struct urb *urb)
+ {
+ struct go7007 *go = (struct go7007 *)urb->context;
+ int r;
+@@ -793,11 +778,7 @@
+ {
+ struct go7007_usb *usb = go->hpi_context;
+ int transferred, pipe;
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,12)
+- int timeout = HZ / 2;
+-#else
+ int timeout = 500;
+-#endif
+
+ #ifdef GO7007_USB_DEBUG
+ printk(KERN_DEBUG "go7007-usb: DownloadBuffer sending %d bytes\n", len);
+@@ -920,10 +901,6 @@
+ }
+
+ static struct i2c_algorithm go7007_usb_algo = {
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14)
+- .name = "go7007-usb",
+- .id = I2C_ALGO_GO7007,
+-#endif
+ .master_xfer = go7007_usb_i2c_master_xfer,
+ .algo_control = go7007_usb_algo_control,
+ .functionality = go7007_usb_functionality,
+@@ -1237,9 +1214,6 @@
+ }
+
+ static struct usb_driver go7007_usb_driver = {
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
+- .owner = THIS_MODULE,
+-#endif
+ .name = "go7007",
+ .probe = go7007_usb_probe,
+ .disconnect = go7007_usb_disconnect,
+diff -ur wis-go7007-linux-0.9.8/kernel/go7007-v4l2.c wis-go7007-linux-0.9.8-new/kernel/go7007-v4l2.c
+--- wis-go7007-linux-0.9.8/kernel/go7007-v4l2.c 2006-04-02 01:22:03.000000000 +0200
++++ wis-go7007-linux-0.9.8-new/kernel/go7007-v4l2.c 2007-02-18 23:34:28.000000000 +0100
+@@ -17,7 +17,6 @@
+
+ #include <linux/module.h>
+ #include <linux/init.h>
+-#include <linux/config.h>
+ #include <linux/version.h>
+ #include <linux/delay.h>
+ #include <linux/sched.h>
+@@ -29,11 +28,7 @@
+ #include <linux/pagemap.h>
+ #include <linux/videodev.h>
+ #include <linux/video_decoder.h>
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
+-#include <media/audiochip.h>
+-#else
+ #include <media/v4l2-common.h>
+-#endif
+ #include <linux/i2c.h>
+ #include <asm/uaccess.h>
+ #include <asm/semaphore.h>
+@@ -939,7 +934,7 @@
+ if (go->i2c_adapter_online) {
+ i2c_clients_command(&go->i2c_adapter, DECODER_SET_INPUT,
+ &go->board_info->inputs[*input].video_input);
+- i2c_clients_command(&go->i2c_adapter, AUDC_SET_INPUT,
++ i2c_clients_command(&go->i2c_adapter, VIDIOC_S_AUDIO,
+ &go->board_info->inputs[*input].audio_input);
+ }
+ return 0;
+Only in wis-go7007-linux-0.9.8-new/kernel: Module.symvers
+diff -ur wis-go7007-linux-0.9.8/kernel/snd-go7007.c wis-go7007-linux-0.9.8-new/kernel/snd-go7007.c
+--- wis-go7007-linux-0.9.8/kernel/snd-go7007.c 2006-04-02 00:36:38.000000000 +0200
++++ wis-go7007-linux-0.9.8-new/kernel/snd-go7007.c 2007-02-18 23:41:31.000000000 +0100
+@@ -20,7 +20,6 @@
+ #include <linux/version.h>
+ #include <linux/moduleparam.h>
+ #include <linux/init.h>
+-#include <linux/config.h>
+ #include <linux/delay.h>
+ #include <linux/sched.h>
+ #include <linux/vmalloc.h>
+@@ -41,24 +40,17 @@
+ static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;
+ static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
+
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
+-static int index_num, id_num, enable_num;
+-module_param_array(index, int, index_num, 0444);
+-module_param_array(id, charp, id_num, 0444);
+-module_param_array(enable, bool, enable_num, 0444);
+-#else
+ module_param_array(index, int, NULL, 0444);
+ module_param_array(id, charp, NULL, 0444);
+ module_param_array(enable, bool, NULL, 0444);
+-#endif
+ MODULE_PARM_DESC(index, "Index value for the go7007 audio driver");
+ MODULE_PARM_DESC(index, "ID string for the go7007 audio driver");
+ MODULE_PARM_DESC(index, "Enable for the go7007 audio driver");
+
+ struct go7007_snd {
+- snd_card_t *card;
+- snd_pcm_t *pcm;
+- snd_pcm_substream_t *substream;
++ struct snd_card *card;
++ struct snd_pcm *pcm;
++ struct snd_pcm_substream *substream;
+ spinlock_t lock;
+ int w_idx;
+ int hw_ptr;
+@@ -66,7 +58,7 @@
+ int capturing;
+ };
+
+-static snd_pcm_hardware_t go7007_snd_capture_hw = {
++static struct snd_pcm_hardware go7007_snd_capture_hw = {
+ .info = (SNDRV_PCM_INFO_MMAP |
+ SNDRV_PCM_INFO_INTERLEAVED |
+ SNDRV_PCM_INFO_BLOCK_TRANSFER |
+@@ -87,7 +79,7 @@
+ static void parse_audio_stream_data(struct go7007 *go, u8 *buf, int length)
+ {
+ struct go7007_snd *gosnd = go->snd_context;
+- snd_pcm_runtime_t *runtime = gosnd->substream->runtime;
++ struct snd_pcm_runtime *runtime = gosnd->substream->runtime;
+ int frames = bytes_to_frames(runtime, length);
+
+ spin_lock(&gosnd->lock);
+@@ -117,8 +109,8 @@
+ snd_pcm_period_elapsed(gosnd->substream);
+ }
+
+-static int go7007_snd_hw_params(snd_pcm_substream_t *substream,
+- snd_pcm_hw_params_t *hw_params)
++static int go7007_snd_hw_params(struct snd_pcm_substream *substream,
++ struct snd_pcm_hw_params *hw_params)
+ {
+ struct go7007 *go = snd_pcm_substream_chip(substream);
+ unsigned int bytes;
+@@ -135,7 +127,7 @@
+ return 0;
+ }
+
+-static int go7007_snd_hw_free(snd_pcm_substream_t *substream)
++static int go7007_snd_hw_free(struct snd_pcm_substream *substream)
+ {
+ struct go7007 *go = snd_pcm_substream_chip(substream);
+
+@@ -146,7 +138,7 @@
+ return 0;
+ }
+
+-static int go7007_snd_capture_open(snd_pcm_substream_t *substream)
++static int go7007_snd_capture_open(struct snd_pcm_substream *substream)
+ {
+ struct go7007 *go = snd_pcm_substream_chip(substream);
+ struct go7007_snd *gosnd = go->snd_context;
+@@ -164,7 +156,7 @@
+ return r;
+ }
+
+-static int go7007_snd_capture_close(snd_pcm_substream_t *substream)
++static int go7007_snd_capture_close(struct snd_pcm_substream *substream)
+ {
+ struct go7007 *go = snd_pcm_substream_chip(substream);
+ struct go7007_snd *gosnd = go->snd_context;
+@@ -173,12 +165,12 @@
+ return 0;
+ }
+
+-static int go7007_snd_pcm_prepare(snd_pcm_substream_t *substream)
++static int go7007_snd_pcm_prepare(struct snd_pcm_substream *substream)
+ {
+ return 0;
+ }
+
+-static int go7007_snd_pcm_trigger(snd_pcm_substream_t *substream, int cmd)
++static int go7007_snd_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
+ {
+ struct go7007 *go = snd_pcm_substream_chip(substream);
+ struct go7007_snd *gosnd = go->snd_context;
+@@ -198,7 +190,7 @@
+ }
+ }
+
+-static snd_pcm_uframes_t go7007_snd_pcm_pointer(snd_pcm_substream_t *substream)
++static snd_pcm_uframes_t go7007_snd_pcm_pointer(struct snd_pcm_substream *substream)
+ {
+ struct go7007 *go = snd_pcm_substream_chip(substream);
+ struct go7007_snd *gosnd = go->snd_context;
+@@ -206,13 +198,13 @@
+ return gosnd->hw_ptr;
+ }
+
+-static struct page *go7007_snd_pcm_page(snd_pcm_substream_t *substream,
++static struct page *go7007_snd_pcm_page(struct snd_pcm_substream *substream,
+ unsigned long offset)
+ {
+ return vmalloc_to_page(substream->runtime->dma_area + offset);
+ }
+
+-static snd_pcm_ops_t go7007_snd_capture_ops = {
++static struct snd_pcm_ops go7007_snd_capture_ops = {
+ .open = go7007_snd_capture_open,
+ .close = go7007_snd_capture_close,
+ .ioctl = snd_pcm_lib_ioctl,
+@@ -224,7 +216,7 @@
+ .page = go7007_snd_pcm_page,
+ };
+
+-static int go7007_snd_free(snd_device_t *device)
++static int go7007_snd_free(struct snd_device *device)
+ {
+ struct go7007 *go = device->device_data;
+
+@@ -235,7 +227,7 @@
+ return 0;
+ }
+
+-static snd_device_ops_t go7007_snd_device_ops = {
++static struct snd_device_ops go7007_snd_device_ops = {
+ .dev_free = go7007_snd_free,
+ };
+
+@@ -305,7 +297,7 @@
+ struct go7007_snd *gosnd = go->snd_context;
+
+ snd_card_disconnect(gosnd->card);
+- snd_card_free_in_thread(gosnd->card);
++ snd_card_free_when_closed(gosnd->card);
+ return 0;
+ }
+ EXPORT_SYMBOL(go7007_snd_remove);
+diff -ur wis-go7007-linux-0.9.8/kernel/wis-ov7640.c wis-go7007-linux-0.9.8-new/kernel/wis-ov7640.c
+--- wis-go7007-linux-0.9.8/kernel/wis-ov7640.c 2006-04-02 00:36:59.000000000 +0200
++++ wis-go7007-linux-0.9.8-new/kernel/wis-ov7640.c 2007-02-18 23:36:11.000000000 +0100
+@@ -52,16 +52,10 @@
+ return 0;
+ }
+
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,12)
+-static int wis_ov7640_i2c_id = 0;
+-#endif
+ static struct i2c_driver wis_ov7640_driver;
+
+ static struct i2c_client wis_ov7640_client_templ = {
+ .name = "OV7640 (WIS)",
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
+- .flags = I2C_CLIENT_ALLOW_USE,
+-#endif
+ .driver = &wis_ov7640_driver,
+ };
+
+@@ -80,9 +74,6 @@
+ client->adapter = adapter;
+ client->addr = addr;
+ client->flags = I2C_CLIENT_SCCB;
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,12)
+- client->id = wis_ov7640_i2c_id++;
+-#endif
+
+ printk(KERN_DEBUG
+ "wis-ov7640: initializing OV7640 at address %d on %s\n",
+@@ -112,14 +103,9 @@
+ }
+
+ static struct i2c_driver wis_ov7640_driver = {
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
+- .owner = THIS_MODULE,
+- .name = "WIS OV7640 I2C driver",
+-#else
+ .driver = {
+ .name = "WIS OV7640 I2C driver",
+ },
+-#endif
+ .id = I2C_DRIVERID_WIS_OV7640,
+ .detach_client = wis_ov7640_detach,
+ };
+diff -ur wis-go7007-linux-0.9.8/kernel/wis-saa7113.c wis-go7007-linux-0.9.8-new/kernel/wis-saa7113.c
+--- wis-go7007-linux-0.9.8/kernel/wis-saa7113.c 2006-04-02 00:37:06.000000000 +0200
++++ wis-go7007-linux-0.9.8-new/kernel/wis-saa7113.c 2007-02-18 23:37:16.000000000 +0100
+@@ -21,6 +21,7 @@
+ #include <linux/i2c.h>
+ #include <linux/videodev.h>
+ #include <linux/video_decoder.h>
++#include <linux/ioctl.h>
+
+ #include "wis-i2c.h"
+
+@@ -266,16 +267,10 @@
+ return 0;
+ }
+
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,12)
+-static int wis_saa7113_i2c_id = 0;
+-#endif
+ static struct i2c_driver wis_saa7113_driver;
+
+ static struct i2c_client wis_saa7113_client_templ = {
+ .name = "SAA7113 (WIS)",
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
+- .flags = I2C_CLIENT_ALLOW_USE,
+-#endif
+ .driver = &wis_saa7113_driver,
+ };
+
+@@ -294,9 +289,6 @@
+ sizeof(wis_saa7113_client_templ));
+ client->adapter = adapter;
+ client->addr = addr;
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,12)
+- client->id = wis_saa7113_i2c_id++;
+-#endif
+
+ dec = kmalloc(sizeof(struct wis_saa7113), GFP_KERNEL);
+ if (dec == NULL) {
+@@ -342,14 +334,9 @@
+ }
+
+ static struct i2c_driver wis_saa7113_driver = {
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
+- .owner = THIS_MODULE,
+- .name = "WIS SAA7113 I2C driver",
+-#else
+ .driver = {
+ .name = "WIS SAA7113 I2C driver",
+ },
+-#endif
+ .id = I2C_DRIVERID_WIS_SAA7113,
+ .detach_client = wis_saa7113_detach,
+ .command = wis_saa7113_command,
+diff -ur wis-go7007-linux-0.9.8/kernel/wis-saa7115.c wis-go7007-linux-0.9.8-new/kernel/wis-saa7115.c
+--- wis-go7007-linux-0.9.8/kernel/wis-saa7115.c 2006-04-02 00:37:12.000000000 +0200
++++ wis-go7007-linux-0.9.8-new/kernel/wis-saa7115.c 2007-02-18 23:37:40.000000000 +0100
+@@ -21,6 +21,7 @@
+ #include <linux/i2c.h>
+ #include <linux/videodev.h>
+ #include <linux/video_decoder.h>
++#include <linux/ioctl.h>
+
+ #include "wis-i2c.h"
+
+@@ -395,16 +396,10 @@
+ return 0;
+ }
+
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,12)
+-static int wis_saa7115_i2c_id = 0;
+-#endif
+ static struct i2c_driver wis_saa7115_driver;
+
+ static struct i2c_client wis_saa7115_client_templ = {
+ .name = "SAA7115 (WIS)",
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
+- .flags = I2C_CLIENT_ALLOW_USE,
+-#endif
+ .driver = &wis_saa7115_driver,
+ };
+
+@@ -423,9 +418,6 @@
+ sizeof(wis_saa7115_client_templ));
+ client->adapter = adapter;
+ client->addr = addr;
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,12)
+- client->id = wis_saa7115_i2c_id++;
+-#endif
+
+ dec = kmalloc(sizeof(struct wis_saa7115), GFP_KERNEL);
+ if (dec == NULL) {
+@@ -471,14 +463,9 @@
+ }
+
+ static struct i2c_driver wis_saa7115_driver = {
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
+- .owner = THIS_MODULE,
+- .name = "WIS SAA7115 I2C driver",
+-#else
+ .driver = {
+ .name = "WIS SAA7115 I2C driver",
+ },
+-#endif
+ .id = I2C_DRIVERID_WIS_SAA7115,
+ .detach_client = wis_saa7115_detach,
+ .command = wis_saa7115_command,
+diff -ur wis-go7007-linux-0.9.8/kernel/wis-sony-tuner.c wis-go7007-linux-0.9.8-new/kernel/wis-sony-tuner.c
+--- wis-go7007-linux-0.9.8/kernel/wis-sony-tuner.c 2006-04-02 00:37:18.000000000 +0200
++++ wis-go7007-linux-0.9.8-new/kernel/wis-sony-tuner.c 2007-02-18 23:35:22.000000000 +0100
+@@ -21,9 +21,7 @@
+ #include <linux/i2c.h>
+ #include <linux/videodev.h>
+ #include <media/tuner.h>
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
+ #include <media/v4l2-common.h>
+-#endif
+
+ #include "wis-i2c.h"
+
+@@ -653,16 +651,10 @@
+ return 0;
+ }
+
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,12)
+-static int wis_sony_tuner_i2c_id = 0;
+-#endif
+ static struct i2c_driver wis_sony_tuner_driver;
+
+ static struct i2c_client wis_sony_tuner_client_templ = {
+ .name = "Sony TV Tuner (WIS)",
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
+- .flags = I2C_CLIENT_ALLOW_USE,
+-#endif
+ .driver = &wis_sony_tuner_driver,
+ };
+
+@@ -682,9 +674,6 @@
+ sizeof(wis_sony_tuner_client_templ));
+ client->adapter = adapter;
+ client->addr = addr;
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,12)
+- client->id = wis_sony_tuner_i2c_id++;
+-#endif
+
+ t = kmalloc(sizeof(struct wis_sony_tuner), GFP_KERNEL);
+ if (t == NULL) {
+@@ -721,14 +710,9 @@
+ }
+
+ static struct i2c_driver wis_sony_tuner_driver = {
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
+- .owner = THIS_MODULE,
+- .name = "WIS Sony TV Tuner I2C driver",
+-#else
+ .driver = {
+ .name = "WIS Sony TV Tuner I2C driver",
+ },
+-#endif
+ .id = I2C_DRIVERID_WIS_SONY_TUNER,
+ .detach_client = wis_sony_tuner_detach,
+ .command = tuner_command,
+diff -ur wis-go7007-linux-0.9.8/kernel/wis-tw2804.c wis-go7007-linux-0.9.8-new/kernel/wis-tw2804.c
+--- wis-go7007-linux-0.9.8/kernel/wis-tw2804.c 2006-04-02 00:37:22.000000000 +0200
++++ wis-go7007-linux-0.9.8-new/kernel/wis-tw2804.c 2007-02-18 23:38:08.000000000 +0100
+@@ -21,6 +21,7 @@
+ #include <linux/i2c.h>
+ #include <linux/videodev.h>
+ #include <linux/video_decoder.h>
++#include <linux/ioctl.h>
+
+ #include "wis-i2c.h"
+
+@@ -294,16 +295,10 @@
+ return 0;
+ }
+
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,12)
+-static int wis_tw2804_i2c_id = 0;
+-#endif
+ static struct i2c_driver wis_tw2804_driver;
+
+ static struct i2c_client wis_tw2804_client_templ = {
+ .name = "TW2804 (WIS)",
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
+- .flags = I2C_CLIENT_ALLOW_USE,
+-#endif
+ .driver = &wis_tw2804_driver,
+ };
+
+@@ -322,9 +317,6 @@
+ sizeof(wis_tw2804_client_templ));
+ client->adapter = adapter;
+ client->addr = addr;
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,12)
+- client->id = wis_tw2804_i2c_id++;
+-#endif
+
+ dec = kmalloc(sizeof(struct wis_tw2804), GFP_KERNEL);
+ if (dec == NULL) {
+@@ -361,14 +353,9 @@
+ }
+
+ static struct i2c_driver wis_tw2804_driver = {
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
+- .owner = THIS_MODULE,
+- .name = "WIS TW2804 I2C driver",
+-#else
+ .driver = {
+ .name = "WIS TW2804 I2C driver",
+ },
+-#endif
+ .id = I2C_DRIVERID_WIS_TW2804,
+ .detach_client = wis_tw2804_detach,
+ .command = wis_tw2804_command,
+diff -ur wis-go7007-linux-0.9.8/kernel/wis-tw9903.c wis-go7007-linux-0.9.8-new/kernel/wis-tw9903.c
+--- wis-go7007-linux-0.9.8/kernel/wis-tw9903.c 2006-04-02 00:37:28.000000000 +0200
++++ wis-go7007-linux-0.9.8-new/kernel/wis-tw9903.c 2007-02-18 23:36:37.000000000 +0100
+@@ -21,6 +21,7 @@
+ #include <linux/i2c.h>
+ #include <linux/videodev.h>
+ #include <linux/video_decoder.h>
++#include <linux/ioctl.h>
+
+ #include "wis-i2c.h"
+
+@@ -268,16 +269,10 @@
+ return 0;
+ }
+
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,12)
+-static int wis_tw9903_i2c_id = 0;
+-#endif
+ static struct i2c_driver wis_tw9903_driver;
+
+ static struct i2c_client wis_tw9903_client_templ = {
+ .name = "TW9903 (WIS)",
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
+- .flags = I2C_CLIENT_ALLOW_USE,
+-#endif
+ .driver = &wis_tw9903_driver,
+ };
+
+@@ -296,9 +291,6 @@
+ sizeof(wis_tw9903_client_templ));
+ client->adapter = adapter;
+ client->addr = addr;
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,12)
+- client->id = wis_tw9903_i2c_id++;
+-#endif
+
+ dec = kmalloc(sizeof(struct wis_tw9903), GFP_KERNEL);
+ if (dec == NULL) {
+@@ -342,14 +334,9 @@
+ }
+
+ static struct i2c_driver wis_tw9903_driver = {
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
+- .owner = THIS_MODULE,
+- .name = "WIS TW9903 I2C driver",
+-#else
+ .driver = {
+ .name = "WIS TW9903 I2C driver",
+ },
+-#endif
+ .id = I2C_DRIVERID_WIS_TW9903,
+ .detach_client = wis_tw9903_detach,
+ .command = wis_tw9903_command,
+diff -ur wis-go7007-linux-0.9.8/kernel/wis-uda1342.c wis-go7007-linux-0.9.8-new/kernel/wis-uda1342.c
+--- wis-go7007-linux-0.9.8/kernel/wis-uda1342.c 2006-04-02 00:37:32.000000000 +0200
++++ wis-go7007-linux-0.9.8-new/kernel/wis-uda1342.c 2007-02-18 23:35:55.000000000 +0100
+@@ -20,10 +20,8 @@
+ #include <linux/version.h>
+ #include <linux/i2c.h>
+ #include <linux/videodev.h>
+-#include <media/audiochip.h>
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
++#include <media/tvaudio.h>
+ #include <media/v4l2-common.h>
+-#endif
+
+ #include "wis-i2c.h"
+
+@@ -38,15 +36,15 @@
+ unsigned int cmd, void *arg)
+ {
+ switch (cmd) {
+- case AUDC_SET_INPUT:
++ case VIDIOC_S_AUDIO:
+ {
+ int *inp = arg;
+
+ switch (*inp) {
+- case AUDIO_TUNER:
++ case TVAUDIO_INPUT_TUNER:
+ write_reg(client, 0x00, 0x1441); /* select input 2 */
+ break;
+- case AUDIO_EXTERN:
++ case TVAUDIO_INPUT_EXTERN:
+ write_reg(client, 0x00, 0x1241); /* select input 1 */
+ break;
+ default:
+@@ -62,16 +60,10 @@
+ return 0;
+ }
+
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,12)
+-static int wis_uda1342_i2c_id = 0;
+-#endif
+ static struct i2c_driver wis_uda1342_driver;
+
+ static struct i2c_client wis_uda1342_client_templ = {
+ .name = "UDA1342 (WIS)",
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
+- .flags = I2C_CLIENT_ALLOW_USE,
+-#endif
+ .driver = &wis_uda1342_driver,
+ };
+
+@@ -89,9 +81,6 @@
+ sizeof(wis_uda1342_client_templ));
+ client->adapter = adapter;
+ client->addr = addr;
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,12)
+- client->id = wis_uda1342_i2c_id++;
+-#endif
+
+ printk(KERN_DEBUG
+ "wis-uda1342: initializing UDA1342 at address %d on %s\n",
+@@ -117,14 +106,9 @@
+ }
+
+ static struct i2c_driver wis_uda1342_driver = {
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
+- .owner = THIS_MODULE,
+- .name = "WIS UDA1342 I2C driver",
+-#else
+ .driver = {
+ .name = "WIS UDA1342 I2C driver",
+ },
+-#endif
+ .id = I2C_DRIVERID_WIS_UDA1342,
+ .detach_client = wis_uda1342_detach,
+ .command = wis_uda1342_command,
Added: branches/rpms/brian/dvb-apps/COPYING
===================================================================
--- branches/rpms/brian/dvb-apps/COPYING (rev 0)
+++ branches/rpms/brian/dvb-apps/COPYING 2008-06-09 23:04:09 UTC (rev 6349)
@@ -0,0 +1,340 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General
+Public License instead of this License.
Added: branches/rpms/brian/dvb-apps/dvb-apps-optflags.patch
===================================================================
--- branches/rpms/brian/dvb-apps/dvb-apps-optflags.patch (rev 0)
+++ branches/rpms/brian/dvb-apps/dvb-apps-optflags.patch 2008-06-09 23:04:09 UTC (rev 6349)
@@ -0,0 +1,99 @@
+diff -Naru linuxtv-dvb-apps-1.1.0.orig/test/Makefile linuxtv-dvb-apps-1.1.0/test/Makefile
+--- linuxtv-dvb-apps-1.1.0.orig/test/Makefile 2004-01-17 18:59:46.000000000 +0200
++++ linuxtv-dvb-apps-1.1.0/test/Makefile 2004-10-04 23:32:18.377000638 +0300
+@@ -1,7 +1,7 @@
+ # Makefile for Linux DVB API Version 3 test programs
+
+ CC = gcc
+-CFLAGS = -g -O2 -W -Wall -I../include
++CFLAGS = $(RPM_OPT_FLAGS) -W -Wall -I../include
+
+ TARGETS = \
+ diseqc \
+diff -Naru linuxtv-dvb-apps-1.1.0.orig/util/av7110_loadkeys/Makefile linuxtv-dvb-apps-1.1.0/util/av7110_loadkeys/Makefile
+--- linuxtv-dvb-apps-1.1.0.orig/util/av7110_loadkeys/Makefile 2004-01-17 18:59:46.000000000 +0200
++++ linuxtv-dvb-apps-1.1.0/util/av7110_loadkeys/Makefile 2004-10-04 23:32:10.787375858 +0300
+@@ -1,5 +1,5 @@
+ CC = gcc
+-CFLAGS = -g -Wall -O2
++CFLAGS = $(RPM_OPT_FLAGS) -Wall
+
+ all: av7110_loadkeys evtest
+
+diff -Naru linuxtv-dvb-apps-1.1.0.orig/util/dvbdate/Makefile linuxtv-dvb-apps-1.1.0/util/dvbdate/Makefile
+--- linuxtv-dvb-apps-1.1.0.orig/util/dvbdate/Makefile 2004-01-17 18:59:46.000000000 +0200
++++ linuxtv-dvb-apps-1.1.0/util/dvbdate/Makefile 2004-10-04 23:31:58.835116342 +0300
+@@ -1,6 +1,6 @@
+
+ CC = gcc
+-CFLAGS = -g -O2 -MD -Wall -I. -I../../include
++CFLAGS = $(RPM_OPT_FLAGS) -MD -Wall -I. -I../../include
+ LFLAGS =
+
+ OBJS = dvbdate.o
+diff -Naru linuxtv-dvb-apps-1.1.0.orig/util/dvbnet/Makefile linuxtv-dvb-apps-1.1.0/util/dvbnet/Makefile
+--- linuxtv-dvb-apps-1.1.0.orig/util/dvbnet/Makefile 2004-01-17 18:59:46.000000000 +0200
++++ linuxtv-dvb-apps-1.1.0/util/dvbnet/Makefile 2004-10-04 23:31:48.830247341 +0300
+@@ -1,6 +1,6 @@
+
+ CC = gcc
+-CFLAGS = -g -O2 -MD -Wall -I. -I../../include
++CFLAGS = $(RPM_OPT_FLAGS) -MD -Wall -I. -I../../include
+ LFLAGS =
+
+ OBJS = dvbnet.o
+diff -Naru linuxtv-dvb-apps-1.1.0.orig/util/dvbtraffic/Makefile linuxtv-dvb-apps-1.1.0/util/dvbtraffic/Makefile
+--- linuxtv-dvb-apps-1.1.0.orig/util/dvbtraffic/Makefile 2004-01-19 19:10:16.000000000 +0200
++++ linuxtv-dvb-apps-1.1.0/util/dvbtraffic/Makefile 2004-10-04 23:31:37.418818469 +0300
+@@ -1,6 +1,6 @@
+
+ dvbtraffic: dvbtraffic.c
+- gcc -MD -g -O2 -Wall -I../../include $< -o $@
++ $(CC) -MD -Wall $(RPM_OPT_FLAGS) -I../../include $< -o $@
+
+ clean:
+ rm -f *.o *.d dvbtraffic
+diff -Naru linuxtv-dvb-apps-1.1.0.orig/util/lib/Makefile linuxtv-dvb-apps-1.1.0/util/lib/Makefile
+--- linuxtv-dvb-apps-1.1.0.orig/util/lib/Makefile 2004-01-17 18:59:46.000000000 +0200
++++ linuxtv-dvb-apps-1.1.0/util/lib/Makefile 2004-10-04 23:31:08.152976759 +0300
+@@ -1,6 +1,6 @@
+
+ CC = gcc
+-CFLAGS = -MD -g -Wall -O2 -I../../include -I.
++CFLAGS = -MD -Wall $(RPM_OPT_FLAGS) -I../../include -I.
+ LFLAGS = -g -Wall
+
+ OBJS = lnb.o
+diff -Naru linuxtv-dvb-apps-1.1.0.orig/util/scan/Makefile linuxtv-dvb-apps-1.1.0/util/scan/Makefile
+--- linuxtv-dvb-apps-1.1.0.orig/util/scan/Makefile 2004-01-17 18:59:46.000000000 +0200
++++ linuxtv-dvb-apps-1.1.0/util/scan/Makefile 2004-10-04 23:30:50.443518484 +0300
+@@ -1,5 +1,5 @@
+
+ CC = gcc
+-CFLAGS = -MD -g -Wall -O2 -I../../include
++CFLAGS = -MD -Wall $(RPM_OPT_FLAGS) -I../../include
+ LFLAGS = -g -Wall
+
+diff -Naru linuxtv-dvb-apps-1.1.0.orig/util/szap/Makefile linuxtv-dvb-apps-1.1.0/util/szap/Makefile
+--- linuxtv-dvb-apps-1.1.0.orig/util/szap/Makefile 2004-01-17 18:59:46.000000000 +0200
++++ linuxtv-dvb-apps-1.1.0/util/szap/Makefile 2004-10-04 23:32:41.668711208 +0300
+@@ -1,6 +1,6 @@
+ CC = gcc
+-CFLAGS = -MD -Wall -g -O2 -I../../include -I../lib
+-LFLAGS = -Wall -g -O2
++CFLAGS = -MD -Wall $(RPM_OPT_FLAGS) -I../../include -I../lib
++LFLAGS = -Wall $(RPM_OPT_FLAGS)
+ RM = rm -f
+
+ TARGETS = szap tzap czap femon
+diff -Naru linuxtv-dvb-apps-1.1.0.orig/util/ttusb_dec_reset/Makefile linuxtv-dvb-apps-1.1.0/util/ttusb_dec_reset/Makefile
+--- linuxtv-dvb-apps-1.1.0.orig/util/ttusb_dec_reset/Makefile 2004-01-22 00:13:45.000000000 +0200
++++ linuxtv-dvb-apps-1.1.0/util/ttusb_dec_reset/Makefile 2004-10-04 23:30:34.373547057 +0300
+@@ -1,6 +1,6 @@
+ CC = gcc
+ RM = rm -f
+-CFLAGS = -g -Wall -O2
++CFLAGS = -Wall $(RPM_OPT_FLAGS)
+ LFLAGS = -g -Wall
+ LDFLAGS = -lusb
+
Added: branches/rpms/brian/dvb-apps/dvb-apps-paths.patch
===================================================================
--- branches/rpms/brian/dvb-apps/dvb-apps-paths.patch (rev 0)
+++ branches/rpms/brian/dvb-apps/dvb-apps-paths.patch 2008-06-09 23:04:09 UTC (rev 6349)
@@ -0,0 +1,80 @@
+diff -NarU1 linuxtv-dvb-apps-1.1.0.orig/util/av7110_loadkeys/README linuxtv-dvb-apps-1.1.0/util/av7110_loadkeys/README
+--- linuxtv-dvb-apps-1.1.0.orig/util/av7110_loadkeys/README 2004-01-17 18:59:46.000000000 +0200
++++ linuxtv-dvb-apps-1.1.0/util/av7110_loadkeys/README 2004-10-05 00:12:40.031659603 +0300
+@@ -7,3 +7,3 @@
+
+- # ./av7110_loadkeys [-i|--invert] [-a|--address <num>] keymapname.(rc5|rcmm) > /proc/av7110_ir
++ # av7110_loadkeys [-i|--invert] [-a|--address <num>] keymapname.(rc5|rcmm) > /proc/av7110_ir
+
+@@ -17,6 +17,6 @@
+ Listen to *any* IR transmitter with uses the RC5 protocol:
+-# ./av7110_loadkeys hauppauge.rc5 > /proc/av7110_ir
++# av7110_loadkeys /usr/share/dvb-apps/hauppauge.rc5 > /proc/av7110_ir
+
+ Listen to RC5 transmitter with address 2:
+-# ./av7110_loadkeys -a 2 hauppauge.rc5 > /proc/av7110_ir
++# av7110_loadkeys -a 2 /usr/share/dvb-apps/hauppauge.rc5 > /proc/av7110_ir
+
+@@ -25,5 +25,5 @@
+
+-Now you can test your hardware setup using evtest
++Now you can test your hardware setup using av7110_evtest
+
+- # ./evtest /dev/input/eventX
++ # av7110_evtest /dev/input/eventX
+
+diff -NarU1 linuxtv-dvb-apps-1.1.0.orig/util/dvbnet/net_start.pl linuxtv-dvb-apps-1.1.0/util/dvbnet/net_start.pl
+--- linuxtv-dvb-apps-1.1.0.orig/util/dvbnet/net_start.pl 2004-01-17 18:59:46.000000000 +0200
++++ linuxtv-dvb-apps-1.1.0/util/dvbnet/net_start.pl 2004-10-05 00:12:32.412917780 +0300
+@@ -14,3 +14,3 @@
+
+- $DEV_NAME = `./dvbnet -a $ADAPTER -n $NETDEV -p $PID | grep created`;
++ $DEV_NAME = `dvbnet -a $ADAPTER -n $NETDEV -p $PID | grep created`;
+ chop($DEV_NAME);
+diff -NarU1 linuxtv-dvb-apps-1.1.0.orig/util/dvbnet/net_start.sh linuxtv-dvb-apps-1.1.0/util/dvbnet/net_start.sh
+--- linuxtv-dvb-apps-1.1.0.orig/util/dvbnet/net_start.sh 2004-01-17 18:59:46.000000000 +0200
++++ linuxtv-dvb-apps-1.1.0/util/dvbnet/net_start.sh 2004-10-05 00:13:40.047815421 +0300
+@@ -6,3 +6,3 @@
+
+-./dvbnet -p $PID
++dvbnet -p $PID
+
+diff -NarU1 linuxtv-dvb-apps-1.1.0.orig/util/scan/README linuxtv-dvb-apps-1.1.0/util/scan/README
+--- linuxtv-dvb-apps-1.1.0.orig/util/scan/README 2004-01-17 18:59:46.000000000 +0200
++++ linuxtv-dvb-apps-1.1.0/util/scan/README 2004-10-05 00:12:40.032659359 +0300
+@@ -9,8 +9,9 @@
+
+-Basic usage: ./scan dvb-s/Astra-19.2E | tee mychannels.conf
++Basic usage:
++scandvb /usr/share/dvb-apps/dvb-s/Astra-19.2E | tee mychannels.conf
+
+ If you want it to check a specific frequency, tune to that frequency
+-(e.g. using szap/tzap/czap) and then use './scan -c'.
++(e.g. using szap/tzap/czap) and then use 'scandvb -c'.
+
+-For more scan options see ./scan -h.
++For more scandvb options see 'scandvb -h'.
+
+diff -NarU1 linuxtv-dvb-apps-1.1.0.orig/util/szap/README linuxtv-dvb-apps-1.1.0/util/szap/README
+--- linuxtv-dvb-apps-1.1.0.orig/util/szap/README 2004-01-25 21:23:39.000000000 +0200
++++ linuxtv-dvb-apps-1.1.0/util/szap/README 2004-10-05 00:12:40.033659116 +0300
+@@ -7,3 +7,3 @@
+
+-$ ./szap -c channels.conf-dvbs-astra n24
++$ szap -c /usr/share/doc/dvb-apps-*/channels.conf-dvbs-astra n24
+
+@@ -11,3 +11,3 @@
+
+-$ ./czap -c channels.conf-dvbc-berlin Arte
++$ czap -c /usr/share/doc/dvb-apps-*/channels.conf-dvbc-berlin Arte
+
+@@ -15,3 +15,3 @@
+
+-$ ./czap -c channels.conf-dvbt-berlin phoenix
++$ tzap -c /usr/share/doc/dvb-apps-*/channels.conf-dvbt-berlin phoenix
+
+@@ -21,3 +21,3 @@
+
+-$ ./czap -c channels.conf-dvbt-berlin phoenix -r
++$ czap -c /usr/share/doc/dvb-apps-*/channels.conf-dvbt-berlin phoenix -r
+ [keep it running in one console]
Added: branches/rpms/brian/dvb-apps/dvb-apps-tuningfiles-snapshot.sh
===================================================================
--- branches/rpms/brian/dvb-apps/dvb-apps-tuningfiles-snapshot.sh (rev 0)
+++ branches/rpms/brian/dvb-apps/dvb-apps-tuningfiles-snapshot.sh 2008-06-09 23:04:09 UTC (rev 6349)
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+set -e
+
+tmp=$(mktemp -d)
+
+trap cleanup EXIT
+cleanup() {
+ set +e
+ [ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp"
+}
+
+unset CDPATH
+pwd=$(pwd)
+now=$(date +%Y%m%d)
+
+cd "$tmp"
+hg clone http://linuxtv.org/hg/dvb-apps
+cd dvb-apps
+tar jcf "$pwd"/dvb-apps-tuningfiles-$now.tar.bz2 util/scan/{atsc,dvb-?}
+cd ..
+cd - >/dev/null
Property changes on: branches/rpms/brian/dvb-apps/dvb-apps-tuningfiles-snapshot.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: branches/rpms/brian/dvb-apps/dvb-apps.spec
===================================================================
--- branches/rpms/brian/dvb-apps/dvb-apps.spec (rev 0)
+++ branches/rpms/brian/dvb-apps/dvb-apps.spec 2008-06-09 23:04:09 UTC (rev 6349)
@@ -0,0 +1,122 @@
+Name: dvb-apps
+Version: 1.1.1
+Release: 7%{?dist}
+Summary: Utility, demo and test applications using the Linux DVB API
+
+Group: Applications/Multimedia
+License: GPL
+URL: http://www.linuxtv.org/wiki/index.php/LinuxTV_dvb-apps
+Source0: http://www.linuxtv.org/downloads/linuxtv-dvb-apps-%{version}.tar.bz2
+# Source1 created with Source99
+Source1: %{name}-tuningfiles-20060923.tar.bz2
+Source2: http://www.gnu.org/licenses/COPYING
+Source99: %{name}-tuningfiles-snapshot.sh
+Patch0: %{name}-optflags.patch
+Patch1: %{name}-paths.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires: libusb-devel
+BuildRequires: kernel-headers >= 2.6.16
+
+%description
+%{summary}.
+
+
+%prep
+%setup -q -n linuxtv-%{name}-%{version} -a 1
+%patch0 -p1
+%patch1 -p1
+cd util
+install -pm 644 av7110_loadkeys/README ../README.av7110_loadkeys
+install -pm 644 scan/README ../README.scandvb
+install -pm 644 szap/README ../README.szap
+install -pm 644 ttusb_dec_reset/README ../README.ttusb_dec_reset
+chmod 644 dvbnet/net_start.* scan/{atsc,dvb-?}/*
+mv scan/dvb-t/fr-Alen?on scan/dvb-t/fr-Alençon
+mv scan/dvb-t/fr-Besan?on scan/dvb-t/fr-Besançon
+for f in scan/{atsc,dvb-?}/* ; do
+ file $f | grep -q CRLF && sed -i -e 's/\r//' $f
+ file $f | grep -q ISO-8859 && \
+ iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 && mv $f.utf8 $f
+done
+cd ..
+rm -rf include
+install -pm 644 %{SOURCE2} COPYING
+
+
+%build
+make CC="%{__cc}" # %{?_smp_mflags}
+make %{?_smp_mflags} CC="%{__cc}" -C util/ttusb_dec_reset
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+cd util
+install -dm 755 $RPM_BUILD_ROOT%{_bindir}
+install -pm 755 av7110_loadkeys/av7110_loadkeys $RPM_BUILD_ROOT%{_bindir}
+install -pm 755 av7110_loadkeys/evtest $RPM_BUILD_ROOT%{_bindir}/av7110_evtest
+install -pm 755 dvbdate/dvbdate $RPM_BUILD_ROOT%{_bindir}
+install -pm 755 dvbnet/dvbnet $RPM_BUILD_ROOT%{_bindir}
+install -pm 755 dvbtraffic/dvbtraffic $RPM_BUILD_ROOT%{_bindir}
+install -pm 755 scan/scan $RPM_BUILD_ROOT%{_bindir}/scandvb
+install -pm 755 szap/?zap $RPM_BUILD_ROOT%{_bindir}
+install -pm 755 szap/femon $RPM_BUILD_ROOT%{_bindir}
+install -pm 755 ttusb_dec_reset/ttusb_dec_reset $RPM_BUILD_ROOT%{_bindir}
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/dvb-apps
+cp -pR scan/dvb-? scan/atsc av7110_loadkeys/*.rc{5,mm} \
+ $RPM_BUILD_ROOT%{_datadir}/dvb-apps
+cd ..
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%files
+%defattr(-,root,root,-)
+%doc COPYING README* TODO util/dvbnet/net_start.* util/szap/channels.conf-dvb*
+%{_bindir}/*
+%{_datadir}/dvb-apps/
+
+
+%changelog
+* Mon Oct 2 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.1.1-7
+- Rebuild.
+
+* Sat Sep 23 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.1.1-6
+- Include updated set of initial tuning data files from upstream hg (#203328).
+
+* Tue Aug 29 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.1.1-5
+- Rebuild.
+
+* Thu May 18 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.1.1-4
+- Include ATSC initial tuning data files.
+
+* Thu May 18 2006 David Woodhouse <dwmw2 at infradead.org> - 1.1.1-2
+- Rebuild (to unfix kernel-headers on older distros)
+
+* Thu May 18 2006 David Woodhouse <dwmw2 at infradead.org> - 1.1.1-1
+- Update to dvb-apps 1.1.1 (add ATSC functionality)
+- Fix kernel-headers BR
+
+* Tue Feb 21 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.1.0-2
+- Rebuild.
+
+* Sun Jul 17 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.1.0-1
+- Include a copy of the GPL.
+
+* Thu Jun 30 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.1.0-0.4
+- Update URL.
+
+* Sun May 29 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.1.0-0.3
+- Rebuild for FC4.
+
+* Wed Apr 20 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.1.0-0.2
+- Switch to recent glibc-kernheaders which includes userspace DVB headers.
+
+* Sun Dec 26 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:1.1.0-0.1
+- Remove unnecessary Epochs.
+
+* Mon Oct 4 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:1.1.0-0.scop.1
+- First build, loosely based on Mandrake's 1.1.0-4mdk.
+
Added: branches/rpms/brian/libdvb/errno.patch
===================================================================
--- branches/rpms/brian/libdvb/errno.patch (rev 0)
+++ branches/rpms/brian/libdvb/errno.patch 2008-06-09 23:04:09 UTC (rev 6349)
@@ -0,0 +1,8 @@
+--- libdvb/DVB.cc 2004-09-15 20:56:21.000000000 +0200
++++ libdvb-korr/DVB.cc 2004-12-23 21:07:54.329614000 +0100
+@@ -1,4 +1,5 @@
+ #include <DVB.hh>
++#include <errno.h>
+
+ static const fe_code_rate_t ftab [8] = {
+ FEC_AUTO, FEC_1_2, FEC_2_3, FEC_3_4,
Added: branches/rpms/brian/libdvb/libdvb-0.5.5-gentoo.patch
===================================================================
--- branches/rpms/brian/libdvb/libdvb-0.5.5-gentoo.patch (rev 0)
+++ branches/rpms/brian/libdvb/libdvb-0.5.5-gentoo.patch 2008-06-09 23:04:09 UTC (rev 6349)
@@ -0,0 +1,33 @@
+--- Makefile_orig 2004-12-06 17:04:49.186749080 +0000
++++ Makefile 2004-12-06 17:10:31.217752464 +0000
+@@ -11,7 +11,7 @@
+
+
+
+-main: $(DVB_LIBS) $(TEST_PROGS) $(DVB-MPEGTOOLS)
++main: $(DVB_LIBS) $(DVB-MPEGTOOLS)
+
+ install: $(DVB_LIBS) $(HEADERS)
+ mkdir -p $(DESTDIR)$(PREFIX)/lib
+--- config.mk_orig 2004-12-06 17:12:20.200184616 +0000
++++ config.mk 2004-12-06 17:12:29.086833640 +0000
+@@ -1,7 +1,7 @@
+ # -*- makefile -*-
+ #
+
+-PREFIX = /usr/local
++PREFIX = /usr
+ VERSION = 0.5.5
+ CFLAGS=-O2 -Wall -g
+ INCLUDES=-I. -I../include -I../../include
+--- dvb-mpegtools/Makefile_orig 2004-12-06 17:19:58.700481976 +0000
++++ dvb-mpegtools/Makefile 2004-12-06 17:21:30.398541752 +0000
+@@ -62,7 +62,7 @@
+ install -m 755 dvb-mpegtools_main $(DESTDIR)$(PREFIX)/bin/
+ install -m 755 dvbaudio $(DESTDIR)$(PREFIX)/bin/
+ install -m 755 show_dvb_image $(DESTDIR)$(PREFIX)/bin/
+- install -m 755 dia $(DESTDIR)$(PREFIX)/bin/
++ install -m 755 dia $(DESTDIR)$(PREFIX)/bin/dia_dvb
+ for f in $(LINKS); do\
+ (cd $(DESTDIR)$(PREFIX)/bin && ln -s -f dvb-mpegtools_main $$f) ;\
+ done
Added: branches/rpms/brian/libdvb/libdvb.spec
===================================================================
--- branches/rpms/brian/libdvb/libdvb.spec (rev 0)
+++ branches/rpms/brian/libdvb/libdvb.spec 2008-06-09 23:04:09 UTC (rev 6349)
@@ -0,0 +1,65 @@
+Distribution: CCux
+Packager: Stefan Gottwald <gotti at ccux-linux.de>
+
+Summary: libdvb package with added CAM library and libdvbmpegtools as well as dvb-mpegtools.
+Name: libdvb
+Version: 0.5.5
+Release: 2
+Provides: %{name}
+License: GPL
+URL: http://www.metzlerbros.org/dvb
+Group: System/Libraries
+Source0: %{name}-%{version}.tar.gz
+Patch0: libdvb-0.5.5-gentoo.patch
+Patch1: errno.patch
+BuildRoot: %{_tmppath}/%{name}-buildroot
+Requires: linuxdvb
+
+%description
+libdvb package with added CAM library and libdvbmpegtools as well as dvb-mpegtools
+
+%package devel
+Summary: %{name} development headers.
+Group: %{group}
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+Header and include files for developing applications with %{name}.
+
+%prep
+%setup -n %{name}-%{version}
+%patch0
+%patch1
+sed -i "s#-I../../include#-I../../include\ -I/lib/modules/`uname -r`/build/include#" config.mk
+
+%build
+make
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make DESTDIR=$RPM_BUILD_ROOT PREFIX=%_prefix install
+mkdir -p %{buildroot}/%{_datadir}/doc/%{name}-doc-%{version}/{sample_progs,samplerc}
+cp sample_progs/* %{buildroot}/%{_datadir}/doc/%{name}-doc-%{version}/sample_progs/
+cp samplerc/* %{buildroot}/%{_datadir}/doc/%{name}-doc-%{version}/samplerc/
+cp README %{buildroot}/%{_datadir}/doc/%{name}-doc-%{version}/README
+find %{buildroot} -type f \
+-exec /usr/bin/strip --strip-debug '{}' ';'
+
+%files
+%defattr(-,root,root)
+%{_datadir}/doc/%{name}-doc-%{version}
+%_bindir/*
+
+%files devel
+%defattr(-,root,root)
+%_includedir
+%_libdir/*.a
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%changelog
+* Sun Jul 25 2005 Christian Metzen <metzench at ccux-linux.de> 0.5.5-2
+- Tweaked specfile, removed doc package
+* Sat Jun 18 2005 Stefan Gottwald <gotti at ccux-linux.de> 0.5.5-1
+- Initial Release
Added: branches/rpms/brian/novi/novi.spec
===================================================================
--- branches/rpms/brian/novi/novi.spec (rev 0)
+++ branches/rpms/brian/novi/novi.spec 2008-06-09 23:04:09 UTC (rev 6349)
@@ -0,0 +1,144 @@
+## ------------------------------------------------------------
+## stub RPM spec file for novi.
+## There's a chicken-and-egg scenario concerning spec files and
+## autoconf; this file is generated by autoconf and the maintainer
+## (manually) copies it over to novi.spec for automated rebuilding
+## via "rpmbuild -t."
+## We use autoconf to generate this file as a convenience, to make
+## sure the version numbers and such are (automatically) updated
+## with every release.
+## ------------------------------------------------------------
+
+%define product_name novi
+%define product_version 1.1.7
+%define rpm_release 1
+
+%define product_nameversion %{product_name}-%{product_version}
+%define product_source_dir %{product_nameversion}
+%define product_tarball %{product_nameversion}.tar.bz2
+
+## CUSTOM RPM BUILDERS: change this macro to move novi's install path.
+%define install_prefix /usr
+%define doc_dir %{install_prefix}/share/doc/%{product_nameversion}
+
+BuildRoot: %{_tmppath}/%{product_nameversion}-build-root-xxxxx
+
+BuildRequires: beecrypt-devel
+BuildRequires: elfutils-devel
+BuildRequires: elfutils-libelf-devel
+BuildRequires: expat-devel
+BuildRequires: libselinux-devel
+BuildRequires: popt
+BuildRequires: rpm-devel
+BuildRequires: rpm-libs
+BuildRequires: zlib-devel
+
+## ------------------------------------------------------------
+
+Name: %{product_name}
+Version: %{product_version}
+Release: %{rpm_release}
+License: Apache 2.0
+URL: http://www.ExMachinaTech.net
+Vendor: Ethan McCallum, ExMachinaTech.net
+Source0: %{product_tarball}
+
+Group: Utilities
+
+Summary: find the latest-version RPMs in a tree
+
+%description
+
+novi searches directories for the latest-version RPMs of each product.
+
+In turn, this data can be used to:
+
+- see what are the latest RPMs on your system
+
+- fold the latest RPMs into a Kickstart tree, such that you can
+ build systems with the updates already applied
+
+This process is described in much greater (and better) detail in the
+following article on the O'Reilly Network:
+
+"Pre-Patched Kickstart Installs"
+http://www.linuxdevcenter.com/pub/a/linux/2005/02/17/kickstart_updates.html
+
+## ------------------------------------------------------------
+
+%prep
+
+umask 022
+cd ${RPM_BUILD_DIR}
+rm -rf ${RPM_BUILD_DIR}/%{product_nameversion}
+tar jxf ${RPM_SOURCE_DIR}/%{product_tarball}
+
+cd %{product_source_dir}
+
+./configure --prefix=%{install_prefix}
+
+
+## ------------------------------------------------------------
+
+%build
+umask 022
+
+cd ${RPM_BUILD_DIR}/%{product_source_dir}
+
+make
+
+## ------------------------------------------------------------
+
+%install
+umask 022
+
+## RPM_BUILD_ROOT is created for us by RPM.
+## if it already exists, the build process will fail
+rm -rf ${RPM_BUILD_ROOT}
+
+cd ${RPM_BUILD_DIR}/%{product_source_dir}
+
+make install ALT_ROOT_DIR=${RPM_BUILD_ROOT}
+
+mkdir -p ${RPM_BUILD_ROOT}/%{doc_dir}
+
+for FILE in EXAMPLES.TXT FAQ.TXT INSTALL.TXT LICENSE README.TXT WISHLIST.TXT doc/novi.1.html doc/novi_examples.1.html ; do
+ cp ${FILE} ${RPM_BUILD_ROOT}/%{doc_dir}
+done
+
+## ------------------------------------------------------------
+
+%clean
+rm -rf ${RPM_BUILD_ROOT}
+
+## ------------------------------------------------------------
+
+%files
+
+%defattr( 0444 , root , root )
+
+%dir %attr( - , root , root ) %{install_prefix}
+
+%dir %attr( - , root , root ) %{install_prefix}/bin
+ %attr( 0555 , root , root ) %{install_prefix}/bin/novi
+
+%dir %attr( - , root , root ) %{install_prefix}/man
+
+%dir %attr( - , root , root ) %{install_prefix}/man/man1
+ %attr( 0444 , root , root ) %{install_prefix}/man/man1/novi.1.gz
+ %attr( 0444 , root , root ) %{install_prefix}/man/man1/novi_examples.1.gz
+
+%dir %attr( 0555 , root , root ) %{doc_dir}
+ %attr( 0444 , root , root ) %{doc_dir}/EXAMPLES.TXT
+ %attr( 0444 , root , root ) %{doc_dir}/FAQ.TXT
+ %attr( 0444 , root , root ) %{doc_dir}/INSTALL.TXT
+ %attr( 0444 , root , root ) %{doc_dir}/LICENSE
+ %attr( 0444 , root , root ) %{doc_dir}/README.TXT
+ %attr( 0444 , root , root ) %{doc_dir}/WISHLIST.TXT
+ %attr( 0444 , root , root ) %{doc_dir}/novi.1.html
+ %attr( 0444 , root , root ) %{doc_dir}/novi_examples.1.html
+
+
+## ------------------------------------------------------------
+
+## EOF novi.spec
Added: branches/rpms/brian/nozomi/chap-secrets
===================================================================
--- branches/rpms/brian/nozomi/chap-secrets (rev 0)
+++ branches/rpms/brian/nozomi/chap-secrets 2008-06-09 23:04:09 UTC (rev 6349)
@@ -0,0 +1 @@
+"BASE" * "internet"
Added: branches/rpms/brian/nozomi/ifcfg-umts
===================================================================
--- branches/rpms/brian/nozomi/ifcfg-umts (rev 0)
+++ branches/rpms/brian/nozomi/ifcfg-umts 2008-06-09 23:04:09 UTC (rev 6349)
@@ -0,0 +1,23 @@
+IPV6INIT=no
+ONBOOT=no
+USERCTL=yes
+PEERDNS=yes
+TYPE=Modem
+DEVICE=ppp0
+BOOTPROTO=dialup
+LINESPEED=460800
+MODEMPORT=/dev/noz0
+IDLETIMEOUT=600
+PROVIDER=umts
+DEFROUTE=yes
+PERSIST=no
+WVDIALSECT=umts
+MODEMNAME=ModemUMTS
+DEMAND=no
+PAPNAME=BASE
+AC=off
+BSDCOMP=off
+VJCCOMP=off
+CCP=off
+PC=off
+VJ=off
Added: branches/rpms/brian/nozomi/nozomi.spec
===================================================================
--- branches/rpms/brian/nozomi/nozomi.spec (rev 0)
+++ branches/rpms/brian/nozomi/nozomi.spec 2008-06-09 23:04:09 UTC (rev 6349)
@@ -0,0 +1,83 @@
+Summary: Nozomi 3G PCMCIA driver
+Name: nozomi
+Version: 2.2
+Release: 1.bs%{?dist}
+Epoch: 1
+License: GPL
+Group: System Environment/Kernel
+Packager: Brian Schueler <brian.schueler at gmx.de>
+URL: http://www.pharscape.org
+
+Source0: http://unspecified/nozomi-%{version}.tar.gz
+Source1: umts
+Source2: wvdial-umts.conf
+Source3: ifcfg-umts
+Source4: umts-interface
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildArch: noarch
+Requires: dkms gcc make wvdial kernel-devel >= 2.6.9
+BuildRequires(post): dkms gcc make
+BuildRequires(preun): dkms gcc make
+
+%description
+This Package includes a driver for UMTS 3G PCMCIA cards sold by Option
+
+%prep
+%setup %{Source0}
+
+%build
+
+%install
+%{__install} -D -m 0600 %{SOURCE1} %{buildroot}/%{_sysconfdir}/ppp/peers/umts
+%{__install} -D -m 0600 %{SOURCE2} %{buildroot}/%{_sysconfdir}/wvdial-umts.conf
+%{__install} -D -m 0755 %{SOURCE3} %{buildroot}/%{_sysconfdir}/sysconfig/network-scripts/ifcfg-umts
+%{__install} -D -m 0755 %{SOURCE4} %{buildroot}/%{_sysconfdir}/rc.d/init.d/umts-interface
+
+
+%define dkms_name nozomi
+%define dkms_vers %{version}-%{release}
+%define quiet -q
+
+# Kernel module sources install for dkms
+%{__mkdir_p} %{buildroot}%{_usrsrc}/%{dkms_name}-%{dkms_vers}/
+%{__cp} -a ../%{dkms_name}-%{version}/* %{buildroot}%{_usrsrc}/%{dkms_name}-%{dkms_vers}/
+
+# Configuration for dkms
+%{__cat} > %{buildroot}%{_usrsrc}/%{dkms_name}-%{dkms_vers}/dkms.conf << 'EOF'
+MAKE[0]="make clean && make"
+PACKAGE_NAME=%{dkms_name}
+PACKAGE_VERSION=%{dkms_vers}
+BUILT_MODULE_NAME[0]=%{dkms_name}
+BUILT_MODULE_LOCATION[0]=.
+DEST_MODULE_LOCATION[0]=/kernel/drivers/net
+AUTOINSTALL="YES"
+EOF
+
+### Clean up buildroot
+%clean
+%{__rm} -rf %{buildroot}
+
+
+%post
+# Add to DKMS registry
+dkms add -m %{dkms_name} -v %{dkms_vers} %{?quiet} || :
+# Rebuild and make available for the currenty running kernel
+dkms build -m %{dkms_name} -v %{dkms_vers} %{?quiet} || :
+dkms install -m %{dkms_name} -v %{dkms_vers} %{?quiet} --force || :
+
+%preun
+# Remove all versions from DKMS registry
+dkms remove -m %{dkms_name} -v %{dkms_vers} %{?quiet} --all || :
+
+
+%files
+%defattr(-, root, root, 0755)
+%config(noreplace) %{_sysconfdir}/ppp/peers/umts
+%config(noreplace) %{_sysconfdir}/wvdial-umts.conf
+%{_usrsrc}/%{dkms_name}-%{dkms_vers}/
+%{_sysconfdir}/sysconfig/network-scripts/ifcfg-umts
+%{_sysconfdir}/rc.d/init.d/umts-interface
+
+%changelog
+* Thu Aug 27 2