SPECS: Maelstrom.spec, masqmail.spec, mks.spec, mksd.spec, mldonke...

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


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

---- Files affected:
SPECS:
   Maelstrom.spec (1.19 -> 1.20) , masqmail.spec (1.37 -> 1.38) , mks.spec (1.55 -> 1.56) , mksd.spec (1.43 -> 1.44) , mldonkey.spec (1.132 -> 1.133) , muddleftpd.spec (1.51 -> 1.52) , multitail.spec (1.27 -> 1.28) , mutt-nntp.spec (1.9 -> 1.10) , mutt.spec (1.183 -> 1.184) , nas.spec (1.46 -> 1.47) , natmonitor.spec (1.24 -> 1.25) , netacct-mysql.spec (1.8 -> 1.9) , netmap.spec (1.4 -> 1.5) , nss_mysql.spec (1.22 -> 1.23) , nss_pgsql.spec (1.16 -> 1.17) , nullwebmail.spec (1.7 -> 1.8) , openssl.spec (1.145 -> 1.146) , opera.spec (1.153 -> 1.154) , otak.spec (1.46 -> 1.47) , p0f.spec (1.35 -> 1.36) , pam-pam_mount.spec (1.17 -> 1.18) , pam.spec (1.228 -> 1.229) , pathological.spec (1.2 -> 1.3) , pce.spec (1.2 -> 1.3) , pflogsumm.spec (1.20 -> 1.21) , phpIP.spec (1.10 -> 1.11) , phpdc.spec (1.10 -> 1.11) , pinfo.spec (1.62 -> 1.63) 

---- Diffs:

================================================================
Index: SPECS/Maelstrom.spec
diff -u SPECS/Maelstrom.spec:1.19 SPECS/Maelstrom.spec:1.20
--- SPECS/Maelstrom.spec:1.19	Mon Apr 25 20:57:34 2005
+++ SPECS/Maelstrom.spec	Mon Dec  5 00:10:17 2005
@@ -45,8 +45,8 @@
 
 %description
 Maelstrom is a rockin' asteroids game ported from the Macintosh
-Originally written by Andrew Welch of Ambrosia Software, and ported
-to UNIX and then SDL by Sam Lantinga <slouken at devolution.com>.
+Originally written by Andrew Welch of Ambrosia Software, and ported to
+UNIX and then SDL by Sam Lantinga <slouken at devolution.com>.
 
 %description -l pl
 Maelstrom jest kosmiczną strzelanką sportowaną na UNIXy i SDL przez
@@ -55,11 +55,11 @@
 
 %description -l pt_BR
 O Maelstrom é um jogo de asteróides vagantes portado do Macintosh,
-originalmente escrito por Andrew Welch da Ambrosia Software, e portado 
+originalmente escrito por Andrew Welch da Ambrosia Software, e portado
 para o UNIX e SDL por Sam Lantinga.
 
-Sua nave está no temido círculo de asteróides "Maelstrom", e vocę tem 
-que sobreviver explodindo todos os asteróides e evitando outros 
+Sua nave está no temido círculo de asteróides "Maelstrom", e vocę tem
+que sobreviver explodindo todos os asteróides e evitando outros
 inimigos como estrelas Nova, turbilhőes e naves e minas Shenobi.
 
 Gráficos 3D muito legais e sons, com suporte a temas e jogos via rede.
@@ -111,7 +111,7 @@
 %doc README* Changelog COPYING CREDITS Docs
 %attr(755,root,root) %{_bindir}/*
 %{_gamedir}
-%attr(666,root,root) %config(noreplace) %verify(not md5 size mtime) /var/games/Maelstrom-Scores
+%attr(666,root,root) %config(noreplace) %verify(not md5 mtime size) /var/games/Maelstrom-Scores
 %{_desktopdir}/*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -120,6 +120,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.20  2005/12/04 23:10:17  glen
+- adapterized (sorted %verify flags)
+
 Revision 1.19  2005/04/25 18:57:34  tiwek
 - update patch
 

================================================================
Index: SPECS/masqmail.spec
diff -u SPECS/masqmail.spec:1.37 SPECS/masqmail.spec:1.38
--- SPECS/masqmail.spec:1.37	Sun Jun 20 23:36:53 2004
+++ SPECS/masqmail.spec	Mon Dec  5 00:10:18 2005
@@ -94,7 +94,7 @@
 %attr(755,root,root) /usr/lib/sendmail
 %attr(4755,root,root) %{_sbindir}/*
 %dir %{_sysconfdir}/masqmail
-%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/masqmail/masqmail.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/masqmail/masqmail.conf
 %dir %{_datadir}/masqmail
 %dir %{_datadir}/masqmail/tpl
 %{_datadir}/masqmail/tpl/*.tpl
@@ -114,6 +114,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.38  2005/12/04 23:10:18  glen
+- adapterized (sorted %verify flags)
+
 Revision 1.37  2004/06/20 21:36:53  arekm
 - fix specflags (quotation here is buggy)
 

================================================================
Index: SPECS/mks.spec
diff -u SPECS/mks.spec:1.55 SPECS/mks.spec:1.56
--- SPECS/mks.spec:1.55	Fri Jun  3 01:52:40 2005
+++ SPECS/mks.spec	Mon Dec  5 00:10:18 2005
@@ -16,7 +16,7 @@
 Release:	6
 License:	This program will be for free till the end of year 2004 (see licence.txt)
 Group:		Applications
-Source0:	http://download.mks.com.pl/download/linux/mks32-Linux-i386-%(echo %{version} | tr . -).tgz
+Source0:	http://download.mks.com.pl/download/linux/%{name}32-Linux-i386-%(echo %{version} | tr . -).tgz
 # Source0-md5:	6d8cfa09835d9856aac92c0d26645336
 Source1:	%{name}-vir.cfg
 # link to source tgz is inside http://download.mks.com.pl/download/linux/bazy.link
@@ -25,7 +25,7 @@
 Source3:	bazy4.tgz.md5sum
 # http://download.mks.com.pl/download/linux/mksupdate.sh
 Source4:	%{name}update.sh
-Source5:	http://download.mks.com.pl/download/linux/mksLinux-contrib.tgz
+Source5:	http://download.mks.com.pl/download/linux/%{name}Linux-contrib.tgz
 # Source5-md5:	d73d2ef861b3fddbe4f6dbe60a0a43d1
 Source6:	%{name}-cron-updatedb
 URL:		http://linux.mks.com.pl/
@@ -51,7 +51,7 @@
 %description bases -l pl
 Pakiet ten zawiera bazy antywirusowe z dnia 2004/04/10. Należy używać
 jakichś automagicznych skryptów do aktualizacji baz, gdyż wciąż
-pojawiają się nowe wirusy. Użyć do tego możesz %{name}-updater. 
+pojawiają się nowe wirusy. Użyć do tego możesz %{name}-updater.
 
 %package updater
 Summary:	Mks Antivirus database updater
@@ -66,8 +66,8 @@
 crontab entry.
 
 %description updater -l pl
-Pakiet ten zawiera aktualizator baz antywirusowych oraz odpowiedni wpis
-do crontaba.
+Pakiet ten zawiera aktualizator baz antywirusowych oraz odpowiedni
+wpis do crontaba.
 
 %prep
 cd %{_sourcedir}
@@ -109,17 +109,17 @@
 %attr(755,root,root) %{_bindir}/mks32
 %attr(755,root,root) %dir %{_var}/lib/%{name}
 %attr(755,root,root) %dir %{_var}/lib/%{name}/tmp
-%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/mks_vir.cfg
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mks_vir.cfg
 
 %files bases
 %defattr(644,root,root,755)
-%verify(not md5 size mtime) %{_var}/lib/%{name}/mksbase?.dat
+%verify(not md5 mtime size) %{_var}/lib/%{name}/mksbase?.dat
 
 %files updater
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/mksupdate.sh
 %attr(755,root,root) %{_sbindir}/mksvir-cron-updatedb
-%attr(640,root,root) %{_sysconfdir}/cron.d/*
+%attr(640,root,root) /etc/cron.d/*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -127,6 +127,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.56  2005/12/04 23:10:18  glen
+- adapterized (sorted %verify flags)
+
 Revision 1.55  2005/06/02 23:52:40  ankry
 - rel. 6
 

================================================================
Index: SPECS/mksd.spec
diff -u SPECS/mksd.spec:1.43 SPECS/mksd.spec:1.44
--- SPECS/mksd.spec:1.43	Tue May 31 21:36:13 2005
+++ SPECS/mksd.spec	Mon Dec  5 00:10:18 2005
@@ -11,21 +11,21 @@
 Release:	5
 License:	It's free, but requires ads of mks.com.pl on your WWW (see licencja.txt)
 Group:		Applications
-Source0:	http://download.mks.com.pl/download/linux/mksdLinux-%{version}.tgz
+Source0:	http://download.mks.com.pl/download/linux/%{name}Linux-%{version}.tgz
 # Source0-md5:	d7094273de4df897a4e69f6c6f43244c
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 URL:		http://linux.mks.com.pl/
 BuildRequires:	rpmbuild(macros) >= 1.213
-PreReq:		rc-scripts
+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:	/usr/sbin/usermod
 Requires:	mks
+Requires:	rc-scripts
 Provides:	group(mksd)
 Provides:	user(mksd)
 ExclusiveArch:	%{ix86} %{x8664}
@@ -157,7 +157,7 @@
 %doc README LICENCJA CONOWEGO
 %attr(755,root,root) %{_bindir}/mksd
 %attr(754,root,root) /etc/rc.d/init.d/mksd
-%attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/sysconfig/mksd
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/mksd
 %attr(755,mksd,mksd) /var/run/mksd
 
 %files clients
@@ -176,6 +176,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.44  2005/12/04 23:10:18  glen
+- adapterized (sorted %verify flags)
+
 Revision 1.43  2005/05/31 19:36:13  ankry
 - rel. 5
 

================================================================
Index: SPECS/mldonkey.spec
diff -u SPECS/mldonkey.spec:1.132 SPECS/mldonkey.spec:1.133
--- SPECS/mldonkey.spec:1.132	Tue Nov 29 17:31:42 2005
+++ SPECS/mldonkey.spec	Mon Dec  5 00:10:18 2005
@@ -60,21 +60,20 @@
 BuildRequires:	perl-base
 BuildRequires:	rpmbuild(macros) >= 1.202
 BuildRequires:	zlib-devel
-PreReq:		rc-scripts
+Requires(post):	sed >= 4.0
+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(post):	sed >= 4.0
-Requires(triggerpostun):	sed >= 4.0
 Requires(triggerpostun):	grep
+Requires(triggerpostun):	sed >= 4.0
 Requires:	nc
 Requires:	procps
-Requires:	wget
 Requires:	rc-scripts >= 0.4.0.10
+Requires:	wget
 Provides:	group(mldonkey)
 Provides:	user(mldonkey)
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -371,6 +370,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.133  2005/12/04 23:10:18  glen
+- adapterized (sorted %verify flags)
+
 Revision 1.132  2005/11/29 16:31:42  czucz
 - BR: libstdc++-devel
 

================================================================
Index: SPECS/muddleftpd.spec
diff -u SPECS/muddleftpd.spec:1.51 SPECS/muddleftpd.spec:1.52
--- SPECS/muddleftpd.spec:1.51	Mon Jul 25 14:54:19 2005
+++ SPECS/muddleftpd.spec	Mon Dec  5 00:10:18 2005
@@ -6,7 +6,7 @@
 Release:	5
 License:	GPL
 Group:		Daemons
-Source0:	http://savannah.nongnu.org/download/%{name}/%{name}-%{version}.tar.gz
+Source0:	http://savannah.nongnu.org/download/muddleftpd/%{name}-%{version}.tar.gz
 # Source0-md5:	47cf007466395ce43920f5e60234e107
 Source1:	ftp.pamd
 Source2:	%{name}.logrotate
@@ -22,10 +22,10 @@
 BuildRequires:	pam-devel
 BuildRequires:	perl-base
 BuildRequires:	texinfo
-PreReq:		rc-scripts
 Requires(post,preun):	/sbin/chkconfig
 Requires:	logrotate
 Requires:	pam >= 0.79.0
+Requires:	rc-scripts
 Provides:	ftpserver
 Obsoletes:	ftpserver
 Obsoletes:	anonftp
@@ -65,8 +65,8 @@
 Requires:	%{name} = %{version}-%{release}
 
 %description authlibmud
-This module allows muddleftpd to authenticate against player files
-on a mud server.
+This module allows muddleftpd to authenticate against player files on
+a mud server.
 
 %description authlibmud -l pl
 Ten moduł pozwala muddleftpd uwierzytelniać użytkowników w oparciu o
@@ -97,7 +97,7 @@
 
 %description authlibsmb
 This module allows muddleftpd to authenticate using a SMB server.
- 
+
 %description authlibsmb -l pl
 Ten moduł pozwala muddleftpd uwierzytelniać użytkowników korzystając z
 serwera SMB.
@@ -134,7 +134,7 @@
 # documentation of modules
 mv -f modules/auth/authlibmud/README modules/auth/authlibmud/README.authlibmud
 mv -f modules/auth/authlibmysql/README modules/auth/authlibmysql/README.authlibmysql
-mv -f modules/auth/authlibsmb/README modules/auth/authlibsmb/README.authlibsmb 
+mv -f modules/auth/authlibsmb/README modules/auth/authlibsmb/README.authlibsmb
 
 mv -f $RPM_BUILD_ROOT%{_sbindir}/ftpwho $RPM_BUILD_ROOT%{_bindir}
 
@@ -178,12 +178,12 @@
 %doc AUTHORS ChangeLog README TODO doc/*.txt examples
 %attr(750,root,root) %dir %{_sysconfdir}
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/muddleftpd.conf
-%attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/security/blacklist.ftp
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/logrotate.d/*
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.ftp
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/*
 %attr(640,root,root) %ghost /var/log/*
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/*
 %attr(754,root,root) /etc/rc.d/init.d/*
-%attr(640,root,root) /etc/sysconfig/*
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/*
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_sbindir}/*
 %attr(755,root,root) %dir /home/services/ftp
@@ -213,6 +213,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.52  2005/12/04 23:10:18  glen
+- adapterized (sorted %verify flags)
+
 Revision 1.51  2005/07/25 12:54:19  japhy
 - Added allowed_filenames_fix patch (Michal Kowalczuk), STBR
 

================================================================
Index: SPECS/multitail.spec
diff -u SPECS/multitail.spec:1.27 SPECS/multitail.spec:1.28
--- SPECS/multitail.spec:1.27	Mon Aug  1 11:56:25 2005
+++ SPECS/multitail.spec	Mon Dec  5 00:10:18 2005
@@ -6,7 +6,7 @@
 Release:	1
 License:	GPL
 Group:		Applications/Text
-Source0:	http://www.vanheusden.com/%{name}/%{name}-%{version}.tgz
+Source0:	http://www.vanheusden.com/multitail/%{name}-%{version}.tgz
 # Source0-md5:	606338755241c98e0619acf9a71d9d9c
 URL:		http://www.vanheusden.com/multitail/
 BuildRequires:	ncurses-ext-devel
@@ -23,8 +23,8 @@
 
 %description -l pl
 multitail pozwala oglądać jeden lub więcej plików podobnie jak
-oryginalny program tail. Różnica jest taka, że tworzy wiele okien
-na terminalu (z użyciem ncurses). Może także używać kolorów przy
+oryginalny program tail. Różnica jest taka, że tworzy wiele okien na
+terminalu (z użyciem ncurses). Może także używać kolorów przy
 wyświetlaniu plików logów w celu szybszego odróżnienia, które linie są
 ważne, a które nie. Obsługuje wyrażenia regularne. Ma interaktywne
 menu do edycji podanych wyrażeń regularnych oraz usuwania i dodawania
@@ -35,7 +35,7 @@
 
 %build
 %{__make} \
-	CC=%{__cc} \
+	CC="%{__cc}" \
 	CFLAGS="-DLinux -DVERSION=\\\"%{version}\\\" -Wall %{rpmcflags} -I%{_includedir}/ncurses"
 
 %install
@@ -52,7 +52,7 @@
 %files
 %defattr(644,root,root,755)
 %doc Changes readme.txt manual.html
-%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/%{name}.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.conf
 %attr(755,root,root) %{_bindir}/*
 %{_mandir}/man1/*
 
@@ -62,6 +62,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.28  2005/12/04 23:10:18  glen
+- adapterized (sorted %verify flags)
+
 Revision 1.27  2005/08/01 09:56:25  adamg
 - updated to 3.6.0
 - BuildRequires: ncurses-ext-devel

================================================================
Index: SPECS/mutt-nntp.spec
diff -u SPECS/mutt-nntp.spec:1.9 SPECS/mutt-nntp.spec:1.10
--- SPECS/mutt-nntp.spec:1.9	Thu Sep 16 00:27:19 2004
+++ SPECS/mutt-nntp.spec	Mon Dec  5 00:10:18 2005
@@ -1,5 +1,5 @@
 # $Revision$, $Date$
-# 
+#
 # TODO: update to 1.4.2.1 (SECURITY issues)
 #
 # Conditional build:
@@ -42,14 +42,14 @@
 Patch15:	mutt-pgp_hook.patch
 Patch16:	mutt-manual.patch
 Patch17:	mutt-send_charset.patch
-Patch18:	mutt-nntp.patch
+Patch18:	%{name}.patch
 URL:		http://www.mutt.org/
+%{!?with_slang:BuildRequires:		ncurses-devel >= 5.0}
 BuildRequires:	autoconf
 BuildRequires:	automake
 %{?with_sasl:BuildRequires:	cyrus-sasl-devel}
 BuildRequires:	gettext-devel
 BuildRequires:	groff
-%{!?with_slang:BuildRequires:		ncurses-devel >= 5.0}
 BuildRequires:	openssl-devel >= 0.9.7d
 BuildRequires:	sgml-tools
 %{?with_slang:BuildRequires:		slang-devel}
@@ -169,7 +169,8 @@
 install -d $RPM_BUILD_ROOT{%{_applnkdir}/Network/Mail,%{_pixmapsdir}} \
 	$RPM_BUILD_ROOT%{_mandir}/pl/man1
 
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}/Network/Mail
 install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
@@ -186,7 +187,7 @@
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc contrib/{*rc*,*cap*} ChangeLog README TODO NEWS README.SECURITY README.SSL doc/manual.txt
-%config(noreplace,missingok) %verify(not md5 size mtime) %{_sysconfdir}/Muttrc
+%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/Muttrc
 %attr(755,root,root) %{_bindir}/mutt
 %attr(755,root,root) %{_bindir}/flea
 %attr(755,root,root) %{_bindir}/muttbug
@@ -204,6 +205,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2005/12/04 23:10:18  glen
+- adapterized (sorted %verify flags)
+
 Revision 1.9  2004/09/15 22:27:19  qboosh
 - security note
 
@@ -398,7 +402,7 @@
 - cosmetics.
 
 Revision 1.84  2001/09/05 16:41:16  filon
-- added Manual.txt to doc, mutt wants to read it when pressed F1 key 
+- added Manual.txt to doc, mutt wants to read it when pressed F1 key
   (don't compress int)
 
 Revision 1.83  2001/08/30 12:18:48  gotar

================================================================
Index: SPECS/mutt.spec
diff -u SPECS/mutt.spec:1.183 SPECS/mutt.spec:1.184
--- SPECS/mutt.spec:1.183	Mon Aug 22 15:12:02 2005
+++ SPECS/mutt.spec	Mon Dec  5 00:10:18 2005
@@ -55,21 +55,21 @@
 Patch23:	%{name}-Muttrc_mbox_path.patch
 Patch24:	%{name}-po.patch
 URL:		http://www.mutt.org/
+%{!?with_slang:BuildRequires:	ncurses-devel >= 5.4-0.7}
 BuildRequires:	autoconf
 BuildRequires:	automake
 %{?with_sasl:BuildRequires:	cyrus-sasl-devel >= 2.1.0}
-%{?with_home_etc:BuildRequires:	home-etc-devel >= 1.0.8}
 BuildRequires:	gettext-devel
 BuildRequires:	groff
-%{!?with_slang:BuildRequires:	ncurses-devel >= 5.4-0.7}
+%{?with_home_etc:BuildRequires:	home-etc-devel >= 1.0.8}
+%{?with_esmtp:BuildRequires:	libesmtp-devel}
 BuildRequires:	openssl-devel >= 0.9.7d
 BuildRequires:	sgml-tools >= 1.0.9-20
 BuildRequires:	sgml-tools-dtd
 %{?with_slang:BuildRequires:	slang-devel}
-%{?with_esmtp:BuildRequires:	libesmtp-devel}
+%{?with_home_etc:Requires:	home-etc >= 1.0.8}
 Requires:	iconv
 Requires:	mailcap
-%{?with_home_etc:Requires:	home-etc >= 1.0.8}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		specflags_ia32	-fomit-frame-pointer
@@ -220,7 +220,7 @@
 # conflict with qmail
 rm -f $RPM_BUILD_ROOT%{_mandir}/man5/mbox.5*
 
-rm -f $RPM_BUILD_ROOT/etc/mime.types
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/mime.types
 
 %find_lang %{name}
 
@@ -230,7 +230,7 @@
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc contrib/{*rc*,*cap*} ChangeLog README TODO NEWS README.SECURITY README.SSL README.xface %{?with_esmtp:Muttrc.esmtp}
-%config(noreplace,missingok) %verify(not md5 size mtime) %{_sysconfdir}/Muttrc
+%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/Muttrc
 %attr(755,root,root) %{_bindir}/mutt
 %attr(755,root,root) %{_bindir}/flea
 %attr(755,root,root) %{_bindir}/muttbug
@@ -249,6 +249,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.184  2005/12/04 23:10:18  glen
+- adapterized (sorted %verify flags)
+
 Revision 1.183  2005/08/22 13:12:02  saq
 - rel 10 for fixed paths.patch
 

================================================================
Index: SPECS/nas.spec
diff -u SPECS/nas.spec:1.46 SPECS/nas.spec:1.47
--- SPECS/nas.spec:1.46	Mon Nov 15 08:55:18 2004
+++ SPECS/nas.spec	Mon Dec  5 00:10:18 2005
@@ -151,7 +151,7 @@
 %defattr(644,root,root,755)
 %doc README FAQ TODO BUGS
 %dir %{_sysconfdir}
-%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/nasd.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/nasd.conf
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_libdir}/lib*.so.*
 /usr/X11R6/lib/X11/AuErrorDB
@@ -174,6 +174,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.47  2005/12/04 23:10:18  glen
+- adapterized (sorted %verify flags)
+
 Revision 1.46  2004/11/15 07:55:18  paszczus
 - updated to 1.7
 

================================================================
Index: SPECS/natmonitor.spec
diff -u SPECS/natmonitor.spec:1.24 SPECS/natmonitor.spec:1.25
--- SPECS/natmonitor.spec:1.24	Thu Nov 17 00:45:18 2005
+++ SPECS/natmonitor.spec	Mon Dec  5 00:10:18 2005
@@ -6,10 +6,10 @@
 Release:	1
 License:	GPL
 Group:		Networking
-Source0:	http://dl.sourceforge.net/%{name}/%{name}-%{version}.tgz
+Source0:	http://dl.sourceforge.net/natmonitor/%{name}-%{version}.tgz
 # Source0-md5:	22c15163254ec9f9f3e86c27a398d118
 Source1:	%{name}.desktop
-Source2:	natmonitord.init
+Source2:	%{name}d.init
 Patch0:		%{name}-complex.patch
 Patch1:		%{name}-etc.patch
 URL:		http://natmonitor.sourceforge.net/
@@ -35,15 +35,15 @@
 %package -n natmonitord
 Summary:	The NAT Monitor daemon
 Summary(pl):	Daemon monitora NAT
-Group:		System/Servers
-PreReq:		rc-scripts
+Group:		Daemons
+Requires:	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
 Provides:	group(natmonitor)
 Provides:	user(natmonitor)
 
@@ -121,7 +121,7 @@
 %doc CHANGELOG README BUGS TODO
 %attr(755,root,root) %{_bindir}/natmonitor
 %attr(755,root,root) %{_bindir}/natmonitorconsole
-%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/%{name}.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.conf
 %{_pixmapsdir}/%{name}.png
 %{_desktopdir}/%{name}.desktop
 
@@ -129,7 +129,7 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/natmonitord
 %attr(754,root,root) %{_initrddir}/natmonitord
-%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/natmonitord.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/natmonitord.conf
 %attr(750,natmonitor,natmonitor) %dir /var/lib/natmonitor
 %attr(644,natmonitor,natmonitor) %ghost /var/lib/natmonitor/natmonitor.dat
 
@@ -139,6 +139,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.25  2005/12/04 23:10:18  glen
+- adapterized (sorted %verify flags)
+
 Revision 1.24  2005/11/16 23:45:18  charles
 - added more R & P for natmontord
 

================================================================
Index: SPECS/netacct-mysql.spec
diff -u SPECS/netacct-mysql.spec:1.8 SPECS/netacct-mysql.spec:1.9
--- SPECS/netacct-mysql.spec:1.8	Tue Sep 14 11:44:02 2004
+++ SPECS/netacct-mysql.spec	Mon Dec  5 00:10:18 2005
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/Maelstrom.spec?r1=1.19&r2=1.20&f=u
    http://cvs.pld-linux.org/SPECS/masqmail.spec?r1=1.37&r2=1.38&f=u
    http://cvs.pld-linux.org/SPECS/mks.spec?r1=1.55&r2=1.56&f=u
    http://cvs.pld-linux.org/SPECS/mksd.spec?r1=1.43&r2=1.44&f=u
    http://cvs.pld-linux.org/SPECS/mldonkey.spec?r1=1.132&r2=1.133&f=u
    http://cvs.pld-linux.org/SPECS/muddleftpd.spec?r1=1.51&r2=1.52&f=u
    http://cvs.pld-linux.org/SPECS/multitail.spec?r1=1.27&r2=1.28&f=u
    http://cvs.pld-linux.org/SPECS/mutt-nntp.spec?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/SPECS/mutt.spec?r1=1.183&r2=1.184&f=u
    http://cvs.pld-linux.org/SPECS/nas.spec?r1=1.46&r2=1.47&f=u
    http://cvs.pld-linux.org/SPECS/natmonitor.spec?r1=1.24&r2=1.25&f=u
    http://cvs.pld-linux.org/SPECS/netacct-mysql.spec?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/SPECS/netmap.spec?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/SPECS/nss_mysql.spec?r1=1.22&r2=1.23&f=u
    http://cvs.pld-linux.org/SPECS/nss_pgsql.spec?r1=1.16&r2=1.17&f=u
    http://cvs.pld-linux.org/SPECS/nullwebmail.spec?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/SPECS/openssl.spec?r1=1.145&r2=1.146&f=u
    http://cvs.pld-linux.org/SPECS/opera.spec?r1=1.153&r2=1.154&f=u
    http://cvs.pld-linux.org/SPECS/otak.spec?r1=1.46&r2=1.47&f=u
    http://cvs.pld-linux.org/SPECS/p0f.spec?r1=1.35&r2=1.36&f=u
    http://cvs.pld-linux.org/SPECS/pam-pam_mount.spec?r1=1.17&r2=1.18&f=u
    http://cvs.pld-linux.org/SPECS/pam.spec?r1=1.228&r2=1.229&f=u
    http://cvs.pld-linux.org/SPECS/pathological.spec?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SPECS/pce.spec?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SPECS/pflogsumm.spec?r1=1.20&r2=1.21&f=u
    http://cvs.pld-linux.org/SPECS/phpIP.spec?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/SPECS/phpdc.spec?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/SPECS/pinfo.spec?r1=1.62&r2=1.63&f=u




More information about the pld-cvs-commit mailing list