SPECS: dazuko.spec - fixed build without kernel

[qboosh]

Author: qboosh                       Date: Tue Nov 15 12:27:23 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fixed build without kernel

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

---- Diffs:

================================================================
Index: SPECS/dazuko.spec
diff -u SPECS/dazuko.spec:1.8 SPECS/dazuko.spec:1.9
--- SPECS/dazuko.spec:1.8	Thu Sep 15 20:25:05 2005
+++ SPECS/dazuko.spec	Tue Nov 15 13:27:17 2005
@@ -14,7 +14,7 @@
 %define		_rel	1
 Release:	%{_rel}
 Epoch:		0
-License:	BSD/GPL
+License:	BSD (library), GPL (Linux kernel module)
 Group:		Base/Kernel
 Source0:	http://www.dazuko.org/files/dazuko-%{version}.tar.gz
 # Source0-md5:	844498651d22ddd76bea4104bf7c3e43
@@ -56,7 +56,7 @@
 Release:	%{_rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
 Requires(post,postun):	/sbin/depmod
-%if %{with dist_kernel}
+%if %{with kernel} && %{with dist_kernel}
 %requires_releq_kernel_up
 Requires(postun):	%releq_kernel_up
 %endif
@@ -75,7 +75,7 @@
 Release:	%{_rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
 Requires(post,postun):	/sbin/depmod
-%if %{with dist_kernel}
+%if %{with kernel} && %{with dist_kernel}
 %requires_releq_kernel_smp
 Requires(postun):	%releq_kernel_smp
 %endif
@@ -91,6 +91,7 @@
 %package examples
 Summary:	Example code for Dazuko
 Summary(pl):	Przykładowy kod dla Dazuko
+License:	BSD
 Group:		Development/Libraries
 
 %description examples
@@ -102,6 +103,7 @@
 %package devel
 Summary:	Headers for Dazuko
 Summary(pl):	Pliki nagłówkowe Dazuko
+License:	BSD
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 
@@ -114,6 +116,7 @@
 %package static
 Summary:	Static libraries for Dazuko
 Summary(pl):	Statyczne biblioteki Dazuko
+License:	BSD
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
 
@@ -127,14 +130,14 @@
 %setup -q
 
 %build
-
-%if %{with kernel}
 # NOTE: It's not autoconf configure.
 bash ./configure \
 	--kernelsrcdir=%{_kernelsrcdir} \
-	--disable-local-dpath
+	--disable-local-dpath \
+	%{!?with_userspace:--without-library} \
+	%{!?with_kernel:--without-module}
 
-# kernel module(s)
+%if %{with kernel}
 for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}; do
 	if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
 		exit 1
@@ -165,7 +168,8 @@
 %if %{with userspace}
 cd library
 %{__make} \
-	CFLAGS="-fPIC"
+	CC="%{__cc}" \
+	CFLAGS="%{rpmcflags} -fPIC"
 %{__cc} -shared -Wl,-soname,libdazuko.so.0 -o libdazuko.so.0.0.0 *.o
 ln -s libdazuko.so.0.0.0 libdazuko.so.0
 ln -s libdazuko.so.0.0.0 libdazuko.so
@@ -180,8 +184,8 @@
 
 cp -a example* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
-cp -af library/libdazuko.* $RPM_BUILD_ROOT/%{_libdir}
-install dazukoio.h $RPM_BUILD_ROOT/%{_includedir}
+cp -af library/libdazuko.* $RPM_BUILD_ROOT%{_libdir}
+install dazukoio.h $RPM_BUILD_ROOT%{_includedir}
 %endif
 
 %if %{with kernel}
@@ -250,6 +254,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2005/11/15 12:27:17  qboosh
+- fixed build without kernel
+
 Revision 1.8  2005/09/15 18:25:05  sparky
 - prepared for kernel >= 2.6.13: link Module.symvers
 
================================================================

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