SPECS: kernel-sound-au88xx.spec, kernel-usb-usbvision.spec, kernel...

ankry ankry at pld-linux.org
Sat Aug 12 19:07:55 CEST 2006 

Author: ankry                        Date: Sat Aug 12 17:07:55 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- spacing, new bconds, etc.

---- Files affected:
SPECS:
   kernel-sound-au88xx.spec (1.31 -> 1.32) , kernel-usb-usbvision.spec (1.4 -> 1.5) , kernel-video-tdfxdrm.spec (1.24 -> 1.25) , kernel24-net-e100.spec (1.5 -> 1.6) , kernel24.spec (1.768 -> 1.769) 

---- Diffs:

================================================================
Index: SPECS/kernel-sound-au88xx.spec
diff -u SPECS/kernel-sound-au88xx.spec:1.31 SPECS/kernel-sound-au88xx.spec:1.32
--- SPECS/kernel-sound-au88xx.spec:1.31	Tue Mar  2 03:10:04 2004
+++ SPECS/kernel-sound-au88xx.spec	Sat Aug 12 19:07:49 2006
@@ -1,7 +1,7 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-# _without_dist_kernel          without distribution kernel
+%bcond_without	dist_kernel		# without distribution kernel
 #
 %define		_orig_name	au88xx
 
@@ -18,9 +18,9 @@
 Patch0:		%{_orig_name}-Makefile.patch
 Patch1:		%{name}-types.patch
 URL:		http://sourceforge.net/projects/aureal/
-%{!?_without_dist_kernel:BuildRequires:	kernel-headers }
+%{?with_dist_kernel:BuildRequires:	kernel-headers }
 BuildRequires:	rpmbuild(macros) >= 1.118
-%{!?_without_dist_kernel:%requires_releq_kernel_up}
+%{?with_dist_kernel:%requires_releq_kernel_up}
 Requires(post,postun):	/sbin/depmod
 Provides:	au88xx
 Obsoletes:	au88xx
@@ -38,7 +38,7 @@
 Summary(pl):	Sterownik dla Linuksa SMP dla kart dźwiękowych opartych na Aureal Vortex
 Release:	%{_rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
-%{!?_without_dist_kernel:%requires_releq_kernel_smp}
+%{?with_dist_kernel:%requires_releq_kernel_smp}
 Requires(post,postun):	/sbin/depmod
 Provides:	au88xx
 Obsoletes:	au88xx
@@ -120,6 +120,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.32  2006/08/12 17:07:49  ankry
+- spacing, new bconds, etc.
+
 Revision 1.31  2004/03/02 02:10:04  ankry
 - rel. 16 (15 is for ra)
 

================================================================
Index: SPECS/kernel-usb-usbvision.spec
diff -u SPECS/kernel-usb-usbvision.spec:1.4 SPECS/kernel-usb-usbvision.spec:1.5
--- SPECS/kernel-usb-usbvision.spec:1.4	Sun May 28 20:24:57 2006
+++ SPECS/kernel-usb-usbvision.spec	Sat Aug 12 19:07:49 2006
@@ -1,10 +1,10 @@
 # $Revision$, $Date$
 #
 # 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_with	verbose         # verbose build (V=1)
+%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_with	verbose		# verbose build (V=1)
 #
 %define		_snap	20060524
 %define	rel	0.%{_snap}.1
@@ -165,6 +165,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2006/08/12 17:07:49  ankry
+- spacing, new bconds, etc.
+
 Revision 1.4  2006/05/28 18:24:57  shadzik
 - up to 0.9.8.3 snap 20060524
 - patch0 is no longer needed

================================================================
Index: SPECS/kernel-video-tdfxdrm.spec
diff -u SPECS/kernel-video-tdfxdrm.spec:1.24 SPECS/kernel-video-tdfxdrm.spec:1.25
--- SPECS/kernel-video-tdfxdrm.spec:1.24	Wed Aug 13 00:32:48 2003
+++ SPECS/kernel-video-tdfxdrm.spec	Sat Aug 12 19:07:49 2006
@@ -1,7 +1,7 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-# _without_dist_kernel          without distribution kernel
+%bcond_without	dist_kernel		# without distribution kernel
 #
 Summary:	TDFX DRM Driver
 Summary(pl):	Sterownik DRM do kart 3Dfx
@@ -13,10 +13,10 @@
 Group:		Base/Kernel
 Source0:	tdfxdrm.tgz
 # Source0-md5:	2fe84a3502bef8bb4f04756786b392ba
-%{!?_without_dist_kernel:BuildRequires:	kernel-headers < 2.4.0 }
+%{?with_dist_kernel:BuildRequires:	kernel-headers < 2.4.0 }
 BuildRequires:	%{kgcc_package}
 BuildRequires:	rpmbuild(macros) >= 1.118
-%{!?_without_dist_kernel:%requires_releq_kernel_up}
+%{?with_dist_kernel:%requires_releq_kernel_up}
 Requires(post,postun):	/sbin/depmod
 Obsoletes:	tdfxdrm
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -34,7 +34,7 @@
 Summary(pl):	Sterownik DRM do kart 3Dfx
 Release:	%{_rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
-%{!?_without_dist_kernel:%requires_releq_kernel_smp}
+%{?with_dist_kernel:%requires_releq_kernel_smp}
 Requires(post,postun):	/sbin/depmod
 Obsoletes:	tdfxdrm
 
@@ -93,6 +93,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.25  2006/08/12 17:07:49  ankry
+- spacing, new bconds, etc.
+
 Revision 1.24  2003/08/12 22:32:48  ankry
 - cosmetics
 

================================================================
Index: SPECS/kernel24-net-e100.spec
diff -u SPECS/kernel24-net-e100.spec:1.5 SPECS/kernel24-net-e100.spec:1.6
--- SPECS/kernel24-net-e100.spec:1.5	Tue Apr 11 15:28:59 2006
+++ SPECS/kernel24-net-e100.spec	Sat Aug 12 19:07:49 2006
@@ -6,8 +6,8 @@
 %define		_orig_name	e100
 %define		_kernelsrcdir	/usr/src/linux-2.4
 
-%{!?_without_dist_kernel:%define        _mod_name %{_orig_name}_intel }
-%{?_without_dist_kernel:%define         _mod_name %{_orig_name} }
+%{?with_dist_kernel:%define	_mod_name %{_orig_name}_intel }
+%{!?with_dist_kernel:%define	_mod_name %{_orig_name} }
 
 Summary:	Intel(R) PRO/100 driver for Linux
 Summary(pl):	Sterownik do karty Intel(R) PRO/100
@@ -36,8 +36,8 @@
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %ifarch sparc
-%define         _target_base_arch       sparc64
-%define         _target_cpu             sparc64
+%define		_target_base_arch	sparc64
+%define		_target_cpu		sparc64
 %endif
 
 %description
@@ -75,7 +75,7 @@
 %{__make} -C src K_VERSION=2.4 SMP=1 CC="%{kgcc} -DCONFIG_X86_LOCAL_APIC -DSTB_WA -D__KERNEL_SMP=1 -D__SMP__" KSRC=%{_kernelsrcdir}
 %endif
 %ifarch ppc
-%{__make} -C src K_VERSION=2.4 SMP=1 CC="%{kgcc} -msoft-float  -DSTB_WA -D__KERNEL_SMP=1 -D__SMP__" KSRC=%{_kernelsrcdir}
+%{__make} -C src K_VERSION=2.4 SMP=1 CC="%{kgcc} -msoft-float -DSTB_WA -D__KERNEL_SMP=1 -D__SMP__" KSRC=%{_kernelsrcdir}
 %endif
 %ifnarch %{ix86} ppc
 %{__make} -C src K_VERSION=2.4 SMP=1 CC="%{kgcc} -DSTB_WA -D__KERNEL_SMP=1 -D__SMP__" KSRC=%{_kernelsrcdir}
@@ -128,6 +128,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2006/08/12 17:07:49  ankry
+- spacing, new bconds, etc.
+
 Revision 1.5  2006/04/11 13:28:59  hawk
 - ExclusiveArch - we don't have 2.4 kernel on amd64
 - release 4

================================================================
Index: SPECS/kernel24.spec
diff -u SPECS/kernel24.spec:1.768 SPECS/kernel24.spec:1.769
--- SPECS/kernel24.spec:1.768	Sun Aug  6 23:15:13 2006
+++ SPECS/kernel24.spec	Sat Aug 12 19:07:49 2006
@@ -1075,7 +1075,7 @@
 %endif
 	%{__make} $Opts include/linux/version.h %{?with_um:ARCH=um}
 
-# making  table for soundmodem.
+# making table for soundmodem.
 	cd drivers/net/hamradio/soundmodem
 	%{__cc} -o gentbl -lm gentbl.c
 	./gentbl
@@ -1198,7 +1198,7 @@
 
 for i in "" smp ; do
 	install -d $RPM_BUILD_ROOT/lib/modules/%{version}-%{release}$i/misc
-	if [ -e  $RPM_BUILD_ROOT/lib/modules/%{version}-%{release}$i ] ; then
+	if [ -e $RPM_BUILD_ROOT/lib/modules/%{version}-%{release}$i ] ; then
 		rm -f $RPM_BUILD_ROOT/lib/modules/%{version}-%{release}$i/build
 		ln -sf %{_prefix}/src/linux-%{version} \
 			$RPM_BUILD_ROOT/lib/modules/%{version}-%{release}$i/build
@@ -1247,8 +1247,8 @@
 %if %{with source}
 %{__make} $Opts mrproper
 
-find  -name "*~" -print | xargs rm -f
-find  -name "*.orig" -print | xargs rm -f
+find -name "*~" -print | xargs rm -f
+find -name "*.orig" -print | xargs rm -f
 
 # make config-up
 %ifarch %{ix86}
@@ -1387,12 +1387,12 @@
 
 %triggerin -- %{name} <= 2.4.27-1.6 
 # backward compatibility, same for smp
-mv -f /boot/vmlinuz     /boot/vmlinuz.old       2>/dev/null || :
-mv -f /boot/System.map  /boot/System.map.old    2>/dev/null || :
-mv -f /boot/initrd      /boot/initrd.old        2>/dev/null || :
-ln -sf vmlinuz24        /boot/vmlinuz
-ln -sf System.map24     /boot/System.map
-ln -sf initrd24         /boot/initrd
+mv -f /boot/vmlinuz	/boot/vmlinuz.old	2>/dev/null || :
+mv -f /boot/System.map	/boot/System.map.old	2>/dev/null || :
+mv -f /boot/initrd	/boot/initrd.old	2>/dev/null || :
+ln -sf vmlinuz24	/boot/vmlinuz
+ln -sf System.map24	/boot/System.map
+ln -sf initrd24		/boot/initrd
 
 %post
 mv -f /boot/vmlinuz24 /boot/vmlinuz24.old 2>/dev/null || :
@@ -1420,12 +1420,12 @@
 
 %triggerin smp -- %{name}-smp <= 2.4.27-1.6 
 # backward compatibility, same for up
-mv -f /boot/vmlinuz     /boot/vmlinuz.old       2>/dev/null || :
-mv -f /boot/System.map  /boot/System.map.old    2>/dev/null || :
-mv -f /boot/initrd      /boot/initrd.old        2>/dev/null || :
-ln -sf vmlinuz24        /boot/vmlinuz
-ln -sf System.map24     /boot/System.map
-ln -sf initrd24         /boot/initrd
+mv -f /boot/vmlinuz	/boot/vmlinuz.old	2>/dev/null || :
+mv -f /boot/System.map	/boot/System.map.old	2>/dev/null || :
+mv -f /boot/initrd	/boot/initrd.old	2>/dev/null || :
+ln -sf vmlinuz24	/boot/vmlinuz
+ln -sf System.map24	/boot/System.map
+ln -sf initrd24		/boot/initrd
 
 %post smp
 mv -f /boot/vmlinuz24 /boot/vmlinuz24.old 2>/dev/null || :
@@ -1712,6 +1712,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.769  2006/08/12 17:07:49  ankry
+- spacing, new bconds, etc.
+
 Revision 1.768  2006/08/06 21:15:13  areq
 - openswan-2.4.6
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kernel-sound-au88xx.spec?r1=1.31&r2=1.32&f=u
    http://cvs.pld-linux.org/SPECS/kernel-usb-usbvision.spec?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/SPECS/kernel-video-tdfxdrm.spec?r1=1.24&r2=1.25&f=u
    http://cvs.pld-linux.org/SPECS/kernel24-net-e100.spec?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/SPECS/kernel24.spec?r1=1.768&r2=1.769&f=u

More information about the pld-cvs-commit mailing list