Author: qboosh Date: Wed May 10 18:04:18 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- unified
---- Files affected:
SPECS:
dLAN.spec (1.4 -> 1.5)
---- Diffs:
================================================================
Index: SPECS/dLAN.spec
diff -u SPECS/dLAN.spec:1.4 SPECS/dLAN.spec:1.5
--- SPECS/dLAN.spec:1.4 Thu May 4 23:17:24 2006
+++ SPECS/dLAN.spec Wed May 10 20:04:13 2006
@@ -1,10 +1,13 @@
# $Revision$, $Date$
+# TODO: optflags for userspace
+#
+# Conditional build:
%bcond_without dist_kernel # without kernel from distribution
%bcond_without kernel # don't build kernel modules
%bcond_without smp # don't build SMP module
%bcond_without userspace # don't build userspace module
%bcond_with verbose # verbose build (V=1)
-
+#
Summary: dLAN drivers
Summary(de): dLAN Treiber
Summary(pl): Sterowniki dLAN
@@ -18,12 +21,14 @@
NoSource: 0
Patch0: %{name}-usbkill.patch
URL: http://www.devolo.de/de_DE/index.html
+%if %{with kernel}
BuildRequires: %{kgcc_package}
%{?with_dist_kernel:BuildRequires: kernel-module-build}
+%endif
+%if %{with userspace}
BuildRequires: libpcap-devel
+%endif
BuildRequires: rpmbuild(macros) >= 1.268
-Requires(post,preun): /sbin/chkconfig
-Requires: rc-scripts
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -33,7 +38,7 @@
MicroLink dLAN Treiber für Linux 2.4/2.6.
%description -l pl
-Sterowniki MicroLink dLAN dla linuksa 2.4/2.6.
+Sterowniki MicroLink dLAN dla Linuksa 2.4/2.6.
%package -n kernel-char-dLAN
Summary: Linux kernel driver for MicroLink dLAN
@@ -85,28 +90,28 @@
# kernel module(s)
cd driver
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
- %{__make} -C %{_kernelsrcdir} O=$PWD/o prepare scripts
- %{__make} -C %{_kernelsrcdir} clean \
- RCS_FIND_IGNORE="-name '*.ko' -o" \
- M=$PWD O=$PWD/o \
- %{?with_verbose:V=1}
- %{__make} -C %{_kernelsrcdir} modules \
+ 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
+ %{__make} -C %{_kernelsrcdir} O=$PWD/o prepare scripts
+ %{__make} -C %{_kernelsrcdir} clean \
+ RCS_FIND_IGNORE="-name '*.ko' -o" \
+ M=$PWD O=$PWD/o \
+ %{?with_verbose:V=1}
+ %{__make} -C %{_kernelsrcdir} modules \
%if "%{_target_base_arch}" != "%{_arch}"
- ARCH=%{_target_base_arch} \
- CROSS_COMPILE=%{_target_base_cpu}-pld-linux- \
+ ARCH=%{_target_base_arch} \
+ CROSS_COMPILE=%{_target_base_cpu}-pld-linux- \
%endif
- HOSTCC="%{__cc}" \
- CPP="%{__cpp}" \
- M=$PWD O=$PWD/o \
- %{?with_verbose:V=1}
- mv devolo_usb{,-$cfg}.ko
+ HOSTCC="%{__cc}" \
+ CPP="%{__cpp}" \
+ M=$PWD O=$PWD/o \
+ %{?with_verbose:V=1}
+ mv devolo_usb{,-$cfg}.ko
done
%endif
@@ -122,10 +127,10 @@
%if %{with kernel}
install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc
install
driver/devolo_usb-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
- $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/devolo_usb.ko
+ $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/devolo_usb.ko
%if %{with smp} && %{with dist_kernel}
install driver/devolo_usb-smp.ko \
-
$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/devolo_usb.ko
+ $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/devolo_usb.ko
%endif
%endif
@@ -165,6 +170,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.5 2006/05/10 18:04:13 qboosh
+- unified
+
Revision 1.4 2006/05/04 21:17:24 shadzik
- license upgrade
- NoSource: 0
@@ -184,4 +192,3 @@
Revision 1.1 2006/05/04 00:40:37 shadzik
- new
- probably needs fixing
-
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/dLAN.spec?r1=1.4&r2=1.5&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
