Author: glen Date: Sun Apr 16 20:52:39 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - use %service
---- Files affected: SPECS: bacula.spec (1.42 -> 1.43) , bandersnatch.spec (1.7 -> 1.8) , bandwidthd.spec (1.4 -> 1.5) , bb4.spec (1.21 -> 1.22) , bfilter.spec (1.8 -> 1.9) , bjorb.spec (1.8 -> 1.9) , bnc.spec (1.38 -> 1.39) , bugzilla.spec (1.18 -> 1.19) ---- Diffs: ================================================================ Index: SPECS/bacula.spec diff -u SPECS/bacula.spec:1.42 SPECS/bacula.spec:1.43 --- SPECS/bacula.spec:1.42 Thu Apr 13 22:05:55 2006 +++ SPECS/bacula.spec Sun Apr 16 22:52:33 2006 @@ -1,5 +1,4 @@ # $Revision$, $Date$ -# # TODO: # - update desktop files, think about su-wrappers for console # - package web admin @@ -17,8 +16,8 @@ Version: 1.38.7 Release: 0.1 Epoch: 0 -Group: Networking/Utilities License: extended GPL v2 +Group: Networking/Utilities Source0: http://dl.sourceforge.net/bacula/%{name}-%{version}.tar.gz # Source0-md5: 6273f45bfbcddd66e179bc6cb7e28ad1 Source1: %{name}-manpages.tar.bz2 @@ -56,7 +55,7 @@ BuildRequires: pkgconfig %{?with_python:BuildRequires: python-static} BuildRequires: readline-devel -BuildRequires: rpmbuild(macros) >= 1.202 +BuildRequires: rpmbuild(macros) >= 1.268 BuildRequires: sed >= 4.0 BuildRequires: sqlite-devel %if %{with console_wx} @@ -549,17 +548,11 @@ sed -i -e"s:--hostname--:`hostname`:" *.conf *.conf.rpmnew 2>/dev/null || : /sbin/chkconfig --add bacula-dir -if [ -f /var/lock/subsys/bacula-dir ]; then - /etc/rc.d/init.d/bacula-dir restart 1>&2 -else - echo "Run \"/etc/rc.d/init.d/bacula-dir start\" to start Bacula Director daemon." -fi +%service bacula-dir restart "Bacula Director daemon" %preun dir if [ "$1" = "0" ]; then - if [ -f /var/lock/subsys/bacula-dir ]; then - /etc/rc.d/init.d/bacula-dir stop 1>&2 - fi + %service bacula-dir stop /sbin/chkconfig --del bacula-dir fi @@ -573,17 +566,11 @@ sed -i -e"s:--hostname--:`hostname`:" *.conf *.conf.rpmnew 2>/dev/null || : /sbin/chkconfig --add bacula-fd -if [ -f /var/lock/subsys/bacula-fd ]; then - /etc/rc.d/init.d/bacula-fd restart 1>&2 -else - echo "Run \"/etc/rc.d/init.d/bacula-fd start\" to start Bacula File daemon." -fi +%service bacula-fd restart "Bacula File daemon" %preun fd if [ "$1" = "0" ]; then - if [ -f /var/lock/subsys/bacula-fd ]; then - /etc/rc.d/init.d/bacula-fd stop 1>&2 - fi + %service bacula-fd stop /sbin/chkconfig --del bacula-fd fi @@ -597,17 +584,11 @@ sed -i -e"s:--hostname--:`hostname`:" *.conf *.conf.rpmnew 2>/dev/null || : /sbin/chkconfig --add bacula-sd -if [ -f /var/lock/subsys/bacula-sd ]; then - /etc/rc.d/init.d/bacula-sd restart 1>&2 -else - echo "Run \"/etc/rc.d/init.d/bacula-sd start\" to start Bacula Storage daemon." -fi +%service bacula-sd restart "Bacula Storage daemon" %preun sd if [ "$1" = "0" ]; then - if [ -f /var/lock/subsys/bacula-sd ]; then - /etc/rc.d/init.d/bacula-sd stop 1>&2 - fi + %service bacula-sd stop /sbin/chkconfig --del bacula-sd fi @@ -808,6 +789,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.43 2006/04/16 20:52:33 glen +- use %service + Revision 1.42 2006/04/13 20:05:55 jajcus - Version: 1.38.7 - Patch that fixes appending to DVD volumes ================================================================ Index: SPECS/bandersnatch.spec diff -u SPECS/bandersnatch.spec:1.7 SPECS/bandersnatch.spec:1.8 --- SPECS/bandersnatch.spec:1.7 Mon Oct 3 20:45:49 2005 +++ SPECS/bandersnatch.spec Sun Apr 16 22:52:33 2006 @@ -6,10 +6,10 @@ # - add deps to frontend %include /usr/lib/rpm/macros.perl +%define _rc RC1 Summary: Log Jabber conversations to a peer-visible database Summary(pl): Logowanie rozmów przez Jabbera do bazy danych widocznej dla drugiej strony Name: bandersnatch -%define _rc RC1 Version: 0.4 Release: 0.%{_rc}.1 License: GPL @@ -21,6 +21,7 @@ Patch0: %{name}-utf8.patch URL: http://www.funkypenguin.co.za/taxonomy/term/5 BuildRequires: rpm-perlprov +BuildRequires: rpmbuild(macros) >= 1.268 Requires(post,preun): /sbin/chkconfig Requires: rc-scripts BuildArch: noarch @@ -41,9 +42,9 @@ Summary: bandersnatch web frontend Summary(pl): Interfejs WWW dla bandersnatcha Group: Applications/WWW -Requires: php-pear-HTML_Template_IT -Requires: php-pear-DB Requires: php-pear-Auth +Requires: php-pear-DB +Requires: php-pear-HTML_Template_IT %description frontend bandersnatch web frontend. @@ -78,17 +79,11 @@ %post /sbin/chkconfig --add %{name} -if [ -r /var/lock/subsys/%{name} ]; then - /etc/rc.d/init.d/%{name} restart >&2 -else - echo "Run \"/etc/rc.d/init.d/%{name} start\" to start %{name} server." -fi +%service %{name} restart %preun if [ "$1" = "0" ]; then - if [ -r /var/lock/subsys/%{name} ]; then - /etc/rc.d/init.d/%{name} stop >&2 - fi + %service %{name} stop /sbin/chkconfig --del %{name} fi @@ -97,7 +92,7 @@ %doc *.sql doc/* %dir %{_sysconfdir}/%{name} %attr(755,root,root) %{_sbindir}/* -%attr(640,root,nobody) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/%{name}.xml +%attr(640,root,nobody) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/%{name}.xml # FIXME nobody user/group can't own files! -adapter.awk %attr(754,root,root) /etc/rc.d/init.d/%{name} %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name} @@ -113,6 +108,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.8 2006/04/16 20:52:33 glen +- use %service + Revision 1.7 2005/10/03 18:45:49 qboosh - pl, chkconfig deps ================================================================ Index: SPECS/bandwidthd.spec diff -u SPECS/bandwidthd.spec:1.4 SPECS/bandwidthd.spec:1.5 --- SPECS/bandwidthd.spec:1.4 Mon Jan 24 11:21:24 2005 +++ SPECS/bandwidthd.spec Sun Apr 16 22:52:33 2006 @@ -19,8 +19,9 @@ BuildRequires: gd-devel BuildRequires: libpcap-devel BuildRequires: libpng-devel -PreReq: rc-scripts +BuildRequires: rpmbuild(macros) >= 1.268 Requires(post,preun): /sbin/chkconfig +Requires: rc-scripts Requires: webserver BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -67,8 +68,8 @@ install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/bandwidthd install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir} -cat << EOF > $RPM_BUILD_ROOT/etc/cron.d/bandwidthd -0 0 * * * root /bin/kill -HUP \`cat /var/run/bandwidthd.pid\` +cat << 'EOF' > $RPM_BUILD_ROOT/etc/cron.d/bandwidthd +0 0 * * * root /bin/kill -HUP `cat /var/run/bandwidthd.pid` EOF %clean @@ -76,17 +77,11 @@ %post /sbin/chkconfig --add bandwidthd -if [ -f /var/lock/subsys/bandwidthd ]; then - /etc/rc.d/init.d/bandwidthd restart 1>&2 -else - echo "Run \"/etc/rc.d/init.d/bandwidthd start\" to start bandwidthd." -fi +%service bandwidthd restart %preun if [ "$1" = "0" ]; then - if [ -f /var/lock/subsys/bandwidthd ]; then - /etc/rc.d/init.d/bandwidthd stop 1>&2 - fi + %service bandwidthd stop /sbin/chkconfig --del bandwidthd fi @@ -107,6 +102,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.5 2006/04/16 20:52:33 glen +- use %service + Revision 1.4 2005/01/24 10:21:24 qboosh - preun indentation, standard init script perms, config(noreplace) for sysconfig ================================================================ Index: SPECS/bb4.spec diff -u SPECS/bb4.spec:1.21 SPECS/bb4.spec:1.22 --- SPECS/bb4.spec:1.21 Mon Dec 12 14:44:45 2005 +++ SPECS/bb4.spec Sun Apr 16 22:52:33 2006 @@ -1,9 +1,9 @@ # $Revision$, $Date$ +%define nshort bb18d Summary: Big Brother System and Network Monitor Summary(pl): Wielki Brat - monitor systemów i sieci Name: bb4 Version: 1.8d -%define nshort bb18d Release: 2 License: Free for non-commercial use, 30-day trial for commercial use; not distributable Group: Networking @@ -12,8 +12,7 @@ Patch0: %{name}-pld.patch NoSource: 0 URL: http://bb4.com/ -BuildRequires: rpmbuild(macros) >= 1.202 -Requires: rc-scripts +BuildRequires: rpmbuild(macros) >= 1.268 Requires(post,preun): /sbin/chkconfig Requires(postun): /usr/sbin/groupdel Requires(postun): /usr/sbin/userdel @@ -22,6 +21,7 @@ Requires(pre): /usr/sbin/groupadd Requires(pre): /usr/sbin/useradd Requires: /usr/bin/setsid +Requires: rc-scripts Provides: group(bb) Provides: user(bb) Conflicts: iputils-ping < 1:ss020124 @@ -106,7 +106,7 @@ ln -sf %{_etcdir} $RPM_BUILD_ROOT%{_libdir}/etc ln -sf %{_htmldir} $RPM_BUILD_ROOT%{_libdir}/www ln -sf %{_vardir}/tmp $RPM_BUILD_ROOT%{_libdir}/tmp -ln -sf %{_vardir} $RPM_BUILD_ROOT/usr/lib/bbvar +ln -sf %{_vardir} $RPM_BUILD_ROOT%{_prefix}/lib/bbvar for f in bb-bbexttab bb-cputab bb-dftab bb-msgstab bb-proctab security ; do sed -e 's/^[^#]/#\&/' %{nshort}/etc/$f.DIST > $RPM_BUILD_ROOT%{_etcdir}/$f @@ -127,17 +127,11 @@ %post /sbin/chkconfig --add bb -if [ -f /var/lock/subsys/bb ]; then - /etc/rc.d/init.d/bb restart >&2 -else - echo "Run \"/etc/rc.d/init.d/bb start\" to start Big Brother daemon." >&2 -fi +%service bb restart "Big Brother daemon" %preun if [ "$1" = "0" ]; then - if [ -f /var/lock/subsys/bb ]; then - /etc/rc.d/init.d/bb stop >&2 - fi + %service bb stop /sbin/chkconfig --del bb fi @@ -164,7 +158,7 @@ %{_libdir}/www %{_libdir}/tmp %attr(755,root,root) %{_libdir}/runbb.sh -/usr/lib/bbvar +%{_prefix}/lib/bbvar %attr(775,root,bb) %dir %{_htmldir} %attr(775,root,bb) %{_htmldir}/html %{_htmldir}/gifs* @@ -183,6 +177,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.22 2006/04/16 20:52:33 glen +- use %service + Revision 1.21 2005/12/12 13:44:45 glen - adapterized (sorted %verify attrs) ================================================================ Index: SPECS/bfilter.spec diff -u SPECS/bfilter.spec:1.8 SPECS/bfilter.spec:1.9 --- SPECS/bfilter.spec:1.8 Mon May 2 20:23:51 2005 +++ SPECS/bfilter.spec Sun Apr 16 22:52:33 2006 @@ -14,13 +14,13 @@ # Source0-md5: 72ca85565bd4c556b06e3a264c0c24f1 Source1: %{name}.init URL: http://bfilter.sf.net +BuildRequires: broken-pre-scriptlet(fix:user/group) BuildRequires: libsigc++12-devel BuildRequires: libstdc++-devel BuildRequires: pkgconfig BuildRequires: popt-devel +BuildRequires: rpmbuild(macros) >= 1.268 BuildRequires: zlib-devel -BuildRequires: rpmbuild(macros) >= 1.202 -BuildRequires: broken-pre-scriptlet(fix user/group) Requires(post): /usr/sbin/groupadd Requires(post): /usr/sbin/useradd Requires(post,preun): /sbin/chkconfig @@ -62,21 +62,15 @@ # XXX: unify # TODO register uid/gid in uid_gid.db.txt %groupadd -r -g XXX -f %{name} -%useradd -r -u XXX -s /bin/false -d / -M -g %{name} -c 'BFilter filtering proxy' %{name} +%useradd -r -u XXX -s /bin/false -d / -M -g %{name} -c "BFilter filtering proxy" %{name} %post /sbin/chkconfig --add %{name} -if [ -f /var/lock/subsys/%{name} ]; then - /etc/rc.d/init.d/%{name} restart 1>&2 -else - echo "Type \"/etc/rc.d/init.d/%{name} start\" to start %{name}." 1>&2 -fi +%service %{name} restart %preun if [ "$1" = "0" ]; then - if [ -f /var/lock/subsys/%{name} ]; then - /etc/rc.d/init.d/%{name} stop 1>&2 - fi + %service %{name} stop /sbin/chkconfig --del %{name} fi @@ -97,6 +91,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.9 2006/04/16 20:52:33 glen +- use %service + Revision 1.8 2005/05/02 18:23:51 glen - adapterized ================================================================ Index: SPECS/bjorb.spec diff -u SPECS/bjorb.spec:1.8 SPECS/bjorb.spec:1.9 --- SPECS/bjorb.spec:1.8 Wed Mar 1 00:37:25 2006 +++ SPECS/bjorb.spec Sun Apr 16 22:52:33 2006 @@ -16,6 +16,7 @@ BuildRequires: autoconf BuildRequires: libstdc++-devel BuildRequires: openssl-devel +BuildRequires: rpmbuild(macros) >= 1.268 Requires(post,preun): /sbin/chkconfig Requires: rc-scripts BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -68,17 +69,11 @@ %post /sbin/chkconfig --add %{name} -if [ -f /var/lock/subsys/%{name} ]; then - /etc/rc.d/init.d/%{name} restart 1>&2 -else - echo "Run \"/etc/rc.d/init.d/%{name} start\" to start Bjorb daemon." -fi +%service %{name} restart "Bjorb daemon" %preun if [ "$1" = "0" ]; then - if [ -f /var/lock/subsys/%{name} ]; then - /etc/rc.d/init.d/%{name} stop 1>&2 - fi + %service %{name} stop /sbin/chkconfig --del %{name} fi @@ -97,6 +92,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.9 2006/04/16 20:52:33 glen +- use %service + Revision 1.8 2006/02/28 23:37:25 glen - adapterized (killed trailing spaces/tabs) ================================================================ Index: SPECS/bnc.spec diff -u SPECS/bnc.spec:1.38 SPECS/bnc.spec:1.39 --- SPECS/bnc.spec:1.38 Fri Apr 14 14:16:03 2006 +++ SPECS/bnc.spec Sun Apr 16 22:52:33 2006 @@ -19,7 +19,7 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: openssl-devel -BuildRequires: rpmbuild(macros) >= 1.202 +BuildRequires: rpmbuild(macros) >= 1.268 Requires: dialog >= 1:0.69 Provides: group(bnc) Provides: user(bnc) @@ -106,20 +106,12 @@ # ' vim fi - /sbin/chkconfig --add %{name} - -if [ -f /var/lock/subsys/%{name} ]; then - /etc/rc.d/init.d/%{name} restart 1>&2 -else - echo "Run \"/etc/rc.d/init.d/%{name} start\" to start %{name} daemon." -fi +%service %{name} restart "%{name} daemon" %preun init if [ "$1" = "0" ]; then - if [ -f /var/lock/subsys/%{name} ]; then - /etc/rc.d/init.d/%{name} stop 1>&2 - fi + %service %{name} stop /sbin/chkconfig --del %{name} fi @@ -149,6 +141,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.39 2006/04/16 20:52:33 glen +- use %service + Revision 1.38 2006/04/14 12:16:03 glen - rel 2 ================================================================ Index: SPECS/bugzilla.spec diff -u SPECS/bugzilla.spec:1.18 SPECS/bugzilla.spec:1.19 --- SPECS/bugzilla.spec:1.18 Mon Dec 12 16:19:32 2005 +++ SPECS/bugzilla.spec Sun Apr 16 22:52:33 2006 @@ -16,6 +16,7 @@ Patch0: %{name}-httpd_user.patch Patch1: %{name}-chdir.patch URL: http://www.bugzilla.org/ +BuildRequires: rpmbuild(macros) >= 1.268 Requires: mysql >= 3.23.41 Requires: perl-DBD-mysql Requires: perl-DBI >= 1.36 @@ -65,33 +66,25 @@ if [ -f /etc/httpd/%{name}.conf.rpmsave ]; then cp -f %{_sysconfdir}/apache.conf{,.rpmnew} mv -f /etc/httpd/%{name}.conf.rpmsave %{_sysconfdir}/apache.conf - if [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd reload 1>&2 - fi + %service -q httpd reload fi # nuke very-old config location (this mostly for Ra) if [ ! -d /etc/httpd/httpd.conf ]; then sed -i -e "/^Include.*%{name}.conf/d" /etc/httpd/httpd.conf - if [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd reload 1>&2 - fi + %service -q httpd reload fi # place new config location, as trigger puts config only on first install, do it here. # apache1 if [ -d /etc/apache/conf.d ]; then ln -sf %{_sysconfdir}/apache.conf /etc/apache/conf.d/99_%{name}.conf - if [ -f /var/lock/subsys/apache ]; then - /etc/rc.d/init.d/apache reload 1>&2 - fi + %service -q apache reload fi # apache2 if [ -d /etc/httpd/httpd.conf ]; then ln -sf %{_sysconfdir}/apache.conf /etc/httpd/httpd.conf/99_%{name}.conf - if [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd reload 1>&2 - fi + %service -q httpd reload fi %triggerin -- apache1 >= 1.3.33-2 @@ -141,6 +134,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.19 2006/04/16 20:52:33 glen +- use %service + Revision 1.18 2005/12/12 15:19:32 glen - adapterized (sorted %verify flags) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/bacula.spec?r1=1.42&r2=1.43&f=u http://cvs.pld-linux.org/SPECS/bandersnatch.spec?r1=1.7&r2=1.8&f=u http://cvs.pld-linux.org/SPECS/bandwidthd.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/SPECS/bb4.spec?r1=1.21&r2=1.22&f=u http://cvs.pld-linux.org/SPECS/bfilter.spec?r1=1.8&r2=1.9&f=u http://cvs.pld-linux.org/SPECS/bjorb.spec?r1=1.8&r2=1.9&f=u http://cvs.pld-linux.org/SPECS/bnc.spec?r1=1.38&r2=1.39&f=u http://cvs.pld-linux.org/SPECS/bugzilla.spec?r1=1.18&r2=1.19&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
