SPECS: X11.spec, XFree86.spec, Zope.spec, rogue.spec, rp-pppoe.spe...

glen glen at pld-linux.org
Mon Dec 5 00:37:25 CET 2005 

Author: glen                         Date: Sun Dec  4 23:37:25 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- adapterized (sorted %verify flags)

---- Files affected:
SPECS:
   X11.spec (1.162 -> 1.163) , XFree86.spec (1.616 -> 1.617) , Zope.spec (1.92 -> 1.93) , rogue.spec (1.27 -> 1.28) , rp-pppoe.spec (1.21 -> 1.22) , rpld.spec (1.15 -> 1.16) , sap.spec (1.23 -> 1.24) , scandetd.spec (1.10 -> 1.11) , scponly.spec (1.7 -> 1.8) , setup.spec (1.114 -> 1.115) , slrn.spec (1.117 -> 1.118) , smbldap-tools.spec (1.11 -> 1.12) , srp.spec (1.30 -> 1.31) , su1.spec (1.3 -> 1.4) , sudo.spec (1.102 -> 1.103) , sysklogd.spec (1.110 -> 1.111) , tcsh.spec (1.73 -> 1.74) , tinyca.spec (1.29 -> 1.30) , unixODBC.spec (1.94 -> 1.95) , updatedd.spec (1.18 -> 1.19) , usage.spec (1.7 -> 1.8) , verliadmin.spec (1.15 -> 1.16) , vgrabbj.spec (1.2 -> 1.3) , wpjabber.spec (1.6 -> 1.7) , wu-ftpd.spec (1.52 -> 1.53) , wwwoffle.spec (1.84 -> 1.85) , xawdecode.spec (1.32 -> 1.33) , xinitrc-ng.spec (1.11 -> 1.12) , xinitrc.spec (1.34 -> 1.35) , xrally.spec (1.25 -> 1.26) , zebra-xs26.spec (1.21 -> 1.22) , zebra.spec (1.106 -> 1.107) 

---- Diffs:

================================================================
Index: SPECS/X11.spec
diff -u SPECS/X11.spec:1.162 SPECS/X11.spec:1.163
--- SPECS/X11.spec:1.162	Sun Nov 20 09:05:35 2005
+++ SPECS/X11.spec	Mon Dec  5 00:37:15 2005
@@ -134,7 +134,7 @@
 Patch71:	%{name}-radeon-set-fb-location.patch
 
 Patch72:	http://glen.alkohol.ee/xkb/xorg.patch
-Patch73:	http://owczi.net/stuff/mac/X11R6.8.2-r128-write_depth.patch
+Patch73:	http://owczi.net/stuff/mac/%{name}R6.8.2-r128-write_depth.patch
 
 #head-patch
 #ftp://ftp.linux.cz/pub/linux/people/jan_kasprzak/xorg-dualhead/
@@ -388,7 +388,7 @@
 %package OpenGL-core
 Summary:	OpenGL support extension modules for Xserver
 Summary(pl):	Moduły rozszerzeń X serwera obsługujące OpenGL
-Group:		X11/Xserver
+Group:		X11/Servers
 Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
 Provides:	XFree86-OpenGL-core = %{epoch}:%{version}-%{release}
 Obsoletes:	XFree86-OpenGL-core
@@ -499,8 +499,8 @@
 Summary(uk):	"÷ËĚÁÄĹÎÉĘ" ÓĹŇ×ĹŇ XOrg X11
 Group:		X11/Servers
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
-Requires:	/usr/X11R6/lib/X11/rgb.txt
 Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
+Requires:	/usr/X11R6/lib/X11/rgb.txt
 Requires:	X11-fonts-base
 Provides:	XFree86-Xnest = %{epoch}:%{version}-%{release}
 Obsoletes:	XFree86-Xnest
@@ -542,12 +542,12 @@
 Summary:	X print server
 Summary(pl):	X serwer z rozszerzeniem Xprint
 Group:		X11/Servers
-PreReq:		xprint-initrc
 Requires:	%{name}-Xprint = %{epoch}:%{version}-%{release}
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
-Requires:	/usr/X11R6/lib/X11/rgb.txt
 Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
+Requires:	/usr/X11R6/lib/X11/rgb.txt
 Requires:	X11-fonts-base
+Requires:	xprint-initrc
 Provides:	XFree86-Xprt = %{epoch}:%{version}-%{release}
 Obsoletes:	XFree86-Xprt
 
@@ -567,8 +567,8 @@
 Group:		X11/Servers
 Requires(pre):	sed >= 4.0
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
-Requires:	/usr/X11R6/lib/X11/rgb.txt
 Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
+Requires:	/usr/X11R6/lib/X11/rgb.txt
 Requires:	X11-fonts-base
 Requires:	pam >= 0.79.0
 Provides:	XFree86-Xserver = %{epoch}:%{version}-%{release}
@@ -604,8 +604,8 @@
 Summary(uk):	óĹŇ×ĹŇ XOrg X11 ÄĚŃ ×ŚŇÔŐÁĚŘÎĎÇĎ ĆŇĹĘÍÂŐĆĹŇÁ
 Group:		X11/Servers
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
-Requires:	/usr/X11R6/lib/X11/rgb.txt
 Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
+Requires:	/usr/X11R6/lib/X11/rgb.txt
 Requires:	X11-fonts-base
 Provides:	XFree86-Xvfb = %{epoch}:%{version}-%{release}
 Obsoletes:	XFree86-Xvfb
@@ -681,8 +681,8 @@
 Summary(tr):	X11R6 ile geliţtirme için gerekli dosyalar
 Summary(uk):	âŚÂĚŚĎÔĹËÉ ĐŇĎÇŇÁÍŚÓÔÁ, ČĹÄĹŇÉ ÔÁ ÄĎËŐÍĹÎÔÁĂŚŃ ĐĎ ĐŇĎÇŇÁÍŐ×ÁÎÎŔ X11R6
 Group:		X11/Development/Libraries
-Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 Requires:	%{name}-imake = %{epoch}:%{version}-%{release}
+Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 Requires:	fontconfig-devel >= 1:2.2.0
 Provides:	XFree86-devel = %{epoch}:%{version}-%{release}
 Provides:	render = 0.8
@@ -839,8 +839,8 @@
 Summary(pl):	Sterownik do kart ATI Radeon
 Group:		X11/Servers
 Requires:	%{name}-Xserver = %{epoch}:%{version}-%{release}
-Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
 Requires:	%{name}-driver-ati = %{epoch}:%{version}-%{release}
+Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
 %ifarch %{ix86} ia64 %{x8664} alpha ppc arm
 # for dri
 Requires:	%{name}-OpenGL-core = %{epoch}:%{version}-%{release}
@@ -1831,13 +1831,13 @@
 Summary(ru):	íĹÎĹÄÖĹŇ ÄÉÓĐĚĹŃ X
 Summary(uk):	íĹÎĹÄÖĹŇ ÄÉÓĐĚĹŔ X
 Group:		X11
-PreReq:		rc-scripts
 Requires(post,preun):	/sbin/chkconfig
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
-Requires:	pam >= 0.79.0
 Requires:	%{name}-sessreg = %{epoch}:%{version}-%{release}
 Requires:	/usr/X11R6/bin/sessreg
+Requires:	pam >= 0.79.0
+Requires:	rc-scripts
 Provides:	XDM
 Provides:	xdm = %{epoch}:%{version}-%{release}
 Obsoletes:	XFree86-xdm
@@ -1870,16 +1870,16 @@
 Summary(ru):	ćĎÎÔÓĹŇ×ĹŇ ÄĚŃ X Window System
 Summary(uk):	ćĎÎÔÓĹŇ×ĹŇ ÄĚŃ X Window System
 Group:		X11
-PreReq:		rc-scripts
-Requires(pre):	/bin/id
-Requires(pre):	/usr/bin/getgid
-Requires(pre):	/usr/sbin/useradd
-Requires(pre):	/usr/sbin/groupadd
 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:	%{name}-libs = %{epoch}:%{version}-%{release}
 Requires:	X11-fonts-base
+Requires:	rc-scripts
 Provides:	group(xfs)
 Provides:	user(xfs)
 Provides:	xfs = %{epoch}:%{version}-%{release}
@@ -2000,7 +2000,6 @@
 	TOP="$PWD/xc"
 
 %install
-PWD=`pwd`
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{pam.d,rc.d/init.d,security/console.apps,sysconfig,xdg} \
 	$RPM_BUILD_ROOT%{_sysconfdir}/X11/fs \
@@ -2014,6 +2013,7 @@
 	$RPM_BUILD_ROOT{%{_xsessdir},%{_wallpapersdir},%{_wmstylesdir}} \
 	$RPM_BUILD_ROOT%{_pkgconfigdir}
 
+PWD=`pwd`
 %{__make} -C xc	install	install.man \
 	DESTDIR="$RPM_BUILD_ROOT" \
 	DOCDIR="/usr/share/doc/%{name}-%{version}" \
@@ -2585,9 +2585,9 @@
 %{_libx11dir}/Options
 %{_libx11dir}/getconfig
 
-%config(missingok,noreplace) %verify(not md5 size mtime) %{_sysconfdir}/X11/xorg.conf
-%attr(640,root,root) %config %verify(not md5 size mtime) /etc/pam.d/xserver
-%attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/security/blacklist.xserver
+%config(missingok,noreplace) %verify(not md5 mtime size) %{_sysconfdir}/X11/xorg.conf
+%attr(640,root,root) %config %verify(not md5 mtime size) /etc/pam.d/xserver
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.xserver
 %config(missingok) /etc/security/console.apps/xserver
 
 %files Xvfb
@@ -3361,10 +3361,10 @@
 
 %files xdm
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/pam.d/xdm
-%attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/security/blacklist.xdm
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/xdm
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.xdm
 %attr(754,root,root) /etc/rc.d/init.d/xdm
-%attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/sysconfig/xdm
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/xdm
 /var/lib/xdm
 
 %{_appdefsdir}/Chooser
@@ -3375,25 +3375,25 @@
 %{_mandir}/man1/xdm.1*
 
 %dir %{_sysconfdir}/X11/xdm
-%attr(755,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/X11/xdm/GiveConsole
-%attr(755,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/X11/xdm/TakeConsole
-%attr(755,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/X11/xdm/Xsession
-%attr(755,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/X11/xdm/Xsetup_0
-%attr(755,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/X11/xdm/Xwilling
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/X11/xdm/Xaccess
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/X11/xdm/Xresources
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/X11/xdm/Xservers
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/X11/xdm/xdm-config
+%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/X11/xdm/GiveConsole
+%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/X11/xdm/TakeConsole
+%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/X11/xdm/Xsession
+%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/X11/xdm/Xsetup_0
+%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/X11/xdm/Xwilling
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/X11/xdm/Xaccess
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/X11/xdm/Xresources
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/X11/xdm/Xservers
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/X11/xdm/xdm-config
 %{_sysconfdir}/X11/xdm/pixmaps
 %{_sysconfdir}/X11/xdm/authdir
 
 %files xfs
 %defattr(644,root,root,755)
 %attr(754,root,root) /etc/rc.d/init.d/xfs
-%attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/sysconfig/xfs
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/xfs
 %dir %{_sysconfdir}/X11/fs
 %attr(755,root,root) %{_libx11dir}/fs
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/X11/fs/config
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/X11/fs/config
 
 %attr(755,root,root) %{_bindir}/xfs
 %attr(755,root,root) %{_bindir}/fslsfonts
@@ -3413,6 +3413,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.163  2005/12/04 23:37:15  glen
+- adapterized (sorted %verify flags)
+
 Revision 1.162  2005/11/20 08:05:35  qboosh
 - don't provide obsolete XF86_SVGA descs as Xserver descs
 

================================================================
Index: SPECS/XFree86.spec
diff -u SPECS/XFree86.spec:1.616 SPECS/XFree86.spec:1.617
--- SPECS/XFree86.spec:1.616	Sun Nov 20 09:05:35 2005
+++ SPECS/XFree86.spec	Mon Dec  5 00:37:15 2005
@@ -25,11 +25,11 @@
 Epoch:		1
 License:	XFree86 1.1
 Group:		X11
-Source0:	ftp://ftp.xfree86.org/pub/XFree86/4.4.0/source/XFree86-4.4.0-src-1.tgz
+Source0:	ftp://ftp.xfree86.org/pub/XFree86/4.4.0/source/%{name}-%{version}-src-1.tgz
 # Source0-md5:	97cea3d9e1197dde32ca34e3b6086469
-Source1:	ftp://ftp.xfree86.org/pub/XFree86/4.4.0/source/XFree86-4.4.0-src-2.tgz
+Source1:	ftp://ftp.xfree86.org/pub/XFree86/4.4.0/source/%{name}-%{version}-src-2.tgz
 # Source1-md5:	b9b6c74a03e314569e01d5fd4ff59523
-Source2:	ftp://ftp.xfree86.org/pub/XFree86/4.4.0/source/XFree86-4.4.0-src-3.tgz
+Source2:	ftp://ftp.xfree86.org/pub/XFree86/4.4.0/source/%{name}-%{version}-src-3.tgz
 # Source2-md5:	703404f48d3a15f58389a879d47c769d
 Source7:	ftp://ftp.pld-linux.org/software/xinit/xdm-xinitrc-0.2.tar.bz2
 # Source7-md5:	0a15b1c374256b5cad7961807baa3896
@@ -70,7 +70,7 @@
 Source52:	xmag.png
 Source53:	http://oss.sgi.com/projects/ogl-sample/ABI/glext.h
 # NoSource53-md5: 0c40bd4545aa630e139043c2b12f0807
-Source54:	XFree86-xrender.pc
+Source54:	%{name}-xrender.pc
 Patch0:		%{name}-PLD.patch
 Patch1:		%{name}-HasZlib.patch
 Patch2:		%{name}-DisableDebug.patch
@@ -349,7 +349,7 @@
 %package OpenGL-core
 Summary:	OpenGL support extension modules for Xserver
 Summary(pl):	Moduły rozszerzeń X serwera obsługujące OpenGL
-Group:		X11/Xserver
+Group:		X11/Servers
 Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
 
 %description OpenGL-core
@@ -446,8 +446,8 @@
 Summary(uk):	"÷ËĚÁÄĹÎÉĘ" ÓĹŇ×ĹŇ XFree86
 Group:		X11/Servers
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
-Requires:	/usr/X11R6/lib/X11/rgb.txt
 Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
+Requires:	/usr/X11R6/lib/X11/rgb.txt
 Requires:	XFree86-fonts-base
 
 %description Xnest
@@ -487,11 +487,11 @@
 Summary:	X print server
 Summary(pl):	X serwer z rozszerzeniem Xprint
 Group:		X11/Servers
-PreReq:		xprint-initrc
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
-Requires:	/usr/X11R6/lib/X11/rgb.txt
 Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
+Requires:	/usr/X11R6/lib/X11/rgb.txt
 Requires:	XFree86-fonts-base
+Requires:	xprint-initrc
 
 %description Xprt
 Xprt provides an X server with the print extension and special DDX
@@ -508,8 +508,8 @@
 Summary(tr):	XFree86 sunucusu
 Group:		X11/Servers
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
-Requires:	/usr/X11R6/lib/X11/rgb.txt
 Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
+Requires:	/usr/X11R6/lib/X11/rgb.txt
 Requires:	XFree86-fonts-base
 Requires:	pam
 Obsoletes:	XFree86-Mono
@@ -544,8 +544,8 @@
 Summary(uk):	óĹŇ×ĹŇ XFree86 ÄĚŃ ×ŚŇÔŐÁĚŘÎĎÇĎ ĆŇĹĘÍÂŐĆĹŇÁ
 Group:		X11/Servers
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
-Requires:	/usr/X11R6/lib/X11/rgb.txt
 Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
+Requires:	/usr/X11R6/lib/X11/rgb.txt
 Requires:	XFree86-fonts-base
 
 %description Xvfb
@@ -619,8 +619,8 @@
 Summary(tr):	X11R6 ile geliţtirme için gerekli dosyalar
 Summary(uk):	âŚÂĚŚĎÔĹËÉ ĐŇĎÇŇÁÍŚÓÔÁ, ČĹÄĹŇÉ ÔÁ ÄĎËŐÍĹÎÔÁĂŚŃ ĐĎ ĐŇĎÇŇÁÍŐ×ÁÎÎŔ X11R6
 Group:		X11/Development/Libraries
-Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 Requires:	%{name}-imake = %{epoch}:%{version}-%{release}
+Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 Requires:	fontconfig-devel >= 1:1.0.0
 Provides:	render = 0.8
 Provides:	xcursor-devel = 1.0
@@ -764,8 +764,8 @@
 Summary(pl):	Sterownik do kart ATI Radeon
 Group:		X11/Servers
 Requires:	%{name}-Xserver = %{epoch}:%{version}-%{release}
-Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
 Requires:	%{name}-driver-ati = %{epoch}:%{version}-%{release}
+Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
 %ifarch %{ix86} ia64 %{x8664} alpha ppc arm
 # for dri
 Requires:	%{name}-OpenGL-core = %{epoch}:%{version}-%{release}
@@ -1701,13 +1701,13 @@
 Summary(ru):	íĹÎĹÄÖĹŇ ÄÉÓĐĚĹŃ X
 Summary(uk):	íĹÎĹÄÖĹŇ ÄÉÓĐĚĹŔ X
 Group:		X11
-PreReq:		rc-scripts
 Requires(post,preun):	/sbin/chkconfig
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
-Requires:	pam >= 0.71
 Requires:	%{name}-sessreg = %{epoch}:%{version}-%{release}
 Requires:	/usr/X11R6/bin/sessreg
+Requires:	pam >= 0.71
+Requires:	rc-scripts
 Provides:	XDM
 Provides:	xdm = %{epoch}:%{version}-%{release}
 Obsoletes:	entrance
@@ -1739,16 +1739,16 @@
 Summary(ru):	ćĎÎÔÓĹŇ×ĹŇ ÄĚŃ X Window System
 Summary(uk):	ćĎÎÔÓĹŇ×ĹŇ ÄĚŃ X Window System
 Group:		X11
-PreReq:		rc-scripts
-Requires(pre):	/bin/id
-Requires(pre):	/usr/bin/getgid
-Requires(pre):	/usr/sbin/useradd
-Requires(pre):	/usr/sbin/groupadd
 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:	%{name}-libs = %{epoch}:%{version}-%{release}
 Requires:	XFree86-fonts-base
+Requires:	rc-scripts
 Provides:	xfs = %{epoch}:%{version}-%{release}
 Provides:	group(xfs)
 Provides:	user(xfs)
@@ -2435,9 +2435,9 @@
 %{_libx11dir}/Options
 %{_libx11dir}/getconfig
 
-%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/X11/XF86Config
-%attr(640,root,root) %config %verify(not md5 size mtime) /etc/pam.d/xserver
-%attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/security/blacklist.xserver
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/X11/XF86Config
+%attr(640,root,root) %config %verify(not md5 mtime size) /etc/pam.d/xserver
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.xserver
 %config(missingok) /etc/security/console.apps/xserver
 
 %files Xvfb
@@ -3176,10 +3176,10 @@
 
 %files xdm
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/pam.d/xdm
-%attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/security/blacklist.xdm
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/xdm
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.xdm
 %attr(754,root,root) /etc/rc.d/init.d/xdm
-%attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/sysconfig/xdm
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/xdm
 /var/lib/xdm
 
 %{_appdefsdir}/Chooser
@@ -3189,26 +3189,26 @@
 %attr(755,root,root) %{_bindir}/chooser
 %{_mandir}/man1/xdm.1*
 
-%dir /etc/X11/xdm
-%attr(755,root,root) %config(noreplace) %verify(not size mtime md5) /etc/X11/xdm/GiveConsole
-%attr(755,root,root) %config(noreplace) %verify(not size mtime md5) /etc/X11/xdm/TakeConsole
-%attr(755,root,root) %config(noreplace) %verify(not size mtime md5) /etc/X11/xdm/Xsession
-%attr(755,root,root) %config(noreplace) %verify(not size mtime md5) /etc/X11/xdm/Xsetup_0
-%attr(755,root,root) %config(noreplace) %verify(not size mtime md5) /etc/X11/xdm/Xwilling
-%config(noreplace) %verify(not size mtime md5) /etc/X11/xdm/Xaccess
-%config(noreplace) %verify(not size mtime md5) /etc/X11/xdm/Xresources
-%config(noreplace) %verify(not size mtime md5) /etc/X11/xdm/Xservers
-%config(noreplace) %verify(not size mtime md5) /etc/X11/xdm/xdm-config
-/etc/X11/xdm/pixmaps
-/etc/X11/xdm/authdir
+%dir %{_sysconfdir}/X11/xdm
+%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/X11/xdm/GiveConsole
+%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/X11/xdm/TakeConsole
+%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/X11/xdm/Xsession
+%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/X11/xdm/Xsetup_0
+%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/X11/xdm/Xwilling
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/X11/xdm/Xaccess
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/X11/xdm/Xresources
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/X11/xdm/Xservers
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/X11/xdm/xdm-config
+%{_sysconfdir}/X11/xdm/pixmaps
+%{_sysconfdir}/X11/xdm/authdir
 
 %files xfs
 %defattr(644,root,root,755)
 %attr(754,root,root) /etc/rc.d/init.d/xfs
-%attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/sysconfig/xfs
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/xfs
 %dir %{_sysconfdir}/X11/fs
 %attr(755,root,root) %{_libx11dir}/fs
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/X11/fs/config
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/X11/fs/config
 
 %attr(755,root,root) %{_bindir}/xfs
 %attr(755,root,root) %{_bindir}/fslsfonts
@@ -3228,6 +3228,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.617  2005/12/04 23:37:15  glen
+- adapterized (sorted %verify flags)
+
 Revision 1.616  2005/11/20 08:05:35  qboosh
 - don't provide obsolete XF86_SVGA descs as Xserver descs
 

================================================================
Index: SPECS/Zope.spec
diff -u SPECS/Zope.spec:1.92 SPECS/Zope.spec:1.93
--- SPECS/Zope.spec:1.92	Mon Jul 11 18:00:43 2005
+++ SPECS/Zope.spec	Mon Dec  5 00:37:15 2005
@@ -33,23 +33,23 @@
 Patch3:		%{name}-no_initgroups.patch
 Patch4:		%{name}-python24.patch
 URL:		http://www.zope.org/
-BuildRequires:	python-devel >= 1:2.3.3
 BuildRequires:	perl-base
+BuildRequires:	python-devel >= 1:2.3.3
 BuildRequires:	rpmbuild(macros) >= 1.213
-PreReq:		rc-scripts
+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(postun):	/usr/sbin/groupdel
-Requires(postun):	/usr/sbin/userdel
-Requires(post,preun):	/sbin/chkconfig
 Requires:	expat >= 1.95.7
 Requires:	logrotate
 Requires:	python >= 2.3.3
-Requires:	python-modules >= 2.3.3
-Requires:	python-libs >= 2.3.3
 Requires:	python-PyXML >= 0.8.3
+Requires:	python-libs >= 2.3.3
+Requires:	python-modules >= 2.3.3
+Requires:	rc-scripts
 %pyrequires_eq	python
 Provides:	group(zope)
 Provides:	user(zope)
@@ -215,12 +215,12 @@
 %attr(775,zope,zope) %dir /var/lib/zope/main
 %attr(775,zope,zope) %dir /var/log/zope
 %attr(775,zope,zope) %dir /var/log/zope/main
-%attr(640,root,root) %dir /etc/zope
-%attr(640,root,root) %dir /etc/zope/skel
-%attr(640,root,root) %dir /etc/zope/main
-%attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/zope/skel/*
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/logrotate.d/zope
-%attr(640,root,root) /etc/sysconfig/zope
+%attr(640,root,root) %dir %{_sysconfdir}/zope
+%attr(640,root,root) %dir %{_sysconfdir}/zope/skel
+%attr(640,root,root) %dir %{_sysconfdir}/zope/main
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/zope/skel/*
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/zope
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/zope
 %ghost /var/log/zope/main/event.log
 %ghost /var/log/zope/main/Z2.log
 
@@ -230,6 +230,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.93  2005/12/04 23:37:15  glen
+- adapterized (sorted %verify flags)
+
 Revision 1.92  2005/07/11 16:00:43  ciesiel
 - upgraded to version 2.7.7
 

================================================================
Index: SPECS/rogue.spec
diff -u SPECS/rogue.spec:1.27 SPECS/rogue.spec:1.28
--- SPECS/rogue.spec:1.27	Wed Dec  1 16:21:39 2004
+++ SPECS/rogue.spec	Mon Dec  5 00:37:15 2005
@@ -103,7 +103,7 @@
 %defattr(644,root,root,755)
 %attr(2755,root,games) %{_bindir}/*
 %attr(2775,root,games) %dir %{_datadir}
-%attr(664,root,games) %config(noreplace) %verify(not md5 size mtime) %{_datadir}/rogue.scores
+%attr(664,root,games) %config(noreplace) %verify(not md5 mtime size) %{_datadir}/rogue.scores
 
 # don't gzip rogue.instr!
 %doc usr/games/rogue.instr README guide.txt COPYING
@@ -121,6 +121,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.28  2005/12/04 23:37:15  glen
+- adapterized (sorted %verify flags)
+
 Revision 1.27  2004/12/01 15:21:39  zbyniu
 - BR: unzip
 

================================================================
Index: SPECS/rp-pppoe.spec
diff -u SPECS/rp-pppoe.spec:1.21 SPECS/rp-pppoe.spec:1.22
--- SPECS/rp-pppoe.spec:1.21	Sat Jan  1 20:43:39 2005
+++ SPECS/rp-pppoe.spec	Mon Dec  5 00:37:15 2005
@@ -22,8 +22,8 @@
 Patch2:		%{name}-enobufs.patch
 Patch3:		%{name}-plugins.patch
 URL:		http://www.roaringpenguin.com/pppoe/
-BuildRequires:	automake
 BuildRequires:	autoconf
+BuildRequires:	automake
 Requires:	ppp >= 2.4.1
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -92,9 +92,9 @@
 Summary:	PPPoE server
 Summary(pl):	Serwer PPPoE
 Group:		Networking/Daemons
-PreReq:		rc-scripts
 Requires(post,preun):	/sbin/chkconfig
 Requires:	ppp >= 2.4.1
+Requires:	rc-scripts
 
 %description server
 PPP over Ethernet server.
@@ -106,8 +106,8 @@
 Summary:	PPPoE relay
 Summary(pl):	Agent przekazujący pakiety PPPoE
 Group:		Networking/Daemons
-PreReq:		rc-scripts
 Requires(post,preun):	/sbin/chkconfig
+Requires:	rc-scripts
 
 %description relay
 PPP over Ethernet relay.
@@ -213,14 +213,14 @@
 %config(noreplace) %{_sysconfdir}/ppp/pppoe-server-options
 %{_mandir}/man8/pppoe-server*
 %attr(754,root,root) /etc/rc.d/init.d/pppoe-server
-%attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/sysconfig/pppoe-server
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/pppoe-server
 
 %files relay
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/pppoe-relay
 %{_mandir}/man8/pppoe-relay*
 %attr(754,root,root) /etc/rc.d/init.d/pppoe-relay
-%attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/sysconfig/pppoe-relay
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/pppoe-relay
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -228,6 +228,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.22  2005/12/04 23:37:15  glen
+- adapterized (sorted %verify flags)
+
 Revision 1.21  2005/01/01 19:43:39  djrzulf
 - added patch which correcting plugins path,
 - Release 6,

================================================================
Index: SPECS/rpld.spec
diff -u SPECS/rpld.spec:1.15 SPECS/rpld.spec:1.16
--- SPECS/rpld.spec:1.15	Thu Apr  8 00:40:48 2004
+++ SPECS/rpld.spec	Mon Dec  5 00:37:15 2005
@@ -12,8 +12,8 @@
 Source2:	%{name}.sysconfig
 Patch0:		%{name}-build.patch
 URL:		http://gimel.esc.cam.ac.uk/james/rpld/
-PreReq:		rc-scripts
 Requires(post,preun):	/sbin/chkconfig
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/X11.spec?r1=1.162&r2=1.163&f=u
    http://cvs.pld-linux.org/SPECS/XFree86.spec?r1=1.616&r2=1.617&f=u
    http://cvs.pld-linux.org/SPECS/Zope.spec?r1=1.92&r2=1.93&f=u
    http://cvs.pld-linux.org/SPECS/rogue.spec?r1=1.27&r2=1.28&f=u
    http://cvs.pld-linux.org/SPECS/rp-pppoe.spec?r1=1.21&r2=1.22&f=u
    http://cvs.pld-linux.org/SPECS/rpld.spec?r1=1.15&r2=1.16&f=u
    http://cvs.pld-linux.org/SPECS/sap.spec?r1=1.23&r2=1.24&f=u
    http://cvs.pld-linux.org/SPECS/scandetd.spec?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/SPECS/scponly.spec?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/SPECS/setup.spec?r1=1.114&r2=1.115&f=u
    http://cvs.pld-linux.org/SPECS/slrn.spec?r1=1.117&r2=1.118&f=u
    http://cvs.pld-linux.org/SPECS/smbldap-tools.spec?r1=1.11&r2=1.12&f=u
    http://cvs.pld-linux.org/SPECS/srp.spec?r1=1.30&r2=1.31&f=u
    http://cvs.pld-linux.org/SPECS/su1.spec?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SPECS/sudo.spec?r1=1.102&r2=1.103&f=u
    http://cvs.pld-linux.org/SPECS/sysklogd.spec?r1=1.110&r2=1.111&f=u
    http://cvs.pld-linux.org/SPECS/tcsh.spec?r1=1.73&r2=1.74&f=u
    http://cvs.pld-linux.org/SPECS/tinyca.spec?r1=1.29&r2=1.30&f=u
    http://cvs.pld-linux.org/SPECS/unixODBC.spec?r1=1.94&r2=1.95&f=u
    http://cvs.pld-linux.org/SPECS/updatedd.spec?r1=1.18&r2=1.19&f=u
    http://cvs.pld-linux.org/SPECS/usage.spec?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/SPECS/verliadmin.spec?r1=1.15&r2=1.16&f=u
    http://cvs.pld-linux.org/SPECS/vgrabbj.spec?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SPECS/wpjabber.spec?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/SPECS/wu-ftpd.spec?r1=1.52&r2=1.53&f=u
    http://cvs.pld-linux.org/SPECS/wwwoffle.spec?r1=1.84&r2=1.85&f=u
    http://cvs.pld-linux.org/SPECS/xawdecode.spec?r1=1.32&r2=1.33&f=u
    http://cvs.pld-linux.org/SPECS/xinitrc-ng.spec?r1=1.11&r2=1.12&f=u
    http://cvs.pld-linux.org/SPECS/xinitrc.spec?r1=1.34&r2=1.35&f=u
    http://cvs.pld-linux.org/SPECS/xrally.spec?r1=1.25&r2=1.26&f=u
    http://cvs.pld-linux.org/SPECS/zebra-xs26.spec?r1=1.21&r2=1.22&f=u
    http://cvs.pld-linux.org/SPECS/zebra.spec?r1=1.106&r2=1.107&f=u

More information about the pld-cvs-commit mailing list