SPECS (LINUX_2_6): abridge.spec, bwm.spec, crafty.spec, crossm68k-...

glen glen at pld-linux.org
Wed Mar 1 00:53:30 CET 2006 

Author: glen                         Date: Tue Feb 28 23:53:30 2006 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- adapterized (killed trailing spaces/tabs)

---- Files affected:
SPECS:
   abridge.spec (1.9 -> 1.10) , bwm.spec (1.3 -> 1.4) , crafty.spec (1.17 -> 1.18) , crossm68k-binutils.spec (1.5 -> 1.6) , disktool.spec (1.4 -> 1.5) , fluidsynth.spec (1.23 -> 1.24) , gammu.spec (1.35 -> 1.36) , gnome-link-monitor-applet.spec (1.2 -> 1.3) , gob2.spec (1.25 -> 1.26) , hydrogen.spec (1.24 -> 1.25) , ircd.spec (1.81 -> 1.82) , iv.spec (1.8 -> 1.9) , kde-kio-gopher.spec (1.4 -> 1.5) , kernel-extra-go7007.spec (1.7 -> 1.8) , kex.spec (1.1.4.28 -> 1.1.4.29) , klogic.spec (1.4 -> 1.5) , kmplayer.spec (1.54 -> 1.55) , lat.spec (1.14 -> 1.15) , libkipi.spec (1.10 -> 1.11) , linux-gpib.spec (1.7 -> 1.8) , mtd.spec (1.3 -> 1.4) , newsx.spec (1.18 -> 1.19) , ogle_gui.spec (1.32 -> 1.33) , opengroupware.spec (1.15 -> 1.16) , openttd.spec (1.32 -> 1.33) , perl-Cisco-ACL.spec (1.5 -> 1.6) , perl-HTML-Widgets-NavMenu.spec (1.4 -> 1.5) , perl-Text-Beautify.spec (1.6 -> 1.7) , poedit.spec (1.36 -> 1.37) , python-M2Crypto.spec (1.32 -> 1.33) , python-pyHnj.spec (1.2 -> 1.3) , qscintilla.spec (1.18 -> 1.19) , regedit.spec (1.6 -> 1.7) , revelation.spec (1.26 -> 1.27) , swfdec.spec (1.38 -> 1.39) , talkfilters.spec (1.14 -> 1.15) , valknut.spec (1.41 -> 1.42) , workrave.spec (1.24 -> 1.25) 

---- Diffs:

================================================================
Index: SPECS/abridge.spec
diff -u SPECS/abridge.spec:1.9 SPECS/abridge.spec:1.10
--- SPECS/abridge.spec:1.9	Mon Aug 22 14:13:33 2005
+++ SPECS/abridge.spec	Wed Mar  1 00:53:22 2006
@@ -1,5 +1,5 @@
 # $Revision$, $Date$
-Summary:	Online bridge game	
+Summary:	Online bridge game
 Summary(pl):	Gra w brydża online
 Name:		abridge
 Version:	0.4.0
@@ -58,6 +58,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2006/02/28 23:53:22  glen
+- adapterized (killed trailing spaces/tabs)
+
 Revision 1.9  2005/08/22 12:13:33  adamg
 - reverted last commit
 

================================================================
Index: SPECS/bwm.spec
diff -u SPECS/bwm.spec:1.3 SPECS/bwm.spec:1.4
--- SPECS/bwm.spec:1.3	Sat Oct 16 03:02:59 2004
+++ SPECS/bwm.spec	Wed Mar  1 00:53:22 2006
@@ -5,7 +5,7 @@
 Version:	1.1.0
 Release:	1
 License:	GPL
-Group:		Networking/Utilities	
+Group:		Networking/Utilities
 Source0:	http://ftp.debian.org/debian/pool/main/b/bwm/%{name}_%{version}.orig.tar.gz
 # Source0-md5:	51021a036acb92d2bda0c0c0483f9552
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -48,6 +48,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2006/02/28 23:53:22  glen
+- adapterized (killed trailing spaces/tabs)
+
 Revision 1.3  2004/10/16 01:02:59  paladine
 - spelling fix
 

================================================================
Index: SPECS/crafty.spec
diff -u SPECS/crafty.spec:1.17 SPECS/crafty.spec:1.18
--- SPECS/crafty.spec:1.17	Sat Jan 21 01:01:16 2006
+++ SPECS/crafty.spec	Wed Mar  1 00:53:22 2006
@@ -49,7 +49,7 @@
 cp %{SOURCE2} README
 cp %{SOURCE1} .
 cp %{SOURCE4} %{SOURCE5} .
-cp %{SOURCE3} . 
+cp %{SOURCE3} .
 gzip -d start.pgn.gz
 
 %{__perl} -pi -e 's at .*machine/builtins.*@@' chess.h
@@ -73,7 +73,7 @@
 	LDFLAGS="%{rpmldflags} -lpthread" \
 	opt="-DCOMPACT_ATTACKS -DUSE_ATTACK_FUNCTIONS $optarch -DFAST" \
 	asm="$asmobj"
-	
+
 #mkdir -p %{_prefix}/lib/games/crafty
 #touch %{_prefix}/lib/games/crafty/book.lrn %{_prefix}/lib/games/crafty/position.{bin,lrn}
 #./crafty << _END_
@@ -116,6 +116,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.18  2006/02/28 23:53:22  glen
+- adapterized (killed trailing spaces/tabs)
+
 Revision 1.17  2006/01/21 00:01:16  arekm
 - kill Icon: field (support for these is obsolete says jbj)
 

================================================================
Index: SPECS/crossm68k-binutils.spec
diff -u SPECS/crossm68k-binutils.spec:1.5 SPECS/crossm68k-binutils.spec:1.6
--- SPECS/crossm68k-binutils.spec:1.5	Mon Feb  6 13:31:35 2006
+++ SPECS/crossm68k-binutils.spec	Wed Mar  1 00:53:22 2006
@@ -127,7 +127,7 @@
 
 ln $RPM_BUILD_ROOT%{arch}/bin/ld \
 	$RPM_BUILD_ROOT%{_bindir}/%{target}-ld
-	
+
 install elf2flt-%{elf2flt_date}/elf2flt.ld	\
 	$RPM_BUILD_ROOT%{arch}/lib/ldscripts/elf2flt.ld
 
@@ -152,6 +152,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2006/02/28 23:53:22  glen
+- adapterized (killed trailing spaces/tabs)
+
 Revision 1.5  2006/02/06 12:31:35  kosmo
 - changed arch to m68k-elf
 - now elf2flt works

================================================================
Index: SPECS/disktool.spec
diff -u SPECS/disktool.spec:1.4 SPECS/disktool.spec:1.5
--- SPECS/disktool.spec:1.4	Tue Aug  9 21:28:04 2005
+++ SPECS/disktool.spec	Wed Mar  1 00:53:22 2006
@@ -5,7 +5,7 @@
 Version:	1.5.5
 Release:	1
 License:	Freeware
-Group:		Applications/Shells	
+Group:		Applications/Shells
 Source0:	http://www.freewebs.com/mlsoft/dt-%{version}-1.i386.tar.gz
 # Source0-md5:	df92838462332d5dea7b8811bca32bd3
 URL:		http://www.freewebs.com/mlsoft/
@@ -70,6 +70,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2006/02/28 23:53:22  glen
+- adapterized (killed trailing spaces/tabs)
+
 Revision 1.4  2005/08/09 19:28:04  charles
 - up to 1.5.5
 

================================================================
Index: SPECS/fluidsynth.spec
diff -u SPECS/fluidsynth.spec:1.23 SPECS/fluidsynth.spec:1.24
--- SPECS/fluidsynth.spec:1.23	Sat Sep 17 12:33:56 2005
+++ SPECS/fluidsynth.spec	Wed Mar  1 00:53:22 2006
@@ -21,8 +21,8 @@
 BuildRequires:	alsa-lib-devel >= 0.9.0
 BuildRequires:	automake
 BuildRequires:	jack-audio-connection-kit-devel
-%{?with_ladcca:BuildRequires:	ladcca-devel >= 0.3.1}
 %{?with_ladcca:BuildRequires:	ladcca-devel < 0.4.0}
+%{?with_ladcca:BuildRequires:	ladcca-devel >= 0.3.1}
 BuildRequires:	ladspa-devel
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.213
@@ -80,7 +80,7 @@
 	--enable-ladspa \
 	--enable-midishare \
 	--enable-profiling
-	
+
 %{__make}
 
 %install
@@ -109,7 +109,7 @@
 %attr(755,root,root) %{_libdir}/lib%{name}.la
 %{_includedir}/%{name}.h
 %{_includedir}/%{name}
-%{_libdir}/pkgconfig/fluidsynth.pc
+%{_pkgconfigdir}/fluidsynth.pc
 
 %files static
 %defattr(644,root,root,755)
@@ -121,6 +121,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.24  2006/02/28 23:53:22  glen
+- adapterized (killed trailing spaces/tabs)
+
 Revision 1.23  2005/09/17 10:33:56  arekm
 - rebuild with readline 5.0
 

================================================================
Index: SPECS/gammu.spec
diff -u SPECS/gammu.spec:1.35 SPECS/gammu.spec:1.36
--- SPECS/gammu.spec:1.35	Sat Oct 29 17:00:56 2005
+++ SPECS/gammu.spec	Wed Mar  1 00:53:22 2006
@@ -52,8 +52,8 @@
 	--disable-static \
 	--enable-cb \
 	--enable-7110incoming \
-	--enable-6210calendar 		
-cd ../..	
+	--enable-6210calendar
+cd ../..
 %{__make} shared
 
 %install
@@ -95,6 +95,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.36  2006/02/28 23:53:22  glen
+- adapterized (killed trailing spaces/tabs)
+
 Revision 1.35  2005/10/29 15:00:56  qboosh
 - release 3
 

================================================================
Index: SPECS/gnome-link-monitor-applet.spec
diff -u SPECS/gnome-link-monitor-applet.spec:1.2 SPECS/gnome-link-monitor-applet.spec:1.3
--- SPECS/gnome-link-monitor-applet.spec:1.2	Tue Aug 24 00:12:41 2004
+++ SPECS/gnome-link-monitor-applet.spec	Wed Mar  1 00:53:22 2006
@@ -18,7 +18,7 @@
 BuildRequires:	libgnomeui-devel >= 2.4.0
 BuildRequires:	libtool
 BuildRequires:	pkgconfig
-Requires(post): GConf2 >= 2.4.0
+Requires(post):	GConf2 >= 2.4.0
 Requires(post):	scrollkeeper
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -45,7 +45,7 @@
 %configure \
 	--disable-schemas-install \
 	--enable-maintainer-mode
-	
+
 %{__make}
 
 %install
@@ -87,6 +87,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2006/02/28 23:53:22  glen
+- adapterized (killed trailing spaces/tabs)
+
 Revision 1.2  2004/08/23 22:12:41  qboosh
 - pl, summary copy-pasto fix
 

================================================================
Index: SPECS/gob2.spec
diff -u SPECS/gob2.spec:1.25 SPECS/gob2.spec:1.26
--- SPECS/gob2.spec:1.25	Fri Jan  6 23:04:30 2006
+++ SPECS/gob2.spec	Wed Mar  1 00:53:22 2006
@@ -39,7 +39,7 @@
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
-	
+
 install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 cp -r examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
@@ -60,6 +60,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.26  2006/02/28 23:53:22  glen
+- adapterized (killed trailing spaces/tabs)
+
 Revision 1.25  2006/01/06 22:04:30  freetz
 - 2.0.14, fixes crash introduced in previous release
 

================================================================
Index: SPECS/hydrogen.spec
diff -u SPECS/hydrogen.spec:1.24 SPECS/hydrogen.spec:1.25
--- SPECS/hydrogen.spec:1.24	Sun Nov 13 17:40:38 2005
+++ SPECS/hydrogen.spec	Wed Mar  1 00:53:22 2006
@@ -85,7 +85,7 @@
 	$RPM_BUILD_ROOT%{_datadir}/hydrogen/data/demo_songs
 install data/img/gray/icon48.png \
 	$RPM_BUILD_ROOT%{_pixmapsdir}/hydrogen.png
-	
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -157,6 +157,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.25  2006/02/28 23:53:22  glen
+- adapterized (killed trailing spaces/tabs)
+
 Revision 1.24  2005/11/13 16:40:38  darekr
 - BR: sed 4.0
 

================================================================
Index: SPECS/ircd.spec
diff -u SPECS/ircd.spec:1.81 SPECS/ircd.spec:1.82
--- SPECS/ircd.spec:1.81	Wed Mar  1 00:37:25 2006
+++ SPECS/ircd.spec	Wed Mar  1 00:53:22 2006
@@ -25,18 +25,18 @@
 #BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	ncurses-devel
-BuildRequires:	textutils
 BuildRequires:	rpmbuild(macros) >= 1.202
+BuildRequires:	textutils
 BuildRequires:	zlib-devel
-PreReq:		rc-scripts
-Requires(pre):	/usr/bin/getgid
-Requires(pre):	/bin/id
-Requires(pre):	/usr/sbin/groupadd
-Requires(pre):	/usr/sbin/useradd
 Requires(post):	fileutils
 Requires(post,preun):	/sbin/chkconfig
 Requires(postun):	/usr/sbin/groupdel
 Requires(postun):	/usr/sbin/userdel
+Requires(pre):	/bin/id
+Requires(pre):	/usr/bin/getgid
+Requires(pre):	/usr/sbin/groupadd
+Requires(pre):	/usr/sbin/useradd
+Requires:	rc-scripts
 Provides:	group(ircd)
 Provides:	user(ircd)
 Obsoletes:	bircd
@@ -97,6 +97,7 @@
 %{__make} all
 
 %install
+rm -rf $RPM_BUILD_ROOT
 tdir=$(support/config.guess)
 
 rm -rf $RPM_BUILD_ROOT
@@ -199,6 +200,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.82  2006/02/28 23:53:22  glen
+- adapterized (killed trailing spaces/tabs)
+
 Revision 1.81  2006/02/28 23:37:25  glen
 - adapterized (killed trailing spaces/tabs)
 

================================================================
Index: SPECS/iv.spec
diff -u SPECS/iv.spec:1.8 SPECS/iv.spec:1.9
--- SPECS/iv.spec:1.8	Wed May 11 17:13:29 2005
+++ SPECS/iv.spec	Wed Mar  1 00:53:22 2006
@@ -9,7 +9,7 @@
 Source0:	ftp://wolfpack.twu.net/users/wolfpack/%{name}-%{version}.tar.bz2
 # Source0-md5:	e129c49d4e5306e9e8a0ad28f3a9abcd
 Patch0:		%{name}-vidmode.patch
-URL: 		http://wolfpack.twu.net/IV/	
+URL:		http://wolfpack.twu.net/IV/
 BuildRequires:	gtk+-devel
 BuildRequires:	imlib-devel
 BuildRequires:	libstdc++-devel
@@ -60,6 +60,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2006/02/28 23:53:22  glen
+- adapterized (killed trailing spaces/tabs)
+
 Revision 1.8  2005/05/11 15:13:29  darekr
 - fixed URL
 

================================================================
Index: SPECS/kde-kio-gopher.spec
diff -u SPECS/kde-kio-gopher.spec:1.4 SPECS/kde-kio-gopher.spec:1.5
--- SPECS/kde-kio-gopher.spec:1.4	Fri Feb 10 14:15:58 2006
+++ SPECS/kde-kio-gopher.spec	Wed Mar  1 00:53:22 2006
@@ -7,9 +7,9 @@
 Release:	1
 License:	GPL
 Group:		Applications
-Source0:	http://download.berlios.de/kgopher/kio_%{_name}-%{version}.tar.bz2	
+Source0:	http://download.berlios.de/kgopher/kio_%{_name}-%{version}.tar.bz2
 # Source0-md5:	3e0ce7b35f48a8f7af64cd8789a332b2
-Patch0:		kde-common-PLD.patch	
+Patch0:		kde-common-PLD.patch
 URL:		http://kgopher.berlios.de/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -23,7 +23,7 @@
 
 %description -l pl
 Obsługa protokołu gopher dla KDE.
- 
+
 %prep
 %setup -q -n kio_%{_name}-%{version}
 %patch -p1
@@ -71,6 +71,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2006/02/28 23:53:22  glen
+- adapterized (killed trailing spaces/tabs)
+
 Revision 1.4  2006/02/10 13:15:58  qboosh
 - complete URL
 

================================================================
Index: SPECS/kernel-extra-go7007.spec
diff -u SPECS/kernel-extra-go7007.spec:1.7 SPECS/kernel-extra-go7007.spec:1.8
--- SPECS/kernel-extra-go7007.spec:1.7	Sun Feb 26 10:13:36 2006
+++ SPECS/kernel-extra-go7007.spec	Wed Mar  1 00:53:22 2006
@@ -15,11 +15,11 @@
 %undefine	with_dist_kernel
 %endif
 
+%define		_rel	0.1
 Summary:	Exemplary userspace program for go7007 video capture cards
 Summary(pl):	Przykładowy program dla kart przechwytywania obrazu go7007
 Name:		go7007
 Version:	0.9.7
-%define		_rel	0.1
 Release:	%{_rel}
 License:	Public Domain
 Group:		Applications/Multimedia
@@ -44,8 +44,8 @@
 
 %package devel
 Summary:	Header files for the go7007 driver
-Summary(pl):    Pliki nagłówkowe dla sterownika go7007
-Group:          Development/Libraries
+Summary(pl):	Pliki nagłówkowe dla sterownika go7007
+Group:		Development/Libraries
 Requires:	linux-libc-headers
 
 %description devel
@@ -58,7 +58,7 @@
 Summary:	Firmware for the go7007 driver
 Summary(pl):	Firmware dla sterownika go7007
 License:	distributable
-Group:		System Environment/Kernel
+Group:		Base/Kernel
 Requires:	fxload
 
 %description firmware
@@ -140,7 +140,7 @@
 	ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h kernel/include/linux/autoconf.h
 	ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} kernel/include/asm
 	touch kernel/include/config/MARKER
-	
+
 	%{__make} -C %{_kernelsrcdir} clean \
 		RCS_FIND_IGNORE="-name '*.ko' -o" \
 		M="$PWD/kernel" O="$PWD/kernel" \
@@ -166,8 +166,8 @@
 install hotplug/wis-ezusb $RPM_BUILD_ROOT%{_sysconfdir}/hotplug/usb/wis-ezusb
 install hotplug/wis.usermap-ezusb $RPM_BUILD_ROOT%{_sysconfdir}/hotplug/usb/wis.usermap
 
-install -d $RPM_BUILD_ROOT/usr/bin
-install apps/gorecord $RPM_BUILD_ROOT/usr/bin
+install -d $RPM_BUILD_ROOT%{_bindir}
+install apps/gorecord $RPM_BUILD_ROOT%{_bindir}
 
 install -d $RPM_BUILD_ROOT%{_includedir}/linux
 install include/*.h $RPM_BUILD_ROOT%{_includedir}/linux
@@ -236,6 +236,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2006/02/28 23:53:22  glen
+- adapterized (killed trailing spaces/tabs)
+
 Revision 1.7  2006/02/26 09:13:36  jpc
 - up to 0.9.7
 
@@ -263,4 +266,3 @@
 
 Revision 1.1  2005/08/29 12:09:28  jpc
 - new spec, builds (but the TV tuner doesn't work for me)
-

================================================================
Index: SPECS/kex.spec
diff -u SPECS/kex.spec:1.1.4.28 SPECS/kex.spec:1.1.4.29
--- SPECS/kex.spec:1.1.4.28	Thu Dec 15 09:43:59 2005
+++ SPECS/kex.spec	Wed Mar  1 00:53:22 2006
@@ -95,7 +95,7 @@
 Patch0:		2.6.0-ksyms-add.patch
 Patch1:		linux-2.6-version.patch
 
-Patch4:         linux-kbuild-extmod.patch
+Patch4:		linux-kbuild-extmod.patch
 
 # http://fatooh.org/esfq-2.6/
 Patch35:	esfq-kernel.patch
@@ -141,43 +141,43 @@
 # [unofficial/external]
 # netfilter nfy...
 
-Patch78:        squashfs2.2-patch
+Patch78:	squashfs2.2-patch
 
 
 URL:		http://www.kernel.org/
 BuildRequires:	binutils >= 2.14.90.0.7
 BuildRequires:	diffutils
 %ifarch sparc sparc64
-BuildRequires:	elftoaout
 BuildRequires:	crosssparc64-gcc
+BuildRequires:	elftoaout
 %endif
 BuildRequires:	module-init-tools
 BuildRequires:	perl-base
 BuildRequires:	rpmbuild(macros) >= 1.217
 Autoreqprov:	no
-PreReq:		coreutils
-PreReq:		module-init-tools >= 0.9.9
-PreReq:		geninitrd >= 2.57
-Provides:	kernel = %{epoch}:%{version}-%{release}
+Requires:	coreutils
+Requires:	geninitrd >= 2.57
+Requires:	module-init-tools >= 0.9.9
 Provides:	%{name}-up = %{epoch}:%{version}-%{release}
+Provides:	kernel = %{epoch}:%{version}-%{release}
 Provides:	kernel(netfilter) = %{_netfilter_snap}
 Provides:	module-info
 Obsoletes:	kernel-modules
 Obsoletes:	kernel-net-ipp2p
-Conflicts:	util-linux < %{_util_linux_ver}
-Conflicts:	module-init-tool < %{_module_init_tool_ver}
-Conflicts:	e2fsprogs < %{_e2fsprogs_ver}
-Conflicts:	jfsutils < %{_jfsutils_ver}
-Conflicts:	reiserfsprogs < %{_reiserfsprogs_ver}
-Conflicts:	reiser4progs < %{_reiser4progs_ver}
-Conflicts:	xfsprogs < %{_xfsprogs_ver}
-Conflicts:	quota-tools < %{_quota_tools_ver}
 Conflicts:	PPP < %{_PPP_ver}
+Conflicts:	e2fsprogs < %{_e2fsprogs_ver}
 Conflicts:	isdn4k-utils < %{_isdn4k_utils_ver}
+Conflicts:	jfsutils < %{_jfsutils_ver}
+Conflicts:	module-init-tool < %{_module_init_tool_ver}
 Conflicts:	nfs-utils < %{_nfs_utils_ver}
-Conflicts:	procps < %{_procps_ver}
 Conflicts:	oprofile < %{_oprofile_ver}
+Conflicts:	procps < %{_procps_ver}
+Conflicts:	quota-tools < %{_quota_tools_ver}
+Conflicts:	reiser4progs < %{_reiser4progs_ver}
+Conflicts:	reiserfsprogs < %{_reiserfsprogs_ver}
 Conflicts:	udev < %{_udev_ver}
+Conflicts:	util-linux < %{_util_linux_ver}
+Conflicts:	xfsprogs < %{_xfsprogs_ver}
 ExclusiveArch:	%{ix86} alpha %{x8664} ia64 ppc sparc sparc64
 ExclusiveOS:	Linux
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -214,8 +214,8 @@
 Summary:	DRM kernel modules
 Summary(pl):	Sterowniki DRM
 Group:		Base/Kernel
-PreReq:		%{name}-up = %{epoch}:%{version}-%{release}
 Requires(postun):	%{name}-up = %{epoch}:%{version}-%{release}
+Requires:	%{name}-up = %{epoch}:%{version}-%{release}
 Provides:	kernel-drm = %{drm_xfree_version}
 Autoreqprov:	no
 
@@ -229,10 +229,10 @@
 Summary:	PCMCIA modules
 Summary(pl):	Moduły PCMCIA
 Group:		Base/Kernel
-PreReq:		%{name}-up = %{epoch}:%{version}-%{release}
 Requires(postun):	%{name}-up = %{epoch}:%{version}-%{release}
-Provides:	kernel-pcmcia = %{pcmcia_version}
+Requires:	%{name}-up = %{epoch}:%{version}-%{release}
 Provides:	kernel(pcmcia)
+Provides:	kernel-pcmcia = %{pcmcia_version}
 Conflicts:	pcmcia-cs < %{_pcmcia_cs_ver}
 Autoreqprov:	no
 
@@ -246,8 +246,8 @@
 Summary:	ALSA kernel modules
 Summary(pl):	Sterowniki dźwięku ALSA
 Group:		Base/Kernel
-PreReq:		%{name}-up = %{epoch}:%{version}-%{release}
 Requires(postun):	%{name}-up = %{epoch}:%{version}-%{release}
+Requires:	%{name}-up = %{epoch}:%{version}-%{release}
 Autoreqprov:	no
 
 %description sound-alsa
@@ -260,8 +260,8 @@
 Summary:	OSS kernel modules
 Summary(pl):	Sterowniki dźwięku OSS
 Group:		Base/Kernel
-PreReq:		%{name}-up = %{epoch}:%{version}-%{release}
 Requires(postun):	%{name}-up = %{epoch}:%{version}-%{release}
+Requires:	%{name}-up = %{epoch}:%{version}-%{release}
 Autoreqprov:	no
 
 %description sound-oss
@@ -276,25 +276,25 @@
 Summary(fr):	Kernel version %{version} compiler pour les machine Multi-Processeur
 Summary(pl):	Jądro Linuksa w wersji %{version} dla maszyn wieloprocesorowych
 Group:		Base/Kernel
-PreReq:		coreutils
-PreReq:		module-init-tools >= 0.9.9
-PreReq:		geninitrd >= 2.26
+Requires:	coreutils
+Requires:	geninitrd >= 2.26
+Requires:	module-init-tools >= 0.9.9
 Provides:	kernel = %{epoch}:%{version}-%{release}
 Provides:	kernel(netfilter) = %{_netfilter_snap}
 Provides:	module-info
 Obsoletes:	kernel-smp-net-ipp2p
-Conflicts:	util-linux < %{_util_linux_ver}
-Conflicts:	module-init-tool < %{_module_init_tool_ver}
-Conflicts:	e2fsprogs < %{_e2fsprogs_ver}
-Conflicts:	jfsutils < %{_jfsutils_ver}
-Conflicts:	reiserfsprogs < %{_reiserfsprogs_ver}
-Conflicts:	xfsprogs < %{_xfsprogs_ver}
-Conflicts:	quota-tools < %{_quota_tools_ver}
 Conflicts:	PPP < %{_PPP_ver}
+Conflicts:	e2fsprogs < %{_e2fsprogs_ver}
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/abridge.spec?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/SPECS/bwm.spec?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SPECS/crafty.spec?r1=1.17&r2=1.18&f=u
    http://cvs.pld-linux.org/SPECS/crossm68k-binutils.spec?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/SPECS/disktool.spec?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/SPECS/fluidsynth.spec?r1=1.23&r2=1.24&f=u
    http://cvs.pld-linux.org/SPECS/gammu.spec?r1=1.35&r2=1.36&f=u
    http://cvs.pld-linux.org/SPECS/gnome-link-monitor-applet.spec?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SPECS/gob2.spec?r1=1.25&r2=1.26&f=u
    http://cvs.pld-linux.org/SPECS/hydrogen.spec?r1=1.24&r2=1.25&f=u
    http://cvs.pld-linux.org/SPECS/ircd.spec?r1=1.81&r2=1.82&f=u
    http://cvs.pld-linux.org/SPECS/iv.spec?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/SPECS/kde-kio-gopher.spec?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/SPECS/kernel-extra-go7007.spec?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/SPECS/kex.spec?r1=1.1.4.28&r2=1.1.4.29&f=u
    http://cvs.pld-linux.org/SPECS/klogic.spec?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/SPECS/kmplayer.spec?r1=1.54&r2=1.55&f=u
    http://cvs.pld-linux.org/SPECS/lat.spec?r1=1.14&r2=1.15&f=u
    http://cvs.pld-linux.org/SPECS/libkipi.spec?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/SPECS/linux-gpib.spec?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/SPECS/mtd.spec?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SPECS/newsx.spec?r1=1.18&r2=1.19&f=u
    http://cvs.pld-linux.org/SPECS/ogle_gui.spec?r1=1.32&r2=1.33&f=u
    http://cvs.pld-linux.org/SPECS/opengroupware.spec?r1=1.15&r2=1.16&f=u
    http://cvs.pld-linux.org/SPECS/openttd.spec?r1=1.32&r2=1.33&f=u
    http://cvs.pld-linux.org/SPECS/perl-Cisco-ACL.spec?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/SPECS/perl-HTML-Widgets-NavMenu.spec?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/SPECS/perl-Text-Beautify.spec?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/SPECS/poedit.spec?r1=1.36&r2=1.37&f=u
    http://cvs.pld-linux.org/SPECS/python-M2Crypto.spec?r1=1.32&r2=1.33&f=u
    http://cvs.pld-linux.org/SPECS/python-pyHnj.spec?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SPECS/qscintilla.spec?r1=1.18&r2=1.19&f=u
    http://cvs.pld-linux.org/SPECS/regedit.spec?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/SPECS/revelation.spec?r1=1.26&r2=1.27&f=u
    http://cvs.pld-linux.org/SPECS/swfdec.spec?r1=1.38&r2=1.39&f=u
    http://cvs.pld-linux.org/SPECS/talkfilters.spec?r1=1.14&r2=1.15&f=u
    http://cvs.pld-linux.org/SPECS/valknut.spec?r1=1.41&r2=1.42&f=u
    http://cvs.pld-linux.org/SPECS/workrave.spec?r1=1.24&r2=1.25&f=u

More information about the pld-cvs-commit mailing list