Author: glen                         Date: Thu Mar  2 17:08:02 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated from template-kernel-module.spec

---- Files affected:
SPECS:
   dazuko.spec (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: SPECS/dazuko.spec
diff -u SPECS/dazuko.spec:1.9 SPECS/dazuko.spec:1.10
--- SPECS/dazuko.spec:1.9       Tue Nov 15 13:27:17 2005
+++ SPECS/dazuko.spec   Thu Mar  2 18:07:56 2006
@@ -7,21 +7,25 @@
 %bcond_without userspace       # don't build userspace module
 %bcond_with    verbose         # verbose build (V=1)
 #
+%if %{without kernel}
+%undefine      with_dist_kernel
+%endif
+#
+%define                _rel    1
 Summary:       Linux Dazuko driver
 Summary(pl):   Sterownik Dazuko dla Linuksa
 Name:          dazuko
 Version:       2.0.6
-%define                _rel    1
 Release:       %{_rel}
 Epoch:         0
 License:       BSD (library), GPL (Linux kernel module)
 Group:         Base/Kernel
-Source0:       http://www.dazuko.org/files/dazuko-%{version}.tar.gz
+Source0:       http://www.dazuko.org/files/%{name}-%{version}.tar.gz
 # Source0-md5: 844498651d22ddd76bea4104bf7c3e43
 URL:           http://www.dazuko.org/
 %if %{with kernel}
 %{?with_dist_kernel:BuildRequires:     kernel-module-build >= 2.6.7}
-BuildRequires: rpmbuild(macros) >= 1.153
+BuildRequires: rpmbuild(macros) >= 1.217
 %endif
 BuildRequires: bash
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -32,8 +36,8 @@
 driver, your system will be able to support file access control
 applications that are based on Dazuko. As this project becomes more
 popular and more applications choose Dazuko for their file access
-needs, it is hoped that this driver will become a common component
-of most systems. 
+needs, it is hoped that this driver will become a common component of
+most systems.
 
 To install the dazuko kernel module install kernel-misc-dazuko or
 kernel-smp-misc-dazuko.
@@ -56,7 +60,7 @@
 Release:       [EMAIL PROTECTED]
 Group:         Base/Kernel
 Requires(post,postun): /sbin/depmod
-%if %{with kernel} && %{with dist_kernel}
+%if %{with dist_kernel}
 %requires_releq_kernel_up
 Requires(postun):      %releq_kernel_up
 %endif
@@ -75,7 +79,7 @@
 Release:       [EMAIL PROTECTED]
 Group:         Base/Kernel
 Requires(post,postun): /sbin/depmod
-%if %{with kernel} && %{with dist_kernel}
+%if %{with dist_kernel}
 %requires_releq_kernel_smp
 Requires(postun):      %releq_kernel_smp
 %endif
@@ -132,8 +136,10 @@
 %build
 # NOTE: It's not autoconf configure.
 bash ./configure \
+       %{?debug:--enable-debug}
        --kernelsrcdir=%{_kernelsrcdir} \
        --disable-local-dpath \
+       --disable-compat1 \
        %{!?with_userspace:--without-library} \
        %{!?with_kernel:--without-module}
 
@@ -142,23 +148,31 @@
        if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
                exit 1
        fi
-       rm -rf include
-       install -d include/{linux,config}
-       ln -sf %{_kernelsrcdir}/config-$cfg .config
-       ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h 
include/linux/autoconf.h
-       ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
-       ln -sf %{_kernelsrcdir}/Module.symvers-$cfg Module.symvers
-       touch include/config/MARKER
+       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" \
-               M=$PWD O=$PWD \
+               SYSSRC=%{_kernelsrcdir} \
+               SYSOUT=$PWD/o \
+               M=$PWD O=$PWD/o \
                %{?with_verbose:V=1}
        %{__make} -C %{_kernelsrcdir} modules \
                CC="%{__cc}" CPP="%{__cpp}" \
-               M=$PWD O=$PWD \
+               SYSSRC=%{_kernelsrcdir} \
+               SYSOUT=$PWD/o \
+               M=$PWD O=$PWD/o \
                %{?with_verbose:V=1}
 
        mv dazuko{,-$cfg}.ko
@@ -254,6 +268,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2006/03/02 17:07:56  glen
+- updated from template-kernel-module.spec
+
 Revision 1.9  2005/11/15 12:27:17  qboosh
 - fixed build without kernel
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/dazuko.spec?r1=1.9&r2=1.10&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to