Author: glen Date: Mon Feb 27 23:35:16 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- use %service
---- Files affected:
SPECS:
gpm.spec (1.130 -> 1.131) , hc-cron.spec (1.97 -> 1.98) , hddtemp.spec (1.29
-> 1.30) , heimdal.spec (1.124 -> 1.125)
---- Diffs:
================================================================
Index: SPECS/gpm.spec
diff -u SPECS/gpm.spec:1.130 SPECS/gpm.spec:1.131
--- SPECS/gpm.spec:1.130 Mon Dec 12 17:24:19 2005
+++ SPECS/gpm.spec Tue Feb 28 00:35:08 2006
@@ -41,6 +41,7 @@
BuildRequires: bison
BuildRequires: gawk
BuildRequires: ncurses-devel >= 5.0
+BuildRequires: rpmbuild(macros) >= 1.268
BuildRequires: texinfo
Requires(post,preun): /sbin/chkconfig
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
@@ -113,8 +114,8 @@
Summary: GPM libraries
Summary(pl): Biblioteki GPM
Group: Libraries
-Conflicts: gpm < 1.19.3-7
Obsoletes: libgpm1
+Conflicts: gpm < 1.19.3-7
%description libs
This package contains library files neccessary to run most of
@@ -258,17 +259,11 @@
[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir}
>/dev/null 2>&1
/sbin/chkconfig --add gpm
-if [ -f /var/lock/subsys/gpm ]; then
- /etc/rc.d/init.d/gpm restart >&2
-else
- echo "Run \"/etc/rc.d/init.d/gpm start\" to start gpm daemon."
-fi
+%service gpm restart "gpm daemon"
%preun
if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/gpm ]; then
- /etc/rc.d/init.d/gpm stop >&2
- fi
+ %service gpm stop
/sbin/chkconfig --del gpm
fi
@@ -314,6 +309,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.131 2006/02/27 23:35:08 glen
+- use %service
+
Revision 1.130 2005/12/12 16:24:19 glen
- adapterized (sorted %verify attrs)
@@ -401,8 +399,8 @@
Revision 1.105 2002/07/03 22:44:08 blues
- release 1
- STBR for tests
-NOTE: if you have scroll mouse and it crashes while going X -> console
-change mouse type to exps2. It works...
+ NOTE: if you have scroll mouse and it crashes while going X -> console
+ change mouse type to exps2. It works...
Revision 1.104 2002/06/30 16:21:02 blues
- corrected naming scheme
@@ -417,12 +415,12 @@
Revision 1.101 2002/06/18 09:33:00 qboosh
- added detaching fd 0 from terminal to init script
-- new %%doc, release 0.12
+- new %doc, release 0.12
Revision 1.100 2002/05/21 23:13:24 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.99 2002/05/15 20:11:19 qboosh
- fixed console number detection (vcnum-bug patch), release 0.11
@@ -432,7 +430,7 @@
- release 0.10
Revision 1.97 2002/04/25 16:29:06 arturs
-fixed a small typo
+- fixed a small typo
Revision 1.96 2002/03/12 09:55:35 qboosh
- fixed changelog and pl description
@@ -447,7 +445,7 @@
Revision 1.93 2002/03/11 16:15:27 blues
- 0.2
- few outdated patches removed, DESTDIR updated, builds now.
-NFY
+ NFY
Revision 1.92 2002/03/11 15:45:20 blues
- rel 0.1 - started updating to 1.20.0
@@ -472,7 +470,7 @@
- added man-pages tar URL
Revision 1.85 2002/01/18 02:13:11 kloczek
-perl -pi -e "s/[EMAIL PROTECTED]/[EMAIL PROTECTED]/"
+- perl -pi -e "s/[EMAIL PROTECTED]/[EMAIL PROTECTED]/"
Revision 1.84 2002/01/03 07:34:00 blues
- added cosmetics in post
@@ -500,7 +498,7 @@
- 1.19.5
- updated info,DESTDIR,info_fixes,root,OPEN_MAX,limits,serialconsole patches
- removed non-root,checkdevfsbug patches
-- updated %%files (more docs, man7 page)
+- updated %files (more docs, man7 page)
- added nosecenhance patch (argh, secenhance patch is in sources)
Revision 1.77 2001/09/24 13:18:35 qboosh
@@ -533,13 +531,13 @@
- release 21
- ac 2.50 ready
- secenhance patch is out. It's stupid and makes stupid things. kloczek -
- think twice before such a patches. Check them. This one was out some time
- ago.
+ think twice before such a patches. Check them. This one was out some time
+ ago.
Revision 1.67 2001/07/06 13:09:19 kloczek
- release 20,
- run ldconfig in %postun (not %preun) in libs,
-- added missing "Requires: %%{name} = %%{version}" for main,
+- added missing "Requires: %{name} = %{version}" for main,
- spec adapterized,
- fix tmp race (patch from Conectiva),
- merge two patches from rawhide (secenhance and serialconsole),
@@ -600,10 +598,10 @@
- release 4.
Revision 1.50 2000/06/09 07:54:42 kloczek
-- more %%{__make} macros.
+- more %{__make} macros.
Revision 1.49 2000/06/09 07:22:52 kloczek
-- added using %%{__make} macro.
+- added using %{__make} macro.
Revision 1.48 2000/05/24 16:50:45 zagrodzki
- changed [ -x ... ] && to [ ! -x ... ] ||
@@ -618,7 +616,7 @@
Revision 1.45 2000/04/17 17:48:51 kloczek
- release 3,
-- removed using %%{_sysconfdir} in some cases.
+- removed using %{_sysconfdir} in some cases.
Revision 1.44 2000/04/17 16:29:43 mikrobi
- removed section adding unnecessary variables to sysconfig/mouse
@@ -718,10 +716,10 @@
* Wed Aug 26 1998 Tomasz Kłoczko <[EMAIL PROTECTED]>
[1.13-9]
-- changed Buildroot to /tmp/%%{name}-%%{version}-root,
-- added using %%{name} and %%{version} in Source,
+- changed Buildroot to /tmp/%{name}-%{version}-root,
+- added using %{name} and %{version} in Source,
- added static subpackage,
-- changed dependencies to "Requires: %%{name} = %%{version}" in devel
+- changed dependencies to "Requires: %{name} = %{version}" in devel
subpackage,
- added using $RPM_OPT_FLAGS during compile,
- added stripping shared libraries,
================================================================
Index: SPECS/hc-cron.spec
diff -u SPECS/hc-cron.spec:1.97 SPECS/hc-cron.spec:1.98
--- SPECS/hc-cron.spec:1.97 Wed Nov 30 19:39:31 2005
+++ SPECS/hc-cron.spec Tue Feb 28 00:35:08 2006
@@ -32,8 +32,8 @@
Requires: /sbin/chkconfig
Requires: psmisc >= 20.1
Requires: rc-scripts
-Provides: crontabs
Provides: crondaemon
+Provides: crontabs
Provides: group(crontab)
Obsoletes: crontabs
Obsoletes: fcron
@@ -129,9 +129,7 @@
%preun
if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/crond ]; then
- /etc/rc.d/init.d/crond stop >&2
- fi
+ %service crond stop
/sbin/chkconfig --del crond
fi
@@ -191,6 +189,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.98 2006/02/27 23:35:08 glen
+- use %service
+
Revision 1.97 2005/11/30 18:39:31 glen
- use %service; adapterized
================================================================
Index: SPECS/hddtemp.spec
diff -u SPECS/hddtemp.spec:1.29 SPECS/hddtemp.spec:1.30
--- SPECS/hddtemp.spec:1.29 Mon Dec 12 17:24:19 2005
+++ SPECS/hddtemp.spec Tue Feb 28 00:35:08 2006
@@ -1,9 +1,9 @@
# $Revision$, $Date$
+%define _beta beta14
Summary: HDD temperature sensor
Summary(pl): Czujka temperatury dysku twardego
Name: hddtemp
Version: 0.3
-%define _beta beta14
Release: 0.%{_beta}.1
License: GPL v2
Group: Applications/System
@@ -16,6 +16,7 @@
URL: http://www.guzu.net/linux/hddtemp.php
BuildRequires: automake
BuildRequires: gettext-devel
+BuildRequires: rpmbuild(macros) >= 1.268
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -66,7 +67,6 @@
install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/hddtempd
install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/hddtempd
-
%find_lang %{name}
%clean
@@ -74,26 +74,17 @@
%post hddtempd
/sbin/chkconfig --add hddtempd
-if [ -f /var/lock/subsys/hddtempd ]; then
- /etc/rc.d/init.d/hddtempd restart >&2
-else
+if [ "$1" = 1 ]; then
echo "You have to configure hddtempd in /etc/sysconfig/hddtempd."
- echo "Then run \"/etc/rc.d/init.d/hddtempd start\" to start hddtempd
daemon." >&2
fi
+%service hddtempd restart "hddtempd daemon"
%preun hddtempd
if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/hddtempd ]; then
- /etc/rc.d/init.d/hddtempd stop >&2
- fi
+ %service hddtempd stop
/sbin/chkconfig --del hddtempd
fi
-%files hddtempd
-%defattr(644,root,root,755)
-%attr(754,root,root) /etc/rc.d/init.d/hddtempd
-%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/hddtempd
-
%files -f %{name}.lang
%defattr(644,root,root,755)
%doc ChangeLog README TODO
@@ -101,12 +92,20 @@
%{_mandir}/man8/*
%{_datadir}/misc/*
+%files hddtempd
+%defattr(644,root,root,755)
+%attr(754,root,root) /etc/rc.d/init.d/hddtempd
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/hddtempd
+
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
* %{date} PLD Team <[EMAIL PROTECTED]>
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.30 2006/02/27 23:35:08 glen
+- use %service
+
Revision 1.29 2005/12/12 16:24:19 glen
- adapterized (sorted %verify attrs)
@@ -142,10 +141,10 @@
- cosmetics and TODO
Revision 1.19 2003/11/04 23:44:27 hunter
--don't touch devices, let admin do his job
+- don't touch devices, let admin do his job
Revision 1.18 2003/11/02 16:04:35 hunter
--corrected hddtemp.db location
+- corrected hddtemp.db location
Revision 1.17 2003/10/28 15:26:22 qboosh
- CC/CFLAGS/LDFLAGS are correctly set by configure - no need to override
================================================================
Index: SPECS/heimdal.spec
diff -u SPECS/heimdal.spec:1.124 SPECS/heimdal.spec:1.125
--- SPECS/heimdal.spec:1.124 Mon Feb 20 23:19:04 2006
+++ SPECS/heimdal.spec Tue Feb 28 00:35:08 2006
@@ -45,6 +45,7 @@
BuildRequires: openldap-devel >= 2.3.0
BuildRequires: openssl-devel >= 0.9.7d
BuildRequires: readline-devel >= 5.0
+BuildRequires: rpmbuild(macros) >= 1.268
BuildRequires: texinfo
%{?with_x11:BuildRequires: xorg-lib-libXt-devel}
Requires: %{name}-libs = %{version}-%{release}
@@ -57,26 +58,26 @@
%description
Heimdal is a free implementation of Kerberos 5. The goals are to:
- - have an implementation that can be freely used by anyone
- - be protocol compatible with existing implementations and, if not in
- conflict, with RFC 1510 (and any future updated RFC)
- - be reasonably compatible with the M.I.T Kerberos V5 API
- - have support for Kerberos V5 over GSS-API (RFC1964)
- - include the most important and useful application programs (rsh,
- telnet, popper, etc.)
- - include enough backwards compatibility with Kerberos V4
- - IPv6 support
+- have an implementation that can be freely used by anyone
+- be protocol compatible with existing implementations and, if not in
+ conflict, with RFC 1510 (and any future updated RFC)
+- be reasonably compatible with the M.I.T Kerberos V5 API
+- have support for Kerberos V5 over GSS-API (RFC1964)
+- include the most important and useful application programs (rsh,
+ telnet, popper, etc.)
+- include enough backwards compatibility with Kerberos V4
+- IPv6 support
%description -l pl
Heimdal jest darmową implementacją Kerberosa 5. Główne zalety to:
- - implementacja, która może być używana przez każdego
- - kompatybilność na poziomie protokołu z istniejącymi implementacjami
- - racjonalna kompatybilność z M.I.T Kerberos V5 API
- - wsparcie dla Kerberosa 5 poprzez GSS-API (RFC1964)
- - zawiera większość istotnych i użytecznych aplikacji (rsh, telnet,
- popper, etc.)
- - zawiera wystarczającą kompatybilność z Kerberos V4
- - wsparcie dla IPv6
+- implementacja, która może być używana przez każdego
+- kompatybilność na poziomie protokołu z istniejącymi implementacjami
+- racjonalna kompatybilność z M.I.T Kerberos V5 API
+- wsparcie dla Kerberosa 5 poprzez GSS-API (RFC1964)
+- zawiera większość istotnych i użytecznych aplikacji (rsh, telnet,
+ popper, etc.)
+- zawiera wystarczającą kompatybilność z Kerberos V4
+- wsparcie dla IPv6
%package server
Summary: Kerberos Server
@@ -130,8 +131,8 @@
Summary(pl): Klient protokołu FTP
Group: Applications/Networking
Requires: %{name}-libs = %{version}-%{release}
-Conflicts: heimdal-clients
Obsoletes: ftp
+Conflicts: heimdal-clients
%description ftp
The FTP package provides the standard UNIX command-line FTP client
@@ -169,8 +170,8 @@
Summary(pl): Klient usługi telnet
Group: Applications/Networking
Requires: %{name}-libs = %{version}-%{release}
-Obsoletes: telnet
Provides: telnet
+Obsoletes: telnet
Conflicts: heimdal-clients
%description telnet
@@ -345,80 +346,46 @@
%post server
/sbin/chkconfig --add heimdal
-if [ -f /var/lock/subsys/heimdal ]; then
- /etc/rc.d/init.d/heimdal restart >&2
-else
- echo "Run \"/etc/rc.d/init.d/heimdal start\" to start heimdal daemon."
-fi
+%service heimdal restart "heimdal daemon"
/sbin/chkconfig --add kpasswdd
-if [ -f /var/lock/subsys/kpasswdd ]; then
- /etc/rc.d/init.d/kpasswdd restart >&2
-else
- echo "Run \"/etc/rc.d/init.d/kpasswdd start\" to start heimdal password
changing daemon."
-fi
+%service kpasswdd restart "heimdal password changing daemon"
-if [ -f /var/lock/subsys/rc-inetd ]; then
- /etc/rc.d/init.d/rc-inetd reload 1>&2
-else
- echo "Type \"/etc/rc.d/init.d/rc-inetd start\" to start inet server"
1>&2
-fi
+%service -q rc-inetd reload
%preun server
if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/heimdal ]; then
- /etc/rc.d/init.d/heimdal stop >&2
- fi
+ %service heimdal stop
/sbin/chkconfig --del heimdal
-fi
-if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/kpasswdd ]; then
- /etc/rc.d/init.d/kpasswdd stop >&2
- fi
+ %service kpasswdd stop
/sbin/chkconfig --del kpasswdd
-fi
-if [ -f /var/lock/subsys/rc-inetd ]; then
- /etc/rc.d/init.d/rc-inetd reload 1>&2
-else
- echo "Type \"/etc/rc.d/init.d/rc-inetd start\" to start inet server"
1>&2
+ %service -q rc-inetd reload
fi
%post ftpd
-if [ -f /var/lock/subsys/rc-inetd ]; then
- /etc/rc.d/init.d/rc-inetd reload 1>&2
-else
- echo "Type \"/etc/rc.d/init.d/rc-inetd start\" to start inet server"
1>&2
-fi
+%service -q rc-inetd reload
%postun ftpd
-if [ -f /var/lock/subsys/rc-inetd ]; then
- /etc/rc.d/init.d/rc-inetd reload
+if [ "$1" = "0" ]; then
+ %service -q rc-inetd reload
fi
%post rshd
-if [ -f /var/lock/subsys/rc-inetd ]; then
- /etc/rc.d/init.d/rc-inetd reload 1>&2
-else
- echo "Type \"/etc/rc.d/init.d/rc-inetd start\" to start inet server"
1>&2
-fi
+%service -q rc-inetd reload
%postun rshd
-if [ -f /var/lock/subsys/rc-inetd ]; then
- /etc/rc.d/init.d/rc-inetd reload
+if [ "$1" = "0" ]; then
+ %service -q rc-inetd reload
fi
%post telnetd
-if [ -f /var/lock/subsys/rc-inetd ]; then
- /etc/rc.d/init.d/rc-inetd reload 1>&2
-else
- echo "Type \"/etc/rc.d/init.d/rc-inetd start\" to start inet server"
1>&2
-fi
+%service -q rc-inetd reload
%postun telnetd
-if [ -f /var/lock/subsys/rc-inetd ]; then
- /etc/rc.d/init.d/rc-inetd reload
+if [ "$1" = "0" ]; then
+ %service -q rc-inetd reload
fi
%post libs
@@ -601,6 +568,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.125 2006/02/27 23:35:08 glen
+- use %service
+
Revision 1.124 2006/02/20 22:19:04 qboosh
- autoupdate no longer needed
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/gpm.spec?r1=1.130&r2=1.131&f=u
http://cvs.pld-linux.org/SPECS/hc-cron.spec?r1=1.97&r2=1.98&f=u
http://cvs.pld-linux.org/SPECS/hddtemp.spec?r1=1.29&r2=1.30&f=u
http://cvs.pld-linux.org/SPECS/heimdal.spec?r1=1.124&r2=1.125&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
