Author: glen Date: Sun Mar 5 14:51:28 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - use %service, adapterized, cosmetics
---- Files affected: SPECS: mserver.spec (1.25 -> 1.26) , muddleftpd.spec (1.52 -> 1.53) , munin.spec (1.34 -> 1.35) , mysql.spec (1.324 -> 1.325) ---- Diffs: ================================================================ Index: SPECS/mserver.spec diff -u SPECS/mserver.spec:1.25 SPECS/mserver.spec:1.26 --- SPECS/mserver.spec:1.25 Tue Dec 13 16:59:58 2005 +++ SPECS/mserver.spec Sun Mar 5 15:51:20 2006 @@ -5,7 +5,6 @@ Version: 0.5.5 Release: 4 License: GPL -Vendor: Chares P. Wright <[EMAIL PROTECTED]> Group: Networking/Daemons Source0: http://w3.cpwright.com/mserver/download/c-%{name}-%{version}.tar.gz # Source0-md5: ee4348241ac8e42d6b62c93036ffaf71 @@ -19,6 +18,7 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: pam-devel +BuildRequires: rpmbuild(macros) >= 1.268 Requires(post,preun): /sbin/chkconfig Requires: ppp Requires: rc-scripts >= 0.2.1 @@ -79,17 +79,11 @@ %post /sbin/chkconfig --add mserver -if [ -f /var/lock/subsys/mserver ]; then - /etc/rc.d/init.d/mserver restart >&2 -else - echo "Run \"/etc/rc.d/init.d/mserver start\" to start masqdialer daemon." -fi +%service mserver restart "masqdialer daemon" %preun if [ "$1" = "0" ]; then - if [ -f /var/lock/subsys/mserver ]; then - /etc/rc.d/init.d/mserver stop >&2 - fi + %service mserver stop /sbin/chkconfig --del mserver fi @@ -110,6 +104,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.26 2006/03/05 14:51:20 glen +- use %service, adapterized, cosmetics + Revision 1.25 2005/12/13 15:59:58 glen - adapterized (sorted %verify attrs) ================================================================ Index: SPECS/muddleftpd.spec diff -u SPECS/muddleftpd.spec:1.52 SPECS/muddleftpd.spec:1.53 --- SPECS/muddleftpd.spec:1.52 Mon Dec 5 00:10:18 2005 +++ SPECS/muddleftpd.spec Sun Mar 5 15:51:20 2006 @@ -21,16 +21,17 @@ BuildRequires: mysql-devel BuildRequires: pam-devel BuildRequires: perl-base +BuildRequires: rpmbuild(macros) >= 1.268 BuildRequires: texinfo Requires(post,preun): /sbin/chkconfig Requires: logrotate Requires: pam >= 0.79.0 Requires: rc-scripts Provides: ftpserver -Obsoletes: ftpserver Obsoletes: anonftp Obsoletes: bftpd Obsoletes: ftpd-BSD +Obsoletes: ftpserver Obsoletes: glftpd Obsoletes: heimdal-ftpd Obsoletes: linux-ftpd @@ -156,17 +157,11 @@ %post [ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1 /sbin/chkconfig --add muddleftpd -if [ -f /var/lock/subsys/muddleftpd ]; then - /etc/rc.d/init.d/muddleftpd restart 1>&2 -else - echo "Run \"/etc/rc.d/init.d/muddleftpd start\" to start muddleftpd daemon." -fi +%service muddleftpd restart "muddleftpd daemon" %preun if [ "$1" = "0" ]; then - if [ -f /var/lock/subsys/muddleftpd ]; then - /etc/rc.d/init.d/muddleftpd stop 1>&2 - fi + %service muddleftpd stop /sbin/chkconfig --del muddleftpd fi @@ -213,6 +208,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.53 2006/03/05 14:51:20 glen +- use %service, adapterized, cosmetics + Revision 1.52 2005/12/04 23:10:18 glen - adapterized (sorted %verify flags) @@ -224,7 +222,7 @@ - req pam 0.79.0 Revision 1.49 2005/02/12 22:46:25 arekm -rel ++ +- rel ++ Revision 1.48 2004/10/24 13:02:02 ankry - ftp->FTP @@ -242,7 +240,7 @@ - rel 1 Revision 1.43 2004/03/29 08:49:55 luzik - - added Obsolete: glftpd +- added Obsolete: glftpd Revision 1.42 2003/11/10 14:05:36 qboosh - missing defattrs, pl fixes, revised deps @@ -269,7 +267,7 @@ - more specific Requires, more changes where needed Revision 1.34 2003/07/22 19:47:35 troll -Added omited BuildRequires: texinfo +- Added omited BuildRequires: texinfo Revision 1.33 2003/06/16 19:09:15 blues - massive: cleanup in setup parameters (based on kloczek changes), small @@ -285,7 +283,7 @@ - massive attack s/pld.org.pl/pld-linux.org/ Revision 1.29 2003/02/23 12:44:56 hunter --added man page for mudpasswd.1, rom: Marek Fetliński <[EMAIL PROTECTED]> +- added man page for mudpasswd.1, rom: Marek Fetliński <[EMAIL PROTECTED]> Revision 1.28 2002/12/07 17:08:48 orzech - /home/ftp -> /home/services/ftp @@ -305,9 +303,9 @@ - release 6 Revision 1.23 2002/05/21 23:14:12 kloczek -perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \ +- perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \ s/^automake -a -c -f/\%\{__automake\}/; \ - s/^autoconf/\%\{__autoconf\}/" + s/^autoconf/\%\{__autoconf\}/" Revision 1.22 2002/03/26 22:10:44 djrzulf - s/Obsolete: proftpd-common/Conflicts: proftpd-common/ @@ -325,24 +323,24 @@ Group field using gettext). Revision 1.18 2002/01/18 02:13:59 kloczek -perl -pi -e "s/[EMAIL PROTECTED]/[EMAIL PROTECTED]/" +- perl -pi -e "s/[EMAIL PROTECTED]/[EMAIL PROTECTED]/" Revision 1.17 2001/10/11 12:07:18 qboosh - Obsoletes: troll-ftpd Revision 1.16 2001/10/08 21:25:56 grzegorz -- added creating /etc/security dir in %%install +- added creating /etc/security dir in %install Revision 1.15 2001/10/08 21:19:38 grzegorz - added Source5: muddleftpd.conf with "logfile /var/log/muddleftpd" and disabled "logindump /etc/issue.ftp", maybe some other options should be changed too -- in %%instal s/muddleftpd.log/muddleftpd/ -- added /etc/security/blacklist.ftp in %%install and %%files +- in %instal s/muddleftpd.log/muddleftpd/ +- added /etc/security/blacklist.ftp in %install and %files - release 4 Revision 1.14 2001/10/08 14:05:01 qboosh -- fixed: added creating /home/ftp/{pub,upload} in %%install +- fixed: added creating /home/ftp/{pub,upload} in %install Revision 1.13 2001/10/08 11:46:29 grzegorz - added /home/ftp and subdirectories (upload with root.ftp 700 too) @@ -383,4 +381,4 @@ - builds now, but not configured at all Revision 1.1 2001/03/04 14:40:51 misiek -raw +- raw ================================================================ Index: SPECS/munin.spec diff -u SPECS/munin.spec:1.34 SPECS/munin.spec:1.35 --- SPECS/munin.spec:1.34 Thu Jan 5 13:23:09 2006 +++ SPECS/munin.spec Sun Mar 5 15:51:20 2006 @@ -27,7 +27,7 @@ BuildRequires: html2text BuildRequires: htmldoc BuildRequires: perl-devel -BuildRequires: rpmbuild(macros) >= 1.226 +BuildRequires: rpmbuild(macros) >= 1.268 Requires: %{name}-common = %{version}-%{release} Requires: perl-Date-Manip Requires: perl-HTML-Template @@ -145,18 +145,13 @@ if [ "$1" = "1" ] ; then /sbin/chkconfig --add munin-node %{_sbindir}/munin-node-configure --shell | sh - echo "Run \"/etc/rc.d/init.d/munin-node start\" to start Munin Node agent." >&2 -else - if [ -f /var/lock/subsys/munin-node ]; then - /etc/rc.d/init.d/munin-node restart >&2 - fi fi +%service munin-node restart "Munin Node agent" + %preun node if [ "$1" = "0" ] ; then - if [ -f /var/lock/subsys/munin-node ]; then - /etc/rc.d/init.d/munin-node stop >&2 - fi + %service munin-node stop /sbin/chkconfig --del munin-node fi @@ -234,6 +229,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.35 2006/03/05 14:51:20 glen +- use %service, adapterized, cosmetics + Revision 1.34 2006/01/05 12:23:09 baggins - rel 5 - added archiv log dir ================================================================ Index: SPECS/mysql.spec diff -u SPECS/mysql.spec:1.324 SPECS/mysql.spec:1.325 --- SPECS/mysql.spec:1.324 Wed Feb 15 18:25:14 2006 +++ SPECS/mysql.spec Sun Mar 5 15:51:20 2006 @@ -70,7 +70,7 @@ BuildRequires: perl-devel >= 1:5.6.1 BuildRequires: readline-devel >= 4.2 BuildRequires: rpm-perlprov >= 4.1-13 -BuildRequires: rpmbuild(macros) >= 1.228 +BuildRequires: rpmbuild(macros) >= 1.268 BuildRequires: sed >= 4.0 BuildRequires: texinfo BuildRequires: zlib-devel @@ -247,8 +247,8 @@ Summary(ru): MySQL ËĚÉĹÎÔ Summary(uk): MySQL ËĚŚ¤ÎÔ Group: Applications/Databases -Requires: %{name}-libs = %{version}-%{release} Requires: %{name}-charsets = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} Obsoletes: MySQL-client %description client @@ -638,50 +638,32 @@ %post ndb /sbin/chkconfig --add mysql-ndb -if [ -f /var/lock/subsys/mysql-ndb ]; then - /etc/rc.d/init.d/mysql-ndb restart >&2 -else - echo "Run \"/etc/rc.d/init.d/mysql-ndb start\" to start mysql NDB engine." >&2 -fi +%service mysql-ndb restart "mysql NDB engine" %preun ndb if [ "$1" = "0" ]; then - if [ -f /var/lock/subsys/mysql-ndb ]; then - /etc/rc.d/init.d/mysql-ndb stop - fi - /sbin/chkconfig --del mysql-ndb + %service mysql-ndb stop + /sbin/chkconfig --del mysql-ndb fi %post ndb-mgm /sbin/chkconfig --add mysql-ndb-mgm -if [ -f /var/lock/subsys/mysql-ndb-mgm ]; then - /etc/rc.d/init.d/mysql-ndb-mgm restart >&2 -else - echo "Run \"/etc/rc.d/init.d/mysql-ndb-mgm start\" to start mysql NDB management node." >&2 -fi +%service mysql-ndb-mgm restart "mysql NDB management node" %preun ndb-mgm if [ "$1" = "0" ]; then - if [ -f /var/lock/subsys/mysql-ndb-mgm ]; then - /etc/rc.d/init.d/mysql-ndb-mgm stop - fi - /sbin/chkconfig --del mysql-ndb-mgm + %service mysql-ndb-mgm stop + /sbin/chkconfig --del mysql-ndb-mgm fi %post ndb-cpc /sbin/chkconfig --add mysql-ndb-cpc -if [ -f /var/lock/subsys/mysql-ndb-cpc ]; then - /etc/rc.d/init.d/mysql-ndb-cpc restart >&2 -else - echo "Run \"/etc/rc.d/init.d/mysql-ndb-cpc start\" to start mysql NDB CPC." >&2 -fi +%service mysql-ndb-cpc restart "mysql NDB CPC" %preun ndb-cpc if [ "$1" = "0" ]; then - if [ -f /var/lock/subsys/mysql-ndb-cpc ]; then - /etc/rc.d/init.d/mysql-ndb-cpc stop - fi - /sbin/chkconfig --del mysql-ndb-cpc + %service mysql-ndb-cpc stop + /sbin/chkconfig --del mysql-ndb-cpc fi %post libs -p /sbin/ldconfig @@ -918,6 +900,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.325 2006/03/05 14:51:20 glen +- use %service, adapterized, cosmetics + Revision 1.324 2006/02/15 17:25:14 arekm - rel 4; reconnect fixes ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mserver.spec?r1=1.25&r2=1.26&f=u http://cvs.pld-linux.org/SPECS/muddleftpd.spec?r1=1.52&r2=1.53&f=u http://cvs.pld-linux.org/SPECS/munin.spec?r1=1.34&r2=1.35&f=u http://cvs.pld-linux.org/SPECS/mysql.spec?r1=1.324&r2=1.325&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
