SPECS: submount.spec - bconds up, smp removed; package smp removed...

Wed Apr 11 20:18:32 CEST 2007

Author: zbyniu                       Date: Wed Apr 11 18:18:32 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- bconds up, smp removed; package smp removed
- namespace.patch; macros for build kernel module

---- Files affected:
SPECS:
   submount.spec (1.25 -> 1.26) 

---- Diffs:

================================================================
Index: SPECS/submount.spec
diff -u SPECS/submount.spec:1.25 SPECS/submount.spec:1.26

--- SPECS/submount.spec:1.25	Fri Mar 16 00:01:58 2007
+++ SPECS/submount.spec	Wed Apr 11 20:18:27 2007
@@ -3,8 +3,6 @@
 # Conditional build:
 %bcond_without	dist_kernel	# without distribution kernel
 %bcond_without	kernel		# don't build kernel modules
-%bcond_without	up		# don't build UP module
-%bcond_without	smp		# don't build SMP module
 %bcond_without	userspace	# don't build userspace utilities
 %bcond_with	verbose		# verbose build (V=1)
 %bcond_with	grsec_kernel	# build for kernel-grsecurity
@@ -13,10 +11,6 @@
 %define	alt_kernel	grsecurity
 %endif
 #
-%ifarch sparc
-%undefine	with_smp
-%endif
-#
 %define		_rel	11
 Summary:	Automatically mounts and unmounts removable media devices
 Summary(pl.UTF-8):	Automatyczne montowanie i odmontowywanie wymiennych nośników danych
@@ -28,10 +22,11 @@
 Source0:	http://dl.sourceforge.net/submount/%{name}-%{version}.tar.gz
 # Source0-md5:	f6abac328dbfb265eff18561065575c6
 Patch0:		%{name}-subfs.patch
+Patch1:		%{name}-namespace.patch
 URL:		http://submount.sourceforge.net/
 %if %{with kernel}
 %{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.7}
-BuildRequires:	rpmbuild(macros) >= 1.308
+BuildRequires:	rpmbuild(macros) >= 1.379
 %endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -56,8 +51,8 @@
 Group:		Base/Kernel
 Requires(post,postun):	/sbin/depmod
 %if %{with dist_kernel}
-%requires_releq_kernel_up
-Requires(postun):	%releq_kernel_up
+%requires_releq_kernel
+Requires(postun):	%releq_kernel
 %endif
 
 %description -n kernel%{_alt_kernel}-fs-subfs
@@ -70,58 +65,14 @@
 
 Ten pakiet zawiera moduł jądra Linuksa.
 
-%package -n kernel%{_alt_kernel}-smp-fs-subfs
-Summary:	Submount - SMP kernel module
-Summary(pl.UTF-8):	Submount - moduł jądra SMP
-Release:	%{_rel}@%{_kernel_ver_str}
-Group:		Base/Kernel
-Requires(post,postun):	/sbin/depmod
-%if %{with dist_kernel}
-%requires_releq_kernel_smp
-Requires(postun):	%releq_kernel_smp
-%endif
-
-%description -n kernel%{_alt_kernel}-smp-fs-subfs
-This is a driver for Submount for Linux.
-
-This package contains Linux SMP module.
-
-%description -n kernel%{_alt_kernel}-smp-fs-subfs -l pl.UTF-8
-Sterownik dla Linuksa do Submount.
-
-Ten pakiet zawiera moduł jądra Linuksa SMP.
-
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %if %{with kernel}
-cd subfs-%{version}
-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} -j1 -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- \
-%endif
-		HOSTCC="%{__cc}" \
-		M=$PWD O=$PWD/o \
-		%{?with_verbose:V=1}
-	mv subfs.ko subfs-$cfg.ko
-done
-cd -
+%build_kernel_modules -C subfs-%{version} -m subfs
 %endif
 
 %if %{with userspace}
@@ -135,15 +86,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %if %{with kernel}
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/kernel/fs
-cd subfs-%{version}
-install subfs-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
-	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/fs/subfs.ko
-%if %{with smp} && %{with dist_kernel}
-install subfs-smp.ko \
-	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/kernel/fs/subfs.ko
-%endif
-cd -
+%install_kernel_modules -m subfs-%{version}/subfs -d fs
 %endif
 
 %if %{with userspace}
@@ -162,12 +105,6 @@
 %postun -n kernel%{_alt_kernel}-fs-subfs
 %depmod %{_kernel_ver}
 
-%post	-n kernel%{_alt_kernel}-smp-fs-subfs
-%depmod %{_kernel_ver}smp
-
-%postun -n kernel%{_alt_kernel}-smp-fs-subfs
-%depmod %{_kernel_ver}smp
-
 %if %{with userspace}
 %files
 %defattr(644,root,root,755)
@@ -177,17 +114,9 @@
 %endif
 
 %if %{with kernel}
-%if %{with up} || %{without dist_kernel}
 %files -n kernel%{_alt_kernel}-fs-subfs
 %defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}/kernel/fs/subfs.ko*
-%endif
-
-%if %{with smp} && %{with dist_kernel}
-%files -n kernel%{_alt_kernel}-smp-fs-subfs
-%defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}smp/kernel/fs/subfs.ko*
-%endif
+/lib/modules/%{_kernel_ver}/fs/subfs.ko*
 %endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -196,6 +125,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.26  2007/04/11 18:18:27  zbyniu
+- bconds up, smp removed; package smp removed
+- namespace.patch; macros for build kernel module
+
 Revision 1.25  2007/03/15 23:01:58  glen
 - up bcond
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/submount.spec?r1=1.25&r2=1.26&f=u

