SPECS (DEVEL): zaptel.spec - remove smp - rpmbuild(macros) >= 1.379

[aredridel]

Author: aredridel                    Date: Thu Apr  5 23:52:52 2007 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- remove smp
- rpmbuild(macros) >= 1.379

---- Files affected:
SPECS:
   zaptel.spec (1.70.2.10 -> 1.70.2.11) 

---- Diffs:

================================================================
Index: SPECS/zaptel.spec
diff -u SPECS/zaptel.spec:1.70.2.10 SPECS/zaptel.spec:1.70.2.11
--- SPECS/zaptel.spec:1.70.2.10	Sun Mar  4 19:38:04 2007
+++ SPECS/zaptel.spec	Fri Apr  6 01:52:47 2007
@@ -3,13 +3,8 @@
 # Conditional build:
 %bcond_without	dist_kernel	# without distribution kernel
 %bcond_without	kernel		# don't build kernel modules
-%bcond_without	smp		# don't build SMP module
 %bcond_without	userspace	# don't build userspace tools
 #
-%ifarch sparc
-%undefine	with_smp
-%endif
-#
 %define		_rel 1	
 Summary:	Zaptel telephony device support
 Summary(pl.UTF-8):   ObsĹ‚uga urzÄ
dzeń telefonicznych Zaptel
@@ -37,8 +32,8 @@
 %if %{with kernel} && %{with dist_kernel}
 BuildRequires:	kernel-module-build
 %endif
+BuildRequires:  rpmbuild(macros) >= 1.379
 BuildRequires:	newt-devel
-BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -89,8 +84,11 @@
 Summary(pl.UTF-8):   Sterownik Zaptel dla jÄ
dra Linuksa
 Release:	%{_rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
-%{?with_dist_kernel:%requires_releq_kernel_up}
-Requires(post,postun):	/sbin/depmod
+Requires(post,postun):  /sbin/depmod
+%if %{with dist_kernel}
+%requires_releq_kernel
+Requires(postun):       %releq_kernel
+%endif
 
 %description -n kernel-%{name}
 Zaptel telephony Linux kernel driver.
@@ -98,20 +96,6 @@
 %description -n kernel-%{name} -l pl.UTF-8
 Sterownik dla jÄ
dra Linuksa do urzÄ
dzeń telefonicznych Zaptel.
 
-%package -n kernel-smp-%{name}
-Summary:	Zaptel Linux SMP kernel driver
-Summary(pl.UTF-8):   Sterownik Zaptel dla jÄ
dra Linuksa SMP
-Release:	%{_rel}@%{_kernel_ver_str}
-Group:		Base/Kernel
-%{?with_dist_kernel:%requires_releq_kernel_smp}
-Requires(post,postun):	/sbin/depmod
-
-%description -n kernel-smp-%{name}
-Zaptel telephony Linux SMP kernel driver.
-
-%description -n kernel-smp-%{name} -l pl.UTF-8
-Sterownik dla jÄ
dra Linuksa SMP do urzÄ
dzeń telefonicznych Zaptel.
-
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1
@@ -121,7 +105,7 @@
 #%patch4 -p1
 %patch5 -p1
 
-%define buildconfigs %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}
+%define buildconfigs %{?with_dist_kernel:dist}%{!?with_dist_kernel:nondist}
 
 
 %build
@@ -175,15 +159,9 @@
 %if %{with kernel}
 for cfg in %{buildconfigs}; do
 	cfgdest=''
-	if [ "$cfg" = "smp" ]; then
-		install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}$cfg/misc
-		install modules/$cfg/*.ko \
-			$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}$cfg/misc
-	else
-		install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc
-		install modules/$cfg/*.ko \
-			$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc
-	fi
+	install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc
+	install modules/$cfg/*.ko \
+		$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc
 done
 %endif
 
@@ -209,12 +187,6 @@
 %postun -n kernel-%{name}
 %depmod %{_kernel_ver}
 
-%post -n kernel-smp-%{name}
-%depmod %{_kernel_ver}smp
-
-%postun -n kernel-smp-%{name}
-%depmod %{_kernel_ver}smp
-
 %if %{with userspace}
 %post init
 /sbin/chkconfig --add %{name}
@@ -255,19 +227,16 @@
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/misc/*.ko*
 
-%if %{with smp}
-%files -n kernel-smp-%{name}
-%defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}smp/misc/*.ko*
-%endif
-%endif
-
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.70.2.11  2007/04/05 23:52:47  aredridel
+- remove smp
+- rpmbuild(macros) >= 1.379
+
 Revision 1.70.2.10  2007/03/04 18:38:04  aredridel
 - clean build environment to force rebuild between up and smp configs
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/zaptel.spec?r1=1.70.2.10&r2=1.70.2.11&f=u