SPECS: truecrypt.spec - adapt to new kernel macros - add BR: rpmbu...

[shadzik]

Author: shadzik                      Date: Fri Mar 23 20:51:44 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- adapt to new kernel macros
- add BR: rpmbuild(macros) >= 1.379
- remove that whole smp stuff

---- Files affected:
SPECS:
   truecrypt.spec (1.19 -> 1.20) 

---- Diffs:

================================================================
Index: SPECS/truecrypt.spec
diff -u SPECS/truecrypt.spec:1.19 SPECS/truecrypt.spec:1.20
--- SPECS/truecrypt.spec:1.19	Thu Mar  8 01:45:32 2007
+++ SPECS/truecrypt.spec	Fri Mar 23 21:51:39 2007
@@ -8,8 +8,6 @@
 # Conditional build:
 %bcond_without	dist_kernel	# allow non-distribution kernel
 %bcond_without	kernel		# don't build kernel modules
-%bcond_without	smp		# don't build SMP module
-%bcond_without	up		# don't build UP module
 %bcond_without	userspace	# don't build userspace utilities
 %bcond_with	verbose		# verbose build (V=1)
 #
@@ -31,6 +29,7 @@
 Patch4:		%{name}-dm_dev.patch
 Patch5:		%{name}-kmem_cache-2.6.20-fix.patch
 URL:		http://www.truecrypt.org/
+BuildRequires:	rpmbuild(macros) >= 1.379
 %if %{with kernel}
 Requires(post,postun):	/sbin/depmod
 %endif
@@ -76,8 +75,8 @@
 Release:	%{_rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
 %if %{with dist_kernel}
-%requires_releq_kernel_up
-Requires(postun):	%releq_kernel_up
+%requires_releq_kernel
+Requires(postun):	%releq_kernel
 %endif
 Requires:	%{name} = %{version}-%{_rel}
 Conflicts:	modutils < 2.4.6-4
@@ -88,24 +87,6 @@
 %description -n kernel%{_alt_kernel}-misc-%{name} -l pl.UTF-8
 Moduły jądra Linuksa dla TrueCrypta
 
-%package -n kernel%{_alt_kernel}-smp-misc-%{name}
-Summary:	Linux SMP kernel modules for TrueCrypt
-Summary(pl.UTF-8):	Moduły jądra Linuksa SMP dla TrueCrypta
-Release:	%{_rel}@%{_kernel_ver_str}
-Group:		Base/Kernel
-%if %{with dist_kernel}
-%requires_releq_kernel_smp
-Requires(postun):	%releq_kernel_smp
-%endif
-Requires:	%{name} = %{version}-%{_rel}
-Conflicts:	modutils < 2.4.6-4
-
-%description -n kernel%{_alt_kernel}-smp-misc-%{name}
-Linux SMP kernel modules for TrueCrypt.
-
-%description -n kernel%{_alt_kernel}-smp-misc-%{name} -l pl.UTF-8
-Moduły jądra Linuksa SMP dla TrueCrypta.
-
 %prep
 %setup -q
 %patch0 -p1
@@ -119,7 +100,7 @@
 %if %{with kernel}
 # kernel module(s)
 cd Linux/Kernel
-for cfg in %{?with_dist_kernel:%{?with_up:up} %{?with_smp:smp}}%{!?with_dist_kernel:nondist}; do
+for cfg in %{?with_dist_kernel:dist}%{!?with_dist_kernel:nondist}; do
 	if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
 		exit 1
 	fi
@@ -178,12 +159,6 @@
 %postun -n kernel%{_alt_kernel}-misc-%{name}
 %depmod %{_kernel_ver}
 
-%post -n kernel%{_alt_kernel}-smp-misc-%{name}
-%depmod %{_kernel_ver}smp
-
-%postun -n kernel%{_alt_kernel}-smp-misc-%{name}
-%depmod %{_kernel_ver}smp
-
 %if %{with userspace}
 %files
 %defattr(644,root,root,755)
@@ -197,19 +172,17 @@
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/kernel/misc/*.ko*
 
-%if %{with smp} && %{with dist_kernel}
-%files -n kernel%{_alt_kernel}-smp-misc-%{name}
-%defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}smp/kernel/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.20  2007/03/23 20:51:39  shadzik
+- adapt to new kernel macros
+- add BR: rpmbuild(macros) >= 1.379
+- remove that whole smp stuff
+
 Revision 1.19  2007/03/08 00:45:32  mguevara
 - rel 0.6
 - added truecrypt-dm_dev.patch - no longer need for br kernel-source
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/truecrypt.spec?r1=1.19&r2=1.20&f=u