X-Git-Url: http://git.pld-linux.org/?p=packages%2Fbtsco.git;a=blobdiff_plain;f=btsco.spec;h=b9d3fa5a9711bca398a5a2ee262ae50f82e24bc8;hp=fb219f9a8d1abc71ef87f256a1d9ca51472df56f;hb=2a2503bf0889dd1bf1c897acca4a5c4e33ca44b7;hpb=0c774113d58f138820bc507b6f4fb121f20d01ad

diff --git a/btsco.spec b/btsco.spec
index fb219f9..b9d3fa5 100644
--- a/btsco.spec
+++ b/btsco.spec
@@ -3,23 +3,23 @@
 %bcond_without	dist_kernel	# without kernel from distribution
 %bcond_without	kernel		# don't build kernel modules
 %bcond_without	userspace	# don't build userspace utilities
-%bcond_without	smp		# don't build SMP module
 %bcond_with	verbose		# verbose build (V=1)
 #
-%define	rel	2
+%define		rel	27
 Summary:	Bluetooth-alsa Project
-Summary(pl):	Projekt Bluetooth-alsa
+Summary(pl.UTF-8):	Projekt Bluetooth-alsa
 Name:		btsco
-Version:	0.41
+Version:	0.5
 Release:	%{rel}
 License:	GPL
 Group:		Applications/Sound
-Source0:	http://dl.sourceforge.net/bluetooth-alsa/%{name}-%{version}.tar.gz
-# Source0-md5:	111efb0f7092c92c4dd376eec96aa2e7
+Source0:	http://dl.sourceforge.net/bluetooth-alsa/%{name}-%{version}.tgz
+# Source0-md5:	d9fdd63a9e22ba839a41c8a9b89c2dda
 Patch0:		%{name}-readme-pl.diff
+Patch1:		%{name}-kernel.patch
 URL:		http://sourceforge.net/projects/bluetooth-alsa/
 %if %{with kernel}
-%{?with_dist_kernel:BuildRequires:	kernel-module-build}
+%{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.20.2}
 %endif
 %if %{with userspace}
 BuildRequires:	alsa-driver-devel >= 1.0.9-1
@@ -29,6 +29,7 @@ BuildRequires:	automake
 BuildRequires:	bluez-libs-devel >= 2.21-1
 BuildRequires:	libao-devel >= 0.8.6-1
 BuildRequires:	libtool
+BuildRequires:	rpmbuild(macros) >= 1.379
 %endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -38,101 +39,50 @@ do this currently by making an alsa kernel driver which uses bluez to
 reach the headset. It works well enough now to get voice-quality audio
 to and from most headsets.
 
-%description -l pl
-Dziêki temu oprogramowaniu mo¿na u¿ywaæ zestawów s³uchawkowych
-Bluetooth Headset z Linuksem. Osi±gniêto to dziêki zbudowaniu alsowego
-modu³u do j±dra, który to u¿ywa systemu bluez do komunikacji z takim
-zestawem. Wspó³pracuje z wiêkszo¶ci± zestawów, ograniczeniem w
-komunikacji jest czêsto urz±dzenie USB, które to mo¿e mieæ
-nieobs³ugiwane czê¶ciowo protoko³y, wskazówka: hciconfig hciXXX
-revision. W skrajnym wypadku mo¿na próbowaæ u¿yæ innego urz±dzenia
+%description -l pl.UTF-8
+Dzięki temu oprogramowaniu można używać zestawów słuchawkowych
+Bluetooth Headset z Linuksem. Osiągnięto to dzięki zbudowaniu alsowego
+modułu do jądra, który to używa systemu bluez do komunikacji z takim
+zestawem. Współpracuje z większością zestawów, ograniczeniem w
+komunikacji jest często urządzenie USB, które to może mieć
+nieobsługiwane częściowo protokoły, wskazówka: hciconfig hciXXX
+revision. W skrajnym wypadku można próbować użyć innego urządzenia
 USB.
 
-%package -n kernel-char-btsco
+%package -n kernel%{_alt_kernel}-char-btsco
 Summary:	Linux ALSA kernel driver for Bluetooth Headset
-Summary(pl):	Sterownik ALSA do j±dra Linuksa dla Bluetooth Headset
+Summary(pl.UTF-8):	Sterownik ALSA do jądra Linuksa dla Bluetooth Headset
 Release:	%{rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
-%{?with_dist_kernel:%requires_releq_kernel_up}
+%{?with_dist_kernel:%requires_releq_kernel}
 Requires(post,postun):	/sbin/depmod
-Requires:	kernel-sound-alsa
+Requires:	kernel%{_alt_kernel}-sound-alsa
 
-%description -n kernel-char-btsco
+%description -n kernel%{_alt_kernel}-char-btsco
 Linux ALSA kernel driver for Bluetooth Headset named snd_bt_sco.
 
-%description -n kernel-char-btsco -l pl
-Sterownik ALSA do j±dra Linuksa dla Bluetooth Headset o nazwie
-snd_bt_sco.
-
-%package -n kernel-smp-char-btsco
-Summary:	Linux ALSA kernel driver for Bluetooth Headset (SMP)
-Summary(pl):	Sterownik ALSA do j±dra Linuksa dla Bluetooth Headset (SMP)
-Release:	%{rel}@%{_kernel_ver_str}
-Group:		Base/Kernel
-%{?with_dist_kernel:%requires_releq_kernel_smp}
-Requires(post,postun):	/sbin/depmod
-Requires:	kernel-smp-sound-alsa
-
-%description -n kernel-smp-char-btsco
-Linux ALSA kernel (SMP) driver for Bluetooth Headset named snd_bt_sco.
-
-%description -n kernel-smp-char-btsco -l pl
-Sterownik ALSA do j±dra Linuksa SMP dla Bluetooth Headset o nazwie
+%description -n kernel%{_alt_kernel}-char-btsco -l pl.UTF-8
+Sterownik ALSA do jądra Linuksa dla Bluetooth Headset o nazwie
 snd_bt_sco.
 
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %if %{with userspace}
+%{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %{__autoheader}
 %{__automake}
 %configure
-
 %{__make}
 %endif
 
 %if %{with kernel}
-cd kernel
-# kernel module(s)
-for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}; do
-	if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
-		exit 1
-	fi
-	install -d o/include/linux
-	ln -sf %{_kernelsrcdir}/config-$cfg o/.config
-	ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers
-	ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h o/include/linux/autoconf.h
-%if %{with dist_kernel}
-	%{__make} -C %{_kernelsrcdir} O=$PWD/o prepare scripts
-%else
-	install -d o/include/config
-	touch o/include/config/MARKER
-	ln -sf %{_kernelsrcdir}/scripts o/scripts
-%endif
-
-	# patching/creating makefile(s) (optional)
-	%{__make} -C %{_kernelsrcdir} clean \
-		RCS_FIND_IGNORE="-name '*.ko' -o" \
-		SYSSRC=%{_kernelsrcdir} \
-		SYSOUT=$PWD/o \
-		M=$PWD O=$PWD/o \
-		%{?with_verbose:V=1}
-	%{__make} -C %{_kernelsrcdir} modules \
-		CC="%{__cc}" CPP="%{__cpp}" \
-		SYSSRC=%{_kernelsrcdir} \
-		SYSOUT=$PWD/o \
-		M=$PWD O=$PWD/o \
-		%{?with_verbose:V=1}
-
-	for mod in *.ko; do
-		mod=$(echo "$mod" | sed -e 's#\.ko##g')
-		mv $mod.ko ../$mod-$cfg.ko
-	done
-done
+%build_kernel_modules -m snd-bt-sco -C kernel
 %endif
 
 %install
@@ -147,53 +97,22 @@ done
 %endif
 
 %if %{with kernel}
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc
-	%if %{without dist_kernel}
-	for mod in *-nondist.ko; do
-		nmod=$(echo "$mod" | sed -e 's#-nondist##g')
-		pwd
-		install $mod $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/$nmod
-	done
-	%else
-	for mod in *-up.ko; do
-		nmod=$(echo "$mod" | sed -e 's#-up##g')
-		pwd
-		install $mod $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/$nmod
-	done
-	%endif
-
-	%if %{with smp}
-	for mod in *-smp.ko; do
-		nmod=$(echo "$mod" | sed -e 's#-smp##g')
-		pwd
-		install $mod $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/$nmod
-	done
-	%endif
+%install_kernel_modules -m kernel/snd-bt-sco -d misc
 %endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -n kernel-char-btsco
+%post -n kernel%{_alt_kernel}-char-btsco
 %depmod %{_kernel_ver}
 echo "after install this package, remember add lines like this:"
 echo "alias snd-card-1 snd-bt-sco"
 echo "alias sound-slot-1 snd-bt-sco"
 echo "to %{_sysconfdir}/modprobe.conf"
 
-%postun -n kernel-char-btsco
+%postun -n kernel%{_alt_kernel}-char-btsco
 %depmod %{_kernel_ver}
 
-%post -n kernel-smp-char-btsco
-%depmod %{_kernel_ver}smp
-echo "after install this package, remember add lines like this:"
-echo "alias snd-card-1 snd-bt-sco"
-echo "alias sound-slot-1 snd-bt-sco"
-echo "to %{_sysconfdir}/modprobe.conf"
-
-%postun -n kernel-smp-char-btsco
-%depmod %{_kernel_ver}smp
-
 %if %{with userspace}
 %files
 %defattr(644,root,root,755)
@@ -202,13 +121,7 @@ echo "to %{_sysconfdir}/modprobe.conf"
 %endif
 
 %if %{with kernel}
-%files -n kernel-char-btsco
+%files -n kernel%{_alt_kernel}-char-btsco
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/misc/snd-bt-sco.ko.gz
 %endif
-
-%if %{with smp}
-%files -n kernel-smp-char-btsco
-%defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}smp/misc/snd-bt-sco.ko.gz
-%endif