SPECS: FHS.spec, FreeWnn.spec, GeoIP.spec, fbset.spec, fcron.spec, ...

glen glen at pld-linux.org
Mon Dec 12 17:27:15 CET 2005


Author: glen                         Date: Mon Dec 12 16:27:15 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- adapterized (sorted %verify attrs)

---- Files affected:
SPECS:
   FHS.spec (1.106 -> 1.107) , FreeWnn.spec (1.19 -> 1.20) , GeoIP.spec (1.22 -> 1.23) , fbset.spec (1.56 -> 1.57) , fcron.spec (1.30 -> 1.31) , fdutils.spec (1.24 -> 1.25) , file.spec (1.113 -> 1.114) , filtergen.spec (1.23 -> 1.24) , firelogd.spec (1.5 -> 1.6) , firewall-init-ipchains.spec (1.38 -> 1.39) , firewall-init.spec (1.44 -> 1.45) , foomatic-db-engine.spec (1.20 -> 1.21) , foomatic-filters.spec (1.22 -> 1.23) , freedt.spec (1.8 -> 1.9) , freelords.spec (1.29 -> 1.30) , freenet6-client.spec (1.7 -> 1.8) , freeswan.spec (1.77 -> 1.78) , freetds.spec (1.19 -> 1.20) , freevo.spec (1.10 -> 1.11) , frottle.spec (1.4 -> 1.5) , frotz.spec (1.8 -> 1.9) , ftpd-BSD.spec (1.68 -> 1.69) , ftpproxy.spec (1.14 -> 1.15) , fvwm2.spec (1.71 -> 1.72) , fwlogwatch.spec (1.15 -> 1.16) , fwtk.spec (1.14 -> 1.15) , ganso.spec (1.28 -> 1.29) , gdkxft.spec (1.56 -> 1.57) , geki2-KXL.spec (1.7 -> 1.8) , geki3-KXL.spec (1.7 -> 1.8) , geki5-KXL.spec (1.6 -> 1.7) , getty_ps.spec (1.26 -> 1.27) , gfontview.spec (1.51 -> 1.52) , ggrelay.spec (1.9 -> 1.10) , ghostscript-esp.spec (1.160 -> 1.161) , gimp.spec (1.261 -> 1.262) , glftpd.spec (1.9 -> 1.10) , global.spec (1.26 -> 1.27) , gmc.spec (1.3 -> 1.4) , gnotify.spec (1.10 -> 1.11) , gnu-radius.spec (1.18 -> 1.19) , gnudip.spec (1.10 -> 1.11) , gnugk.spec (1.28 -> 1.29) , gnustep-base.spec (1.61 -> 1.62) , gnustep-make-libFoundation.spec (1.1 -> 1.2) , gopher.spec (1.6 -> 1.7) , gpm.spec (1.129 -> 1.130) , grace.spec (1.49 -> 1.50) , gtk+.spec (1.138 -> 1.139) , gtop.spec (1.44 -> 1.45) , haps.spec (1.4 -> 1.5) , hddtemp.spec (1.28 -> 1.29) , heimdal.spec (1.116 -> 1.117) , hercules.spec (1.15 -> 1.16) , hostapd.spec (1.12 -> 1.13) , hotkeys.spec (1.26 -> 1.27) , htdig.spec (1.55 -> 1.56) , httptunnel.spec (1.21 -> 1.22) , hylafax.spec (1.38 -> 1.39) , i8kutils.spec (1.12 -> 1.13) , icebreaker.spec (1.18 -> 1.19) , icradius.spec (1.40 -> 1.41) , id-utils.spec (1.4 -> 1.5) , ifhp.spec (1.47 -> 1.48) , ile.spec (1.9 -> 1.10) , ilohamail.spec (1.6 -> 1.7) , imlib.spec (1.108 -> 1.109)
 , imwheel.spec (1.26 -> 1.27) , inet6-apps.spec (1.33 -> 1.34) , inetutils.spec (1.8 -> 1.9) , inn.spec (1.163 -> 1.164) , intersync.spec (1.13 -> 1.14) , ipband.spec (1.15 -> 1.16) , ipxripd.spec (1.37 -> 1.38) , ipxtund.spec (1.19 -> 1.20) , ircd-hybrid.spec (1.45 -> 1.46) , ircd-ptlink.spec (1.14 -> 1.15) , ircservices-ptlink.spec (1.5 -> 1.6) , irrd.spec (1.14 -> 1.15) , isapnptools.spec (1.39 -> 1.40) , isdn4k-utils.spec (1.49 -> 1.50) 

---- Diffs:

================================================================
Index: SPECS/FHS.spec
diff -u SPECS/FHS.spec:1.106 SPECS/FHS.spec:1.107
--- SPECS/FHS.spec:1.106	Sat Dec 10 14:28:17 2005
+++ SPECS/FHS.spec	Mon Dec 12 17:24:19 2005
@@ -11,7 +11,7 @@
 Group:		Base
 URL:		http://www.pathname.com/fhs/
 BuildRequires:	rpmbuild(macros) >= 1.213
-PreReq:		setup >= 2.4.6-4
+Requires:	setup >= 2.4.6-4
 Provides:	filesystem
 Obsoletes:	filesystem
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -235,6 +235,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.107  2005/12/12 16:24:19  glen
+- adapterized (sorted %verify attrs)
+
 Revision 1.106  2005/12/10 13:28:17  qboosh
 - sync localized man dirs with man
 

================================================================
Index: SPECS/FreeWnn.spec
diff -u SPECS/FreeWnn.spec:1.19 SPECS/FreeWnn.spec:1.20
--- SPECS/FreeWnn.spec:1.19	Sun May  1 20:49:15 2005
+++ SPECS/FreeWnn.spec	Mon Dec 12 17:24:19 2005
@@ -28,7 +28,7 @@
 BuildRequires:	libtool
 BuildRequires:	ncurses-devel
 BuildRequires:	rpmbuild(macros) >= 1.202
-PreReq:		%{name}-common = %{epoch}:%{version}-%{release}
+Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Requires(post,preun):	/sbin/chkconfig
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 Requires:	setup >= 2.4.1
@@ -93,12 +93,12 @@
 Summary:	Common files for Wnn
 Summary(pl):	Wspólne pliki Wnn
 Group:		Applications/System
+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
 Provides:	group(wnn)
 Provides:	user(wnn)
 
@@ -114,8 +114,8 @@
 Summary:	cWnn Chinese Input System (version for China)
 Summary(pl):	cWnn System wprowadzania znaków chińskich (wersja dla Chin)
 Group:		Applications/System
-PreReq:		cWnn-common = %{epoch}:%{version}-%{release}
-PreReq:		setup >= 2.4.1-3
+Requires:	cWnn-common = %{epoch}:%{version}-%{release}
+Requires:	setup >= 2.4.1-3
 Requires(post,preun):	/sbin/chkconfig
 
 %description -n cWnn
@@ -182,8 +182,8 @@
 Summary:	tWnn Chinese Input System (version for Taiwan)
 Summary(pl):	System wprowadzania znaków chińskich tWnn (wersja dla Tajwanu)
 Group:		Applications/System
-PreReq:		cWnn-common = %{epoch}:%{version}-%{release}
-PreReq:		setup >= 2.4.1-3
+Requires:	cWnn-common = %{epoch}:%{version}-%{release}
+Requires:	setup >= 2.4.1-3
 Requires(post,preun):	/sbin/chkconfig
 
 %description -n tWnn
@@ -196,8 +196,8 @@
 Summary:	kWnn Korean Input System
 Summary(pl):	System wprowadzania znaków koreańskich kWnn
 Group:		Applications/System
-PreReq:		%{name}-common = %{epoch}:%{version}-%{release}
-PreReq:		setup >= 2.4.1-3
+Requires:	%{name}-common = %{epoch}:%{version}-%{release}
+Requires:	setup >= 2.4.1-3
 Requires(post,preun):	/sbin/chkconfig
 Requires:	kWnn-libs = %{epoch}:%{version}-%{release}
 
@@ -410,12 +410,12 @@
 %attr(775,root,wnn) %dir /var/lib/wnn/ja/dic/*
 %attr(664,root,wnn) /var/lib/wnn/ja/dic/*/*
 %dir %{_sysconfdir}/ja
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/ja/[hjluw]*
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ja/[hjluw]*
 %{_sysconfdir}/ja/dic
 %{_sysconfdir}/ja/rk
 %{_sysconfdir}/ja/rk.vi
 %dir %{_sysconfdir}/lt_LN
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/lt_LN/u*
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lt_LN/u*
 %{_sysconfdir}/lt_LN/rk
 
 %files libs
@@ -444,7 +444,7 @@
 %lang(ja) %doc Xsi/ChangeLog
 %lang(ja) %doc Xsi/Xwnmo/manual
 %dir %{_sysconfdir}
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/[cs]*
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/[cs]*
 %dir /var/lib/wnn
 
 %files -n cWnn
@@ -452,7 +452,7 @@
 %attr(754,root,root) /etc/rc.d/init.d/cWnn
 %attr(755,root,root) %{_bindir}/cserver
 %dir %{_sysconfdir}/zh_CN
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/zh_CN/[cluw]*
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/zh_CN/[cluw]*
 %{_sysconfdir}/zh_CN/dic
 %{_sysconfdir}/zh_CN/rk
 %{_sysconfdir}/zh_CN/rk_p
@@ -497,7 +497,7 @@
 %attr(754,root,root) /etc/rc.d/init.d/tWnn
 %attr(755,root,root) %{_bindir}/tserver
 %dir %{_sysconfdir}/zh_TW
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/zh_TW/[cltuw]*
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/zh_TW/[cltuw]*
 %{_sysconfdir}/zh_TW/dic
 %{_sysconfdir}/zh_TW/rk
 %{_sysconfdir}/zh_TW/rk_p
@@ -521,7 +521,7 @@
 %attr(755,root,root) %{_bindir}/kwnntouch
 %dir %{_sysconfdir}/ko_KR
 %{_sysconfdir}/ko_KR/dic
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/ko_KR/[hkluw]*
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ko_KR/[hkluw]*
 %attr(775,root,wnn) %dir /var/lib/wnn/ko_KR/dic
 %attr(775,root,wnn) %dir /var/lib/wnn/ko_KR/dic/*
 %attr(664,root,wnn) /var/lib/wnn/ko_KR/dic/*/*
@@ -547,6 +547,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.20  2005/12/12 16:24:19  glen
+- adapterized (sorted %verify attrs)
+
 Revision 1.19  2005/05/01 18:49:15  glen
 - new spec syntax is so cool
 

================================================================
Index: SPECS/GeoIP.spec
diff -u SPECS/GeoIP.spec:1.22 SPECS/GeoIP.spec:1.23
--- SPECS/GeoIP.spec:1.22	Thu Sep 22 22:06:45 2005
+++ SPECS/GeoIP.spec	Mon Dec 12 17:24:19 2005
@@ -100,7 +100,7 @@
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_libdir}/lib*.so.*.*.*
 %{_datadir}/%{name}
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/GeoIP.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/GeoIP.conf
 %{_mandir}/man1/*
 
 %files devel
@@ -119,6 +119,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.23  2005/12/12 16:24:19  glen
+- adapterized (sorted %verify attrs)
+
 Revision 1.22  2005/09/22 20:06:45  charles
 - updated to 1.3.14
 

================================================================
Index: SPECS/fbset.spec
diff -u SPECS/fbset.spec:1.56 SPECS/fbset.spec:1.57
--- SPECS/fbset.spec:1.56	Thu Jan 20 20:33:03 2005
+++ SPECS/fbset.spec	Mon Dec 12 17:24:19 2005
@@ -83,8 +83,8 @@
 %doc etc/*
 %attr(755,root,root) %{_bindir}/*
 %attr(754,root,root) /etc/rc.d/init.d/fbset
-%config(noreplace) %verify(not size mtime md5) /etc/sysconfig/fbset
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/fb.modes
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/fbset
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fb.modes
 %{_mandir}/man*/*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -93,6 +93,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.57  2005/12/12 16:24:19  glen
+- adapterized (sorted %verify attrs)
+
 Revision 1.56  2005/01/20 19:33:03  qboosh
 - release 28: updated .init to restore last tty instead of switching to tty1
 

================================================================
Index: SPECS/fcron.spec
diff -u SPECS/fcron.spec:1.30 SPECS/fcron.spec:1.31
--- SPECS/fcron.spec:1.30	Sun Dec  4 23:58:06 2005
+++ SPECS/fcron.spec	Mon Dec 12 17:24:19 2005
@@ -21,7 +21,6 @@
 BuildRequires:	libselinux-devel
 BuildRequires:	pam-devel
 BuildRequires:	rpmbuild(macros) >= 1.202
-Requires:	rc-scripts
 Requires(post):	fileutils
 Requires(post,preun):	/sbin/chkconfig
 Requires(postun):	/usr/sbin/groupdel
@@ -31,6 +30,7 @@
 Requires(pre):	/usr/sbin/useradd
 Requires:	/bin/run-parts
 Requires:	psmisc >= 20.1
+Requires:	rc-scripts
 Provides:	crontabs >= 1.7
 Provides:	crondaemon
 Provides:	group(crontab)
@@ -277,6 +277,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.31  2005/12/12 16:24:19  glen
+- adapterized (sorted %verify attrs)
+
 Revision 1.30  2005/12/04 22:58:06  glen
 - adapterized (sorted %verify flags)
 

================================================================
Index: SPECS/fdutils.spec
diff -u SPECS/fdutils.spec:1.24 SPECS/fdutils.spec:1.25
--- SPECS/fdutils.spec:1.24	Wed Aug 18 21:56:17 2004
+++ SPECS/fdutils.spec	Mon Dec 12 17:24:19 2005
@@ -81,7 +81,7 @@
 %files
 %defattr(644,root,root,755)
 %doc doc/README doc/floppy_formats Changelog CREDITS doc/FAQ.html
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/mediaprm
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mediaprm
 %attr(755,root,root) %{_bindir}/*
 %{_mandir}/man1/*
 %{_infodir}/*.info*
@@ -92,6 +92,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.25  2005/12/12 16:24:19  glen
+- adapterized (sorted %verify attrs)
+
 Revision 1.24  2004/08/18 19:56:17  undefine
 - release 10
 

================================================================
Index: SPECS/file.spec
diff -u SPECS/file.spec:1.113 SPECS/file.spec:1.114
--- SPECS/file.spec:1.113	Wed Oct 19 13:18:38 2005
+++ SPECS/file.spec	Mon Dec 12 17:24:19 2005
@@ -116,9 +116,9 @@
 ĽŐĽĄĽ¤Ľë¤ÎźďÎŕ¤ň¸ŤĘŹ¤ą¤ë¤ł¤Č¤Ź˛ÄÇ˝¤Ç¤˘¤ëĄŁ
 
 %description -l ko
-ĆÄŔĎżĄ ŔúŔĺľČ ŔÚˇá ŔŻÇüżĄ ľűśó ĆÄŔĎŔť ˝Äş°ÇĎ´Â file ¸íˇÉ.
-FileŔş ELF šŮŔ̳ʸŽ, ˝Ă˝şĹŰ śóŔ̺ꡯ¸Ž, RPM ĆĐĹ°ÁöżÍ
-´Ů¸Ľ ą×ˇĄÇČ ŔŻÇüŔť Ć÷ÇÔÇŃ żŠˇŻ ¸šŔş ĆÄŔĎ ŔŻÇüŔť ˝Äş° °Ą´ÉÇŐ´Ď´Ů.
+ĆÄŔĎżĄ ŔúŔĺľČ ŔÚˇá ŔŻÇüżĄ ľűśó ĆÄŔĎŔť ˝Äş°ÇĎ´Â file ¸íˇÉ. FileŔş ELF
+šŮŔ̳ʸŽ, ˝Ă˝şĹŰ śóŔ̺ꡯ¸Ž, RPM ĆĐĹ°ÁöżÍ ´Ů¸Ľ ą×ˇĄÇČ ŔŻÇüŔť Ć÷ÇÔÇŃ
+żŠˇŻ ¸šŔş ĆÄŔĎ ŔŻÇüŔť ˝Äş° °Ą´ÉÇŐ´Ď´Ů.
 
 %description -l nb
 Programmet "file" brukes for ĺ identifisere filer basert pĺ innhold.
@@ -157,7 +157,7 @@
 
 %description -l sv
 Kommandot file används för att identifera en fil vad avser vilken typ
-av data filen innehĺller.  File kan identifiera mĺnga olika filtyper,
+av data filen innehĺller. File kan identifiera mĺnga olika filtyper,
 inklusive ELF-binärer, systembibliotek, RPM-paket och olika
 grafikformat.
 
@@ -176,15 +176,14 @@
 ĐÁËĹÔÉ RPM, ŇŚÚÎĎÍÁÎŚÔÎŚ ÇŇÁĆŚŢÎŚ ĆĎŇÍÁÔÉ ÔÁ ÂÁÇÁÔĎ ŚÎŰÉČ.
 
 %description -l zh_CN
-file ĂüÁîÓĂŔ´¸ůžÝÎÄźţÖĐ°üşŹľÄĘýžÝŔŕĐÍŔ´ĘśąđÎÄźţŔŕĐÍĄŁ
-file żÉŇÔĘśąđĐíśŕ˛ťÍŹľÄÎÄźţŔŕĐÍŁŹ°üŔ¨ ELF śţ˝řÖĆĄ˘ĎľÍł
-żâĄ˘RPM Číźţ°üĄ˘şÍ˛ťÍŹľÄÍźĐθńĘ˝ĄŁ
+file ĂüÁîÓĂŔ´¸ůžÝÎÄźţÖĐ°üşŹľÄĘýžÝŔŕĐÍŔ´ĘśąđÎÄźţŔŕĐÍĄŁ file
+żÉŇÔĘśąđĐíśŕ˛ťÍŹľÄÎÄźţŔŕĐÍŁŹ°üŔ¨ ELF śţ˝řÖĆĄ˘ĎľÍł żâĄ˘RPM
+Číźţ°üĄ˘şÍ˛ťÍŹľÄÍźĐθńĘ˝ĄŁ
 
 %description -l zh_TW
-file ŤüĽOŹOŽÚžÚŔɎ׼]§tŞş¸ęŽĆĂţŤŹ¨Óżëť{ŔɎץC
-File ĽiĽHżëť{ł\Śh¤ŁŚPŞşŔÉŽ×ĂţŤŹĄA
-Ľ]§t ELF binariesĄA¨t˛Î¨çŚĄŽwĄARPM ŽMĽóĄAĽH¤Î¤ŁŚPŞş
-šĎšłŽćŚĄĄC
+file ŤüĽOŹOŽÚžÚŔɎ׼]§tŞş¸ęŽĆĂţŤŹ¨Óżëť{ŔɎץC File
+ĽiĽHżëť{ł\Śh¤ŁŚPŞşŔÉŽ×ĂţŤŹĄA Ľ]§t ELF binariesĄA¨t˛Î¨çŚĄŽwĄARPM
+ŽMĽóĄAĽH¤Î¤ŁŚPŞş šĎšłŽćŚĄĄC
 
 %package -n libmagic
 Summary:	libmagic library
@@ -318,7 +317,7 @@
 %doc ChangeLog LEGAL.NOTICE README
 %attr(755,root,root) %{_bindir}/*
 %{_datadir}/file
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/magic
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/magic
 %{_mandir}/man[15]/*
 %lang(de) %{_mandir}/de/man[15]/*
 %lang(es) %{_mandir}/es/man[15]/*
@@ -359,6 +358,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.114  2005/12/12 16:24:19  glen
+- adapterized (sorted %verify attrs)
+
 Revision 1.113  2005/10/19 11:18:38  qboosh
 - updated to 4.16, removed obsolete stdin-noclose patch, updated magic patch
 

================================================================
Index: SPECS/filtergen.spec
diff -u SPECS/filtergen.spec:1.23 SPECS/filtergen.spec:1.24
--- SPECS/filtergen.spec:1.23	Mon Mar 29 00:01:43 2004
+++ SPECS/filtergen.spec	Mon Dec 12 17:24:19 2005
@@ -13,8 +13,8 @@
 Source3:	filter.init
 URL:		http://hairy.beasts.org/filter/
 BuildRequires:	flex
-PreReq:		rc-scripts
 Requires(post,preun):	/sbin/chkconfig
+Requires:	rc-scripts
 Provides:	firewall
 Obsoletes:	filter
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -93,9 +93,9 @@
 %doc README HONESTY HISTORY TODO tests
 %attr(755,root,root) %{_sbindir}/filtergen
 %dir %{_sysconfdir}/filter
-%attr(600,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/filter/simple.conf
+%attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/filter/simple.conf
 %attr(600,root,root) %{_sysconfdir}/filter/generated_rules
-%attr(600,root,root) /etc/sysconfig/%{name}
+%attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
 %{_mandir}/man5/*
 %{_mandir}/man7/*
@@ -107,6 +107,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.24  2005/12/12 16:24:19  glen
+- adapterized (sorted %verify attrs)
+
 Revision 1.23  2004/03/28 22:01:43  qboosh
 - renamed filter.spec to filtergen.spec (follow package name change)
 - updated to 0.11, removed obsolete types patch

================================================================
Index: SPECS/firelogd.spec
diff -u SPECS/firelogd.spec:1.5 SPECS/firelogd.spec:1.6
--- SPECS/firelogd.spec:1.5	Fri Jan 30 00:04:39 2004
+++ SPECS/firelogd.spec	Mon Dec 12 17:24:19 2005
@@ -36,9 +36,9 @@
 Summary:	Scripts to run firelogd as daemon
 Summary(pl):	Skrypty do uruchamiania firelogd jako demona
 Group:		Daemons
-PreReq:		rc-scripts
 Requires(post,preun):	/sbin/chkconfig
 Requires:	%{name} = %{version}
+Requires:	rc-scripts
 
 %description scripts
 Scripts to run firelogd as daemon.
@@ -91,14 +91,14 @@
 %files
 %defattr(644,root,root,755)
 %doc README TEMPLATES BUGS
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/firelogd.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/firelogd.conf
 %attr(755,root,root) %{_sbindir}/*
 %{_mandir}/man8/*
 
 %files scripts
 %defattr(644,root,root,755)
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/sysconfig/%{name}
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
 %attr(640,root,root) /var/log/kernelpipe
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -107,6 +107,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2005/12/12 16:24:19  glen
+- adapterized (sorted %verify attrs)
+
 Revision 1.5  2004/01/29 23:04:39  twittner
 - typo
 

================================================================
Index: SPECS/firewall-init-ipchains.spec
diff -u SPECS/firewall-init-ipchains.spec:1.38 SPECS/firewall-init-ipchains.spec:1.39
--- SPECS/firewall-init-ipchains.spec:1.38	Wed Apr  7 11:29:33 2004
+++ SPECS/firewall-init-ipchains.spec	Mon Dec 12 17:24:19 2005
@@ -10,9 +10,9 @@
 Source0:	%{_name}-%{version}.tar.gz
 # Source0-md5:	07ba7a897e2d903d629e6607e3b495f3
 Patch0:		%{_name}-syntax_verify.patch
+Requires:	/sbin/chkconfig
 Requires:	ipchains
-PreReq:		rc-scripts
-PreReq:		/sbin/chkconfig
+Requires:	rc-scripts
 Obsoletes:	firewall-init < 2.2
 Conflicts:	firewall-init >= 2.99
 Buildarch:	noarch
@@ -58,8 +58,8 @@
 %files
 %defattr(644,root,root,755)
 %doc README input.example
-%attr(600,root,root) %verify(not size mtime md5) %config(noreplace) /etc/sysconfig/firewall
-%attr(600,root,root) %verify(not size mtime md5) %config(noreplace) /etc/sysconfig/firewall-rules/*
+%attr(600,root,root) %verify(not md5 mtime size) %config(noreplace) /etc/sysconfig/firewall
+%attr(600,root,root) %verify(not md5 mtime size) %config(noreplace) /etc/sysconfig/firewall-rules/*
 %attr(700,root,root) %dir /etc/sysconfig/firewall-rules
 %attr(754,root,root) /etc/rc.d/init.d/firewall
 
@@ -69,6 +69,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.39  2005/12/12 16:24:19  glen
+- adapterized (sorted %verify attrs)
+
 Revision 1.38  2004/04/07 09:29:33  ankry
 - name fixed
 

================================================================
Index: SPECS/firewall-init.spec
diff -u SPECS/firewall-init.spec:1.44 SPECS/firewall-init.spec:1.45
--- SPECS/firewall-init.spec:1.44	Sun Oct 16 14:30:25 2005
+++ SPECS/firewall-init.spec	Mon Dec 12 17:24:19 2005
@@ -3,21 +3,21 @@
 Summary(pl):	Skrypt startowy firewalla
 Name:		firewall-init
 Version:	2.99.8
-Release:	2		
+Release:	2
 License:	GPL
 Group:		Networking/Admin
 Source0:	ftp://ftp.pld-linux.org/software/firewall-init/%{name}-%{version}.tar.bz2
 # Source0-md5:	1237a67be00e5ecef53a934f86c7507b
-PreReq:		rc-scripts
 Requires(post,preun):	/sbin/chkconfig
 Requires:	iptables >= 1.2.2-2
+Requires:	rc-scripts
 Obsoletes:	iptables-init
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-Firewall-init is meant to provide an easy to use interface for starting
-and stopping the kernel IP packet filter through iptables(8).
+Firewall-init is meant to provide an easy to use interface for
+starting and stopping the kernel IP packet filter through iptables(8).
 
 %description -l pl
 Dzięki firewall-init uzyskuje się łatwy interfejs do startowania i
@@ -56,9 +56,9 @@
 %defattr(644,root,root,755)
 %doc README
 %defattr(640,root,root,750)
-%verify(not size mtime md5) %config(noreplace) /etc/sysconfig/firewall
-%verify(not size mtime md5) %config(noreplace) /etc/sysconfig/firewall.d/ip*
-%verify(not size mtime md5) %config(noreplace) /etc/sysconfig/firewall.d/functions.rules
+%verify(not md5 mtime size) %config(noreplace) /etc/sysconfig/firewall
+%verify(not md5 mtime size) %config(noreplace) /etc/sysconfig/firewall.d/ip*
+%verify(not md5 mtime size) %config(noreplace) /etc/sysconfig/firewall.d/functions.rules
 /etc/sysconfig/firewall.d/functions
 %attr(754,root,root) /etc/rc.d/init.d/firewall*
 %dir /etc/sysconfig/firewall.d
@@ -69,6 +69,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.45  2005/12/12 16:24:19  glen
+- adapterized (sorted %verify attrs)
+
 Revision 1.44  2005/10/16 12:30:25  kolodko
 - missing log
 

================================================================
Index: SPECS/foomatic-db-engine.spec
diff -u SPECS/foomatic-db-engine.spec:1.20 SPECS/foomatic-db-engine.spec:1.21
--- SPECS/foomatic-db-engine.spec:1.20	Wed Nov 23 20:33:44 2005
+++ SPECS/foomatic-db-engine.spec	Mon Dec 12 17:24:19 2005
@@ -22,17 +22,16 @@
 
 %description
 Foomatic is a system for using free software printer drivers with
-common spoolers on Unix. It supports LPD, PDQ, CUPS, the VA Linux
-LPD, LPRng, PPR, and direct spooler-less printing and any free
-software driver for which execution data has been entered in the
-database.
+common spoolers on Unix. It supports LPD, PDQ, CUPS, the VA Linux LPD,
+LPRng, PPR, and direct spooler-less printing and any free software
+driver for which execution data has been entered in the database.
 
 %description -l pl
-Foomatic to system pozwalający na używanie wolnodostępnych
-sterowników drukarek z popularnymi uniksowymi serwerami wydruków.
-Obsługuje LPD, PDQ, CUPS, VA Linux LPD, LPRng, PPR i bezpośrednie
-drukowanie bez kolejkowania oraz dowolny wolnodostępny sterownik,
-dla którego parametry zostały wprowadzone do bazy danych.
+Foomatic to system pozwalający na używanie wolnodostępnych sterowników
+drukarek z popularnymi uniksowymi serwerami wydruków. Obsługuje LPD,
+PDQ, CUPS, VA Linux LPD, LPRng, PPR i bezpośrednie drukowanie bez
+kolejkowania oraz dowolny wolnodostępny sterownik, dla którego
+parametry zostały wprowadzone do bazy danych.
 
 %prep
 %setup -q
@@ -62,7 +61,7 @@
 %files
 %defattr(644,root,root,755)
 %doc ChangeLog TODO README USAGE
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/foomatic
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/foomatic
 %attr(755,root,root) %{_bindir}/foomatic-*
 %attr(755,root,root) %{_sbindir}/foomatic-*
 %{perl_vendorlib}/Foomatic
@@ -76,6 +75,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.21  2005/12/12 16:24:19  glen
+- adapterized (sorted %verify attrs)
+
 Revision 1.20  2005/11/23 19:33:44  blekot
 - up to 3.0.2
 - patch0 no longer needed. removed

================================================================
Index: SPECS/foomatic-filters.spec
diff -u SPECS/foomatic-filters.spec:1.22 SPECS/foomatic-filters.spec:1.23
--- SPECS/foomatic-filters.spec:1.22	Tue Jan 18 10:20:47 2005
+++ SPECS/foomatic-filters.spec	Mon Dec 12 17:24:19 2005
@@ -28,24 +28,23 @@
 
 %description
 Foomatic is a system for using free software printer drivers with
-common spoolers on Unix. It supports LPD, PDQ, CUPS, the VA Linux
-LPD, LPRng, PPR, and direct spooler-less printing and any free
-software driver for which execution data has been entered in the
-database.
+common spoolers on Unix. It supports LPD, PDQ, CUPS, the VA Linux LPD,
+LPRng, PPR, and direct spooler-less printing and any free software
+driver for which execution data has been entered in the database.
 
 %description -l pl
-Foomatic to system pozwalający na używanie wolnodostępnych
-sterowników drukarek z popularnymi uniksowymi serwerami wydruków.
-Obsługuje LPD, PDQ, CUPS, VA Linux LPD, LPRng, PPR i bezpośrednie
-drukowanie bez kolejkowania oraz dowolny wolnodostępny sterownik,
-dla którego parametry zostały wprowadzone do bazy danych.
+Foomatic to system pozwalający na używanie wolnodostępnych sterowników
+drukarek z popularnymi uniksowymi serwerami wydruków. Obsługuje LPD,
+PDQ, CUPS, VA Linux LPD, LPRng, PPR i bezpośrednie drukowanie bez
+kolejkowania oraz dowolny wolnodostępny sterownik, dla którego
+parametry zostały wprowadzone do bazy danych.
 
 %package gswrapper
 Summary:	foomatic wrapper for ghostscript
 Summary(pl):	wrapper dla ghostscripta do użycia z foomatic
 Group:		Applications/System
-Requires:	ghostscript
 Requires:	a2ps
+Requires:	ghostscript
 Obsoletes:	foomatic-gswrapper
 
 %description gswrapper
@@ -55,17 +54,17 @@
 
 NOTE: This script is needed in a few situations only and may not work
 with some Ghostscript versions. Moreover in some situations his
-presence in the system may have effect that Your printer will
-not print. So - Do not install this package if You don't know
-what You're doing.
+presence in the system may have effect that Your printer will not
+print. So - Do not install this package if You don't know what You're
+doing.
 
 %description gswrapper -l pl
 Mały skrypt uzdatniający Ghostscripta. Obrabia parametry tak, żeby
 Ghostscript działał właściwie jako filtr, generując dane wyjściowe na
 stdout, a błędy na stderr.
 
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/FHS.spec?r1=1.106&r2=1.107&f=u
    http://cvs.pld-linux.org/SPECS/FreeWnn.spec?r1=1.19&r2=1.20&f=u
    http://cvs.pld-linux.org/SPECS/GeoIP.spec?r1=1.22&r2=1.23&f=u
    http://cvs.pld-linux.org/SPECS/fbset.spec?r1=1.56&r2=1.57&f=u
    http://cvs.pld-linux.org/SPECS/fcron.spec?r1=1.30&r2=1.31&f=u
    http://cvs.pld-linux.org/SPECS/fdutils.spec?r1=1.24&r2=1.25&f=u
    http://cvs.pld-linux.org/SPECS/file.spec?r1=1.113&r2=1.114&f=u
    http://cvs.pld-linux.org/SPECS/filtergen.spec?r1=1.23&r2=1.24&f=u
    http://cvs.pld-linux.org/SPECS/firelogd.spec?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/SPECS/firewall-init-ipchains.spec?r1=1.38&r2=1.39&f=u
    http://cvs.pld-linux.org/SPECS/firewall-init.spec?r1=1.44&r2=1.45&f=u
    http://cvs.pld-linux.org/SPECS/foomatic-db-engine.spec?r1=1.20&r2=1.21&f=u
    http://cvs.pld-linux.org/SPECS/foomatic-filters.spec?r1=1.22&r2=1.23&f=u
    http://cvs.pld-linux.org/SPECS/freedt.spec?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/SPECS/freelords.spec?r1=1.29&r2=1.30&f=u
    http://cvs.pld-linux.org/SPECS/freenet6-client.spec?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/SPECS/freeswan.spec?r1=1.77&r2=1.78&f=u
    http://cvs.pld-linux.org/SPECS/freetds.spec?r1=1.19&r2=1.20&f=u
    http://cvs.pld-linux.org/SPECS/freevo.spec?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/SPECS/frottle.spec?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/SPECS/frotz.spec?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/SPECS/ftpd-BSD.spec?r1=1.68&r2=1.69&f=u
    http://cvs.pld-linux.org/SPECS/ftpproxy.spec?r1=1.14&r2=1.15&f=u
    http://cvs.pld-linux.org/SPECS/fvwm2.spec?r1=1.71&r2=1.72&f=u
    http://cvs.pld-linux.org/SPECS/fwlogwatch.spec?r1=1.15&r2=1.16&f=u
    http://cvs.pld-linux.org/SPECS/fwtk.spec?r1=1.14&r2=1.15&f=u
    http://cvs.pld-linux.org/SPECS/ganso.spec?r1=1.28&r2=1.29&f=u
    http://cvs.pld-linux.org/SPECS/gdkxft.spec?r1=1.56&r2=1.57&f=u
    http://cvs.pld-linux.org/SPECS/geki2-KXL.spec?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/SPECS/geki3-KXL.spec?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/SPECS/geki5-KXL.spec?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/SPECS/getty_ps.spec?r1=1.26&r2=1.27&f=u
    http://cvs.pld-linux.org/SPECS/gfontview.spec?r1=1.51&r2=1.52&f=u
    http://cvs.pld-linux.org/SPECS/ggrelay.spec?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/SPECS/ghostscript-esp.spec?r1=1.160&r2=1.161&f=u
    http://cvs.pld-linux.org/SPECS/gimp.spec?r1=1.261&r2=1.262&f=u
    http://cvs.pld-linux.org/SPECS/glftpd.spec?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/SPECS/global.spec?r1=1.26&r2=1.27&f=u
    http://cvs.pld-linux.org/SPECS/gmc.spec?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SPECS/gnotify.spec?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/SPECS/gnu-radius.spec?r1=1.18&r2=1.19&f=u
    http://cvs.pld-linux.org/SPECS/gnudip.spec?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/SPECS/gnugk.spec?r1=1.28&r2=1.29&f=u
    http://cvs.pld-linux.org/SPECS/gnustep-base.spec?r1=1.61&r2=1.62&f=u
    http://cvs.pld-linux.org/SPECS/gnustep-make-libFoundation.spec?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SPECS/gopher.spec?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/SPECS/gpm.spec?r1=1.129&r2=1.130&f=u
    http://cvs.pld-linux.org/SPECS/grace.spec?r1=1.49&r2=1.50&f=u
    http://cvs.pld-linux.org/SPECS/gtk+.spec?r1=1.138&r2=1.139&f=u
    http://cvs.pld-linux.org/SPECS/gtop.spec?r1=1.44&r2=1.45&f=u
    http://cvs.pld-linux.org/SPECS/haps.spec?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/SPECS/hddtemp.spec?r1=1.28&r2=1.29&f=u
    http://cvs.pld-linux.org/SPECS/heimdal.spec?r1=1.116&r2=1.117&f=u
    http://cvs.pld-linux.org/SPECS/hercules.spec?r1=1.15&r2=1.16&f=u
    http://cvs.pld-linux.org/SPECS/hostapd.spec?r1=1.12&r2=1.13&f=u
    http://cvs.pld-linux.org/SPECS/hotkeys.spec?r1=1.26&r2=1.27&f=u
    http://cvs.pld-linux.org/SPECS/htdig.spec?r1=1.55&r2=1.56&f=u
    http://cvs.pld-linux.org/SPECS/httptunnel.spec?r1=1.21&r2=1.22&f=u
    http://cvs.pld-linux.org/SPECS/hylafax.spec?r1=1.38&r2=1.39&f=u
    http://cvs.pld-linux.org/SPECS/i8kutils.spec?r1=1.12&r2=1.13&f=u
    http://cvs.pld-linux.org/SPECS/icebreaker.spec?r1=1.18&r2=1.19&f=u
    http://cvs.pld-linux.org/SPECS/icradius.spec?r1=1.40&r2=1.41&f=u
    http://cvs.pld-linux.org/SPECS/id-utils.spec?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/SPECS/ifhp.spec?r1=1.47&r2=1.48&f=u
    http://cvs.pld-linux.org/SPECS/ile.spec?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/SPECS/ilohamail.spec?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/SPECS/imlib.spec?r1=1.108&r2=1.109&f=u
    http://cvs.pld-linux.org/SPECS/imwheel.spec?r1=1.26&r2=1.27&f=u
    http://cvs.pld-linux.org/SPECS/inet6-apps.spec?r1=1.33&r2=1.34&f=u
    http://cvs.pld-linux.org/SPECS/inetutils.spec?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/SPECS/inn.spec?r1=1.163&r2=1.164&f=u
    http://cvs.pld-linux.org/SPECS/intersync.spec?r1=1.13&r2=1.14&f=u
    http://cvs.pld-linux.org/SPECS/ipband.spec?r1=1.15&r2=1.16&f=u
    http://cvs.pld-linux.org/SPECS/ipxripd.spec?r1=1.37&r2=1.38&f=u
    http://cvs.pld-linux.org/SPECS/ipxtund.spec?r1=1.19&r2=1.20&f=u
    http://cvs.pld-linux.org/SPECS/ircd-hybrid.spec?r1=1.45&r2=1.46&f=u
    http://cvs.pld-linux.org/SPECS/ircd-ptlink.spec?r1=1.14&r2=1.15&f=u
    http://cvs.pld-linux.org/SPECS/ircservices-ptlink.spec?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/SPECS/irrd.spec?r1=1.14&r2=1.15&f=u
    http://cvs.pld-linux.org/SPECS/isapnptools.spec?r1=1.39&r2=1.40&f=u
    http://cvs.pld-linux.org/SPECS/isdn4k-utils.spec?r1=1.49&r2=1.50&f=u




More information about the pld-cvs-commit mailing list