SPECS (AC-branch): X11-driver-firegl.spec, X11-driver-nvidia-legac...

glen glen at pld-linux.org
Sun Nov 4 21:22:15 CET 2007


Author: glen                         Date: Sun Nov  4 20:22:15 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- prefix src package with alt kernel if present

---- Files affected:
SPECS:
   X11-driver-firegl.spec (1.141.2.15 -> 1.141.2.16) , X11-driver-nvidia-legacy.spec (1.38.2.19 -> 1.38.2.20) , X11-driver-nvidia-legacy2.spec (1.1.2.23 -> 1.1.2.24) , X11-driver-nvidia.spec (1.78.2.9.2.22 -> 1.78.2.9.2.23) , drbd.spec (1.90.4.17 -> 1.90.4.18) , eagle-usb.spec (1.89.2.14 -> 1.89.2.15) , em8300.spec (1.49.2.17 -> 1.49.2.18) , ipp2p.spec (1.52.2.15 -> 1.52.2.16) , libfuse.spec (1.76.2.17 -> 1.76.2.18) , ndiswrapper.spec (1.37.2.21 -> 1.37.2.22) , p2p.spec (1.23.2.17 -> 1.23.2.18) , qemu.spec (1.85.2.20 -> 1.85.2.21) , rt2400.spec (1.48.2.15 -> 1.48.2.16) , shfs.spec (1.66.2.14 -> 1.66.2.15) , submount.spec (1.22.2.14 -> 1.22.2.15) , svgalib.spec (1.165.2.14 -> 1.165.2.15) , unionfs.spec (1.24.2.20 -> 1.24.2.21) , zaptel.spec (1.75.2.29 -> 1.75.2.30) , zd1211.spec (1.28.4.17 -> 1.28.4.18) 

---- Diffs:

================================================================
Index: SPECS/X11-driver-firegl.spec
diff -u SPECS/X11-driver-firegl.spec:1.141.2.15 SPECS/X11-driver-firegl.spec:1.141.2.16
--- SPECS/X11-driver-firegl.spec:1.141.2.15	Thu Nov  1 09:24:18 2007
+++ SPECS/X11-driver-firegl.spec	Sun Nov  4 21:22:05 2007
@@ -33,9 +33,10 @@
 %endif
 
 %define		_rel	56
+%define		pname	X11-driver-firegl
 Summary:	Linux Drivers for ATI graphics accelerators
 Summary(pl):	Sterowniki do akceleratorów graficznych ATI
-Name:		X11-driver-firegl
+Name:		%{pname}%{_alt_kernel}
 Version:	8.36.5
 Release:	%{_rel}
 License:	ATI Binary (parts are GPL)
@@ -44,9 +45,9 @@
 # Source0-md5:	bf056417ac6c57acdf5e5a6bb99a7dae
 Patch0:		firegl-panel.patch
 Patch1:		firegl-panel-ugliness.patch
-Patch2:		%{name}-kh.patch
-Patch3:		%{name}-viak8t.patch
-# Patch4:		%{name}-force-define-AGP.patch
+Patch2:		%{pname}-kh.patch
+Patch3:		%{pname}-viak8t.patch
+# Patch4:		%{pname}-force-define-AGP.patch
 URL:		http://ati.amd.com/support/drivers/linux/linux-radeon.html
 #BuildRequires:	X11-devel >= %{_min_eq_x11}	# disabled for now
 %{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.14}
@@ -257,6 +258,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.141.2.16  2007/11/04 20:22:05  glen
+- prefix src package with alt kernel if present
+
 Revision 1.141.2.15  2007/11/01 08:24:18  adamg
 - release 56 (rebuild against 2.6.16.56-1)
 

================================================================
Index: SPECS/X11-driver-nvidia-legacy.spec
diff -u SPECS/X11-driver-nvidia-legacy.spec:1.38.2.19 SPECS/X11-driver-nvidia-legacy.spec:1.38.2.20
--- SPECS/X11-driver-nvidia-legacy.spec:1.38.2.19	Thu Nov  1 09:24:18 2007
+++ SPECS/X11-driver-nvidia-legacy.spec	Sun Nov  4 21:22:05 2007
@@ -23,11 +23,12 @@
 %define		_min_x11	6.7.0
 #
 %define		oldname 	X11-driver-nvidia
+%define		pname	X11-driver-nvidia-legacy
 %define		_rel	56
 
 Summary:	Linux Drivers for nVidia TNT/TNT2/GF/old GF2/Quadro Chips
 Summary(pl):	Sterowniki do kart graficznych nVidia TNT/TNT2/GeForce/old GF2/Quadro
-Name:		X11-driver-nvidia-legacy
+Name:		%{pname}%{_alt_kernel}
 Version:	%{_nv_ver}
 Release:	%{_rel}
 License:	nVidia Binary
@@ -38,9 +39,9 @@
 # Source1-md5:	bb273998a661ef5b481e5cd19cf64a3b
 Source2:	%{oldname}-settings.desktop
 Source3:	%{oldname}-xinitrc.sh
-Patch0:		%{name}-gcc34.patch
-Patch1:		%{name}-GL.patch
-Patch2:		%{name}-verbose.patch
+Patch0:		%{pname}-gcc34.patch
+Patch1:		%{pname}-GL.patch
+Patch2:		%{pname}-verbose.patch
 URL:		http://www.nvidia.com/object/unix.html
 %if %{with kernel}
 BuildRequires:	%{kgcc_package}
@@ -100,7 +101,7 @@
 Summary:	OpenGL for X11R6 development (only gl?.h)
 Summary(pl):	Pliki nag³ówkowe OpenGL dla systemu X11R6 (tylko gl?.h)
 Group:		X11/Development/Libraries
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{pname} = %{version}-%{release}
 Provides:	OpenGL-devel-base
 Obsoletes:	%{oldname}-devel < 1.0.7174
 Obsoletes:	OpenGL-devel-base
@@ -119,7 +120,7 @@
 Summary:	Tools for advanced control of nVidia graphic cards
 Summary(pl):	Narzêdzia do zarz±dzania kartami graficznymi nVidia
 Group:		Applications/System
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{pname} = %{version}-%{release}
 Obsoletes:	%{oldname}-progs < 1.0.7174
 Obsoletes:	XFree86-driver-nvidia-progs
 Conflicts:	%{oldname}-progs
@@ -330,6 +331,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.38.2.20  2007/11/04 20:22:05  glen
+- prefix src package with alt kernel if present
+
 Revision 1.38.2.19  2007/11/01 08:24:18  adamg
 - release 56 (rebuild against 2.6.16.56-1)
 

================================================================
Index: SPECS/X11-driver-nvidia-legacy2.spec
diff -u SPECS/X11-driver-nvidia-legacy2.spec:1.1.2.23 SPECS/X11-driver-nvidia-legacy2.spec:1.1.2.24
--- SPECS/X11-driver-nvidia-legacy2.spec:1.1.2.23	Thu Nov  1 09:27:24 2007
+++ SPECS/X11-driver-nvidia-legacy2.spec	Sun Nov  4 21:22:05 2007
@@ -24,9 +24,10 @@
 %define		_rel	57
 #
 
+%define		pname	X11-driver-nvidia-legacy2
 Summary:	Linux Drivers for NVIDIA GeForce/Quadro Chips
 Summary(pl):	Sterowniki do kart graficznych NVIDIA GeForce/Quadro
-Name:		X11-driver-nvidia-legacy2
+Name:		%{pname}%{_alt_kernel}
 Version:	%{_nv_ver}
 Release:	%{_rel}
 License:	nVidia Binary
@@ -35,9 +36,9 @@
 # Source0-md5:	66f8b5e243aad22162e40d0f05f0bf1e
 Source1:	http://download.nvidia.com/XFree86/Linux-x86_64/%{_nv_ver}/NVIDIA-Linux-x86_64-%{_nv_ver}-pkg1.run
 # Source1-md5:	1cb134675bbdce8e172a0edc78618ed3
-Source2:	%{name}-settings.desktop
-Source3:	%{name}-xinitrc.sh
-Patch0:		%{name}-GL.patch
+Source2:	%{pname}-settings.desktop
+Source3:	%{pname}-xinitrc.sh
+Patch0:		%{pname}-GL.patch
 URL:		http://www.nvidia.com/object/unix.html
 %if %{with kernel}
 %{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.7}
@@ -99,7 +100,7 @@
 Summary:	OpenGL for X11R6 development (only gl?.h)
 Summary(pl):	Pliki nag³ówkowe OpenGL dla systemu X11R6 (tylko gl?.h)
 Group:		X11/Development/Libraries
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{pname} = %{version}-%{release}
 Provides:	OpenGL-devel-base
 Obsoletes:	OpenGL-devel-base
 Obsoletes:	XFree86-driver-nvidia-devel
@@ -116,7 +117,7 @@
 Summary:	Tools for advanced control of nVidia graphic cards
 Summary(pl):	Narzêdzia do zarz±dzania kartami graficznymi nVidia
 Group:		Applications/System
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{pname} = %{version}-%{release}
 Obsoletes:	XFree86-driver-nvidia-progs
 
 %description progs
@@ -324,6 +325,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.1.2.24  2007/11/04 20:22:05  glen
+- prefix src package with alt kernel if present
+
 Revision 1.1.2.23  2007/11/01 08:27:24  adamg
 - release 57 (rebuild against 2.6.16.56-1)
 

================================================================
Index: SPECS/X11-driver-nvidia.spec
diff -u SPECS/X11-driver-nvidia.spec:1.78.2.9.2.22 SPECS/X11-driver-nvidia.spec:1.78.2.9.2.23
--- SPECS/X11-driver-nvidia.spec:1.78.2.9.2.22	Thu Nov  1 09:24:18 2007
+++ SPECS/X11-driver-nvidia.spec	Sun Nov  4 21:22:05 2007
@@ -23,6 +23,7 @@
 %define		_min_x11	6.7.0
 %define		_rel	56
 
+%define		pname	X11-driver-nvidia
 Summary:	Linux Drivers for NVIDIA GeForce/Quadro Chips
 Summary(pl):	Sterowniki do kart graficznych NVIDIA GeForce/Quadro
 Name:		X11-driver-nvidia
@@ -34,9 +35,9 @@
 # Source0-md5:	d2f89f60cef8f9a0cc0ce228b46eeb8b
 Source1:	http://us.download.nvidia.com/XFree86/Linux-x86_64/%{_nv_ver}/NVIDIA-Linux-x86_64-%{_nv_ver}-pkg1.run
 # Source1-md5:	3d702d7d67875b4b1e3095c2eb448b29
-Source2:	%{name}-settings.desktop
-Source3:	%{name}-xinitrc.sh
-Patch0:		%{name}-GL.patch
+Source2:	%{pname}-settings.desktop
+Source3:	%{pname}-xinitrc.sh
+Patch0:		%{pname}-GL.patch
 URL:		http://www.nvidia.com/object/unix.html
 %if %{with kernel}
 %{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.7}
@@ -98,7 +99,7 @@
 Summary:	OpenGL for X11R6 development (only gl?.h)
 Summary(pl):	Pliki nag³ówkowe OpenGL dla systemu X11R6 (tylko gl?.h)
 Group:		X11/Development/Libraries
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{pname} = %{version}-%{release}
 Provides:	OpenGL-devel-base
 Obsoletes:	OpenGL-devel-base
 Obsoletes:	XFree86-driver-nvidia-devel
@@ -115,7 +116,7 @@
 Summary:	Tools for advanced control of nVidia graphic cards
 Summary(pl):	Narzêdzia do zarz±dzania kartami graficznymi nVidia
 Group:		Applications/System
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{pname} = %{version}-%{release}
 Obsoletes:	XFree86-driver-nvidia-progs
 
 %description progs
@@ -327,6 +328,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.78.2.9.2.23  2007/11/04 20:22:05  glen
+- prefix src package with alt kernel if present
+
 Revision 1.78.2.9.2.22  2007/11/01 08:24:18  adamg
 - release 56 (rebuild against 2.6.16.56-1)
 

================================================================
Index: SPECS/drbd.spec
diff -u SPECS/drbd.spec:1.90.4.17 SPECS/drbd.spec:1.90.4.18
--- SPECS/drbd.spec:1.90.4.17	Thu Nov  1 09:24:18 2007
+++ SPECS/drbd.spec	Sun Nov  4 21:22:05 2007
@@ -24,20 +24,20 @@
 %endif
 
 %define		_rel	56
-%define		kname	drbd
+%define		pname	drbd
 Summary:	drbd is a block device designed to build high availibility clusters
 Summary(pl):	drbd jest urz±dzeniem blokowym dla klastrów o wysokiej niezawodno¶ci
-Name:		%{kname}%{_alt_kernel}
+Name:		%{pname}%{_alt_kernel}
 Version:	0.7.24
 Release:	%{_rel}
 License:	GPL
 Group:		Base/Kernel
-Source0:	http://oss.linbit.com/drbd/0.7/%{kname}-%{version}.tar.gz
+Source0:	http://oss.linbit.com/drbd/0.7/%{pname}-%{version}.tar.gz
 # Source0-md5:	b2c7335514a355b874a634dc12b22522
-Patch0:		%{kname}-Makefile.patch
+Patch0:		%{pname}-Makefile.patch
 # based on http://members.home.nl/maarten/drbd-0.7.22-2.6.19.patch but compliant
 # with older kernels
-Patch1:		%{kname}-0.7.22-2.6.19-friendly.patch
+Patch1:		%{pname}-0.7.22-2.6.19-friendly.patch
 URL:		http://www.drbd.org/
 %if %{with userspace}
 BuildRequires:	bison
@@ -120,7 +120,7 @@
 przez (dedykowan±) sieæ. Mo¿e byæ widoczny jako sieciowy RAID1.
 
 %prep
-%setup -q -n %{kname}-%{version}
+%setup -q -n %{pname}-%{version}
 %patch0 -p1
 #%patch1 -p1
 
@@ -218,6 +218,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.90.4.18  2007/11/04 20:22:05  glen
+- prefix src package with alt kernel if present
+
 Revision 1.90.4.17  2007/11/01 08:24:18  adamg
 - release 56 (rebuild against 2.6.16.56-1)
 

================================================================
Index: SPECS/eagle-usb.spec
diff -u SPECS/eagle-usb.spec:1.89.2.14 SPECS/eagle-usb.spec:1.89.2.15
--- SPECS/eagle-usb.spec:1.89.2.14	Thu Nov  1 09:24:18 2007
+++ SPECS/eagle-usb.spec	Sun Nov  4 21:22:05 2007
@@ -29,6 +29,7 @@
 %endif
 
 %define		_rel	56
+%define		pname	eagle-usb
 Summary:	Linux driver for the Eagle 8051 Analog (sagem f at st 800/840/908/...) modems
 Summary(pl):	Sterownik dla Linuksa do modemów Eagle 8051 Analog (sagem f at st 800/840/908/...)
 Name:		eagle-usb
@@ -36,18 +37,18 @@
 Release:	%{_rel}
 License:	GPL v2
 Group:		Base/Kernel
-Source0:	http://download.gna.org/eagleusb/eagle-usb-2.3.0/%{name}-%{version}.tar.bz2
+Source0:	http://download.gna.org/eagleusb/eagle-usb-2.3.0/%{pname}-%{version}.tar.bz2
 # Source0-md5:	6c961a5022274aff870e49e2f0f922fc
-Patch1:		%{name}-eu_types.patch
-Patch2:		%{name}-vpivci-info.patch
-Patch3:		%{name}-opt.patch
-Patch4:		%{name}-signal.patch
-Patch5:		%{name}-usb_kill_urb.patch
-Patch6:		%{name}-kernel_sources_checking_hack.patch
+Patch1:		%{pname}-eu_types.patch
+Patch2:		%{pname}-vpivci-info.patch
+Patch3:		%{pname}-opt.patch
+Patch4:		%{pname}-signal.patch
+Patch5:		%{pname}-usb_kill_urb.patch
+Patch6:		%{pname}-kernel_sources_checking_hack.patch
 # Workaround for obsolete kernel API. To be removed...
-Patch7:		%{name}-spin_lock_unlocked.patch
-Patch8:		%{name}-kill_owner.patch
-Patch9:		%{name}-module_param.patch
+Patch7:		%{pname}-spin_lock_unlocked.patch
+Patch8:		%{pname}-kill_owner.patch
+Patch9:		%{pname}-module_param.patch
 URL:		http://gna.org/projects/eagleusb/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -218,6 +219,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.89.2.15  2007/11/04 20:22:05  glen
+- prefix src package with alt kernel if present
+
 Revision 1.89.2.14  2007/11/01 08:24:18  adamg
 - release 56 (rebuild against 2.6.16.56-1)
 

================================================================
Index: SPECS/em8300.spec
diff -u SPECS/em8300.spec:1.49.2.17 SPECS/em8300.spec:1.49.2.18
--- SPECS/em8300.spec:1.49.2.17	Thu Nov  1 09:24:18 2007
+++ SPECS/em8300.spec	Sun Nov  4 21:22:05 2007
@@ -27,18 +27,19 @@
 %endif
 
 %define		_rel	56
+%define		pname	em8300
 Summary:	DXR3 and H+ driver
 Summary(pl):	Sterowniki dla DXR3 i H+
-Name:		em8300
+Name:		%{pname}%{_alt_kernel}
 Version:	0.16.0
 Release:	%{_rel}
 License:	GPL
 Group:		Applications/System
-Source0:	http://dl.sourceforge.net/dxr3/%{name}-%{version}.tar.gz
+Source0:	http://dl.sourceforge.net/dxr3/%{pname}-%{version}.tar.gz
 # Source0-md5:	9e9b769b99927079b4fd6ec423d95049
-Source1:	%{name}.init
-Source2:	%{name}.sysconf
-Patch0:		%{name}-make.patch
+Source1:	%{pname}.init
+Source2:	%{pname}.sysconf
+Patch0:		%{pname}-make.patch
 URL:		http://dxr3.sourceforge.net/
 %if %{with userspace}
 BuildRequires:	autoconf >= 2.13
@@ -87,7 +88,7 @@
 Summary:	Utility programs for em8300 using GTK+
 Summary(pl):	Programy u¿ytkowe em8300 u¿ywaj±ce bibliteki GTK+
 Group:		X11/Applications
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{pname} = %{version}-%{release}
 
 %description gtk
 Utility programs for em8300 using GTK+ toolkit.
@@ -130,7 +131,7 @@
 Modu³y j±dra Linuksa SMP em8300.
 
 %prep
-%setup -q
+%setup -q -n %{pname}-%{version}
 %patch0 -p0
 
 %build
@@ -188,8 +189,8 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install -D %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
-install -D %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
+install -D %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{pname}
+install -D %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{pname}
 %endif
 
 %if %{with kernel}
@@ -210,13 +211,13 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/chkconfig --add %{name}
-%service %{name} restart
+/sbin/chkconfig --add %{pname}
+%service %{pname} restart
 
 %preun
 if [ "$1" = "0" ]; then
 	%service stop
-	/sbin/chkconfig --del %{name}
+	/sbin/chkconfig --del %{pname}
 fi
 
 %post	-n kernel%{_alt_kernel}-video-em8300
@@ -241,8 +242,8 @@
 %{_datadir}/em8300/em8300.pm
 %attr(755,root,root) %{_datadir}/em8300/*.pl
 %{_mandir}/man1/em8300setup.1*
-%attr(754,root,root) /etc/rc.d/init.d/%{name}
-%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
+%attr(754,root,root) /etc/rc.d/init.d/%{pname}
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{pname}
 # subpackage? (is it usable without alsa?)
 %{_datadir}/alsa/cards/EM8300.conf
 
@@ -277,6 +278,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.49.2.18  2007/11/04 20:22:05  glen
+- prefix src package with alt kernel if present
+
 Revision 1.49.2.17  2007/11/01 08:24:18  adamg
 - release 56 (rebuild against 2.6.16.56-1)
 

================================================================
Index: SPECS/ipp2p.spec
diff -u SPECS/ipp2p.spec:1.52.2.15 SPECS/ipp2p.spec:1.52.2.16
--- SPECS/ipp2p.spec:1.52.2.15	Thu Nov  1 09:24:18 2007
+++ SPECS/ipp2p.spec	Sun Nov  4 21:22:05 2007
@@ -25,15 +25,16 @@
 
 %define	iptables_ver	1.3.3
 %define		_rel	56
+%define		pname	ipp2p
 Summary:	IPP2P - a netfilter extension to identify P2P filesharing traffic
 Summary(pl):	IPP2P - rozszerzenie filtra pakietów identyfikuj±ce ruch P2P
-Name:		ipp2p
+Name:		%{pname}%{_alt_kernel}
 Version:	0.8.2
 Release:	%{_rel}
 Epoch:		1
 License:	GPL
 Group:		Base/Kernel
-Source0:	http://www.ipp2p.org/downloads/%{name}-%{version}.tar.gz
+Source0:	http://www.ipp2p.org/downloads/%{pname}-%{version}.tar.gz
 # Source0-md5:	9dd745830f302d70d0b728013c1d6a0c
 URL:		http://www.ipp2p.org/
 %{?with_userspace:BuildRequires:	iptables-devel >= 1.3.3}
@@ -184,7 +185,7 @@
 j±dra IPP2P.
 
 %prep
-%setup -q
+%setup -q -n %{pname}-%{version}
 sed -i "s:shell iptables:shell %{_sbindir}/iptables:" Makefile
 
 %build
@@ -197,7 +198,7 @@
 
 %if %{with kernel}
 # kernel module(s)
-%build_kernel_modules -m ipt_%{name}
+%build_kernel_modules -m ipt_%{pname}
 %endif
 
 %install
@@ -205,11 +206,11 @@
 
 %if %{with userspace}
 install -d $RPM_BUILD_ROOT%{_libdir}/iptables
-install libipt_%{name}.so $RPM_BUILD_ROOT%{_libdir}/iptables
+install libipt_%{pname}.so $RPM_BUILD_ROOT%{_libdir}/iptables
 %endif
 
 %if %{with kernel}
-%install_kernel_modules -m ipt_%{name} -d kernel/net/ipv4/netfilter
+%install_kernel_modules -m ipt_%{pname} -d kernel/net/ipv4/netfilter
 %endif
 
 %clean
@@ -231,13 +232,13 @@
 %if %{with up} || %{without dist_kernel}
 %files -n kernel%{_alt_kernel}-net-ipp2p
 %defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}/kernel/net/ipv4/netfilter/ipt_%{name}.ko*
+/lib/modules/%{_kernel_ver}/kernel/net/ipv4/netfilter/ipt_%{pname}.ko*
 %endif
 
 %if %{with smp} && %{with dist_kernel}
 %files -n kernel%{_alt_kernel}-smp-net-ipp2p
 %defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}smp/kernel/net/ipv4/netfilter/ipt_%{name}.ko*
+/lib/modules/%{_kernel_ver}smp/kernel/net/ipv4/netfilter/ipt_%{pname}.ko*
 %endif
 %endif
 
@@ -253,6 +254,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.52.2.16  2007/11/04 20:22:05  glen
+- prefix src package with alt kernel if present
+
 Revision 1.52.2.15  2007/11/01 08:24:18  adamg
 - release 56 (rebuild against 2.6.16.56-1)
 

================================================================
Index: SPECS/libfuse.spec
diff -u SPECS/libfuse.spec:1.76.2.17 SPECS/libfuse.spec:1.76.2.18
--- SPECS/libfuse.spec:1.76.2.17	Thu Nov  1 09:24:18 2007
+++ SPECS/libfuse.spec	Sun Nov  4 21:22:05 2007
@@ -24,9 +24,10 @@
 %endif
 
 %define		_rel	56
+%define		pname	libfuse
 Summary:	Filesystem in Userspace
 Summary(pl):	System plików w przestrzeni u¿ytkownika
-Name:		libfuse
+Name:		%{pname}%{_alt_kernel}
 Version:	2.6.1
 Release:	%{_rel}
 Epoch:		0
@@ -36,7 +37,7 @@
 # Source0-md5:	13e1873086a1d7a95f470bbc7428c528
 Source1:	fuse.conf
 Patch0:		kernel-misc-fuse-Makefile.am.patch
-Patch1:		%{name}-link.patch
+Patch1:		%{pname}-link.patch
 URL:		http://fuse.sourceforge.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -78,7 +79,7 @@
 Summary:	Filesytem in Userspace - Development header files
 Summary(pl):	System plików w przestrzeni u¿ytkownika - pliki nag³ówkowe
 Group:		Development/Libraries
-Requires:	%{name} = %{epoch}:%{version}-%{_rel}
+Requires:	%{pname} = %{epoch}:%{version}-%{_rel}
 
 %description devel
 Libfuse library header files.
@@ -268,6 +269,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.76.2.18  2007/11/04 20:22:05  glen
+- prefix src package with alt kernel if present
+
 Revision 1.76.2.17  2007/11/01 08:24:18  adamg
 - release 56 (rebuild against 2.6.16.56-1)
 

================================================================
Index: SPECS/ndiswrapper.spec
diff -u SPECS/ndiswrapper.spec:1.37.2.21 SPECS/ndiswrapper.spec:1.37.2.22
--- SPECS/ndiswrapper.spec:1.37.2.21	Thu Nov  1 09:24:18 2007
+++ SPECS/ndiswrapper.spec	Sun Nov  4 21:22:05 2007
@@ -1,4 +1,7 @@
 # $Revision$, $Date$
+# TOOD
+# - build time errors that are ignored:
+#   grep: /lib/modules/$(uname -r)/build/include/linux/usb.h: No such file or directory
 #
 # Conditional build:
 %bcond_without	dist_kernel	# without distribution kernel
@@ -20,15 +23,16 @@
 %endif
 
 %define		_rel	56
+%define		pname	ndiswrapper
 Summary:	Tools to "wrap around" NDIS drivers
 Summary(pl):	Narzêdzia "opakowuj±ce" sterowniki NDIS
-Name:		ndiswrapper
+Name:		%{pname}%{_alt_kernel}
 Version:	1.15
 Release:	%{_rel}
 Epoch:		1
 License:	GPL
 Group:		Base/Kernel
-Source0:	http://dl.sourceforge.net/ndiswrapper/%{name}-%{version}.tar.gz
+Source0:	http://dl.sourceforge.net/ndiswrapper/%{pname}-%{version}.tar.gz
 # Source0-md5:	0ca5bcab8e9b7b0d40f2e886f1fbaa45
 URL:		http://ndiswrapper.sourceforge.net/
 %if %{with kernel}
@@ -68,7 +72,7 @@
 %requires_releq_kernel_up
 Requires(postun):	%releq_kernel_up
 %endif
-Requires:	%{name} = %{epoch}:%{version}-%{_rel}
+Requires:	%{pname} = %{epoch}:%{version}-%{_rel}
 Requires:	dev >= 2.7.7-10
 
 %description -n kernel%{_alt_kernel}-net-ndiswrapper
@@ -99,7 +103,7 @@
 %requires_releq_kernel_smp
 Requires(postun):	%releq_kernel_smp
 %endif
-Requires:	%{name} = %{epoch}:%{version}-%{_rel}
+Requires:	%{pname} = %{epoch}:%{version}-%{_rel}
 Requires:	dev >= 2.7.7-10
 
 %description -n kernel%{_alt_kernel}-smp-net-ndiswrapper
@@ -121,7 +125,7 @@
 Ten pakiet zawiera modu³ j±dra Linuksa SMP.
 
 %prep
-%setup -q
+%setup -q -n %{pname}-%{version}
 
 %build
 %if %{with userspace}
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/X11-driver-firegl.spec?r1=1.141.2.15&r2=1.141.2.16&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/X11-driver-nvidia-legacy.spec?r1=1.38.2.19&r2=1.38.2.20&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/X11-driver-nvidia-legacy2.spec?r1=1.1.2.23&r2=1.1.2.24&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/X11-driver-nvidia.spec?r1=1.78.2.9.2.22&r2=1.78.2.9.2.23&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/drbd.spec?r1=1.90.4.17&r2=1.90.4.18&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/eagle-usb.spec?r1=1.89.2.14&r2=1.89.2.15&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/em8300.spec?r1=1.49.2.17&r2=1.49.2.18&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/ipp2p.spec?r1=1.52.2.15&r2=1.52.2.16&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/libfuse.spec?r1=1.76.2.17&r2=1.76.2.18&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/ndiswrapper.spec?r1=1.37.2.21&r2=1.37.2.22&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/p2p.spec?r1=1.23.2.17&r2=1.23.2.18&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/qemu.spec?r1=1.85.2.20&r2=1.85.2.21&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/rt2400.spec?r1=1.48.2.15&r2=1.48.2.16&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/shfs.spec?r1=1.66.2.14&r2=1.66.2.15&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/submount.spec?r1=1.22.2.14&r2=1.22.2.15&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/svgalib.spec?r1=1.165.2.14&r2=1.165.2.15&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/unionfs.spec?r1=1.24.2.20&r2=1.24.2.21&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/zaptel.spec?r1=1.75.2.29&r2=1.75.2.30&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/zd1211.spec?r1=1.28.4.17&r2=1.28.4.18&f=u



More information about the pld-cvs-commit mailing list