SPECS: dLAN.spec - license upgrade - NoSource: 0 - build fix (now ...

shadzik shadzik at pld-linux.org
Thu May 4 23:17:29 CEST 2006


Author: shadzik                      Date: Thu May  4 21:17:29 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- license upgrade
- NoSource: 0
- build fix (now it really builds)
- adapterized

---- Files affected:
SPECS:
   dLAN.spec (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SPECS/dLAN.spec
diff -u SPECS/dLAN.spec:1.3 SPECS/dLAN.spec:1.4
--- SPECS/dLAN.spec:1.3	Thu May  4 03:57:43 2006
+++ SPECS/dLAN.spec	Thu May  4 23:17:24 2006
@@ -11,10 +11,11 @@
 Name:		dLAN
 Version:	2.0
 Release:	1
-License:	Devolo AG License
+License:	Devolo AG License, non-distributable
 Group:		Applications
 Source0:	http://download.devolo.net/webcms/0599755001130248395/%{name}-linux-package-%{version}.tar.gz
-# Source0-md5:	419b5e551a7e8eb7e2f609b252287712
+# NoSource0-md5:	419b5e551a7e8eb7e2f609b252287712
+NoSource:	0
 Patch0:		%{name}-usbkill.patch
 URL:		http://www.devolo.de/de_DE/index.html
 BuildRequires:	%{kgcc_package}
@@ -109,8 +110,6 @@
 done
 %endif
 
-%endif
-
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT
@@ -121,21 +120,12 @@
 %endif
 
 %if %{with kernel}
-%if %{without dist_kernel}
-for mod in *-nondist.ko; do
-        nmod=$(echo "$mod" | sed -e 's#-nondist##g')
-        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')
-        install $mod $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/$nmod
-done
-%if %{with smp}
-for mod in *-smp.ko; do
-        nmod=$(echo "$mod" | sed -e 's#-smp##g')
-        install $mod $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/$nmod
-done
+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
+%if %{with smp} && %{with dist_kernel}
+install driver/devolo_usb-smp.ko \
+                $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/devolo_usb.ko
 %endif
 %endif
 
@@ -175,6 +165,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2006/05/04 21:17:24  shadzik
+- license upgrade
+- NoSource: 0
+- build fix (now it really builds)
+- adapterized
+
 Revision 1.3  2006/05/04 01:57:43  shadzik
 - new way of kernel module building
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/dLAN.spec?r1=1.3&r2=1.4&f=u



More information about the pld-cvs-commit mailing list