Author: glen Date: Mon Feb 27 23:25:29 2006 GMT
Module: SPECS Tag: DEVEL
---- Log message:
- use service, adapterized
---- Files affected:
SPECS:
glibc.spec (1.590.2.31 -> 1.590.2.32)
---- Diffs:
================================================================
Index: SPECS/glibc.spec
diff -u SPECS/glibc.spec:1.590.2.31 SPECS/glibc.spec:1.590.2.32
--- SPECS/glibc.spec:1.590.2.31 Sat Feb 11 21:46:45 2006
+++ SPECS/glibc.spec Tue Feb 28 00:25:24 2006
@@ -16,6 +16,7 @@
%define llh_version 7:2.6.12.0-10
+%define _snap 20060211T1753UTC
Summary: GNU libc
Summary(de): GNU libc
Summary(es): GNU libc
@@ -27,7 +28,6 @@
Summary(uk): GNU libc ×ĹŇÓŚ§ 2.3
Name: glibc
Version: 2.3.90
-%define _snap 20060211T1753UTC
Release: 0.%{_snap}.2
Epoch: 6
License: LGPL
@@ -80,25 +80,25 @@
BuildRequires: binutils >= 2:2.15.90.0.3
BuildRequires: gcc >= 5:3.4
BuildRequires: gettext-devel >= 0.10.36
-BuildRequires: linux-libc-headers >= %{llh_version}
%{?with_selinux:BuildRequires: libselinux-devel >= 1.18}
+BuildRequires: linux-libc-headers >= %{llh_version}
BuildRequires: perl-base
BuildRequires: rpm-build >= 4.3-0.20030610.28
BuildRequires: rpm-perlprov
-BuildRequires: rpmbuild(macros) >= 1.213
+BuildRequires: rpmbuild(macros) >= 1.268
BuildRequires: sed >= 4.0.5
BuildRequires: texinfo
AutoReq: false
-PreReq: basesystem
+Requires: basesystem
Requires: glibc-misc = %{epoch}:%{version}-%{release}
-Provides: glibc64
+Provides: /sbin/ldconfig
Provides: glibc(nptl)
Provides: glibc(tls)
+Provides: glibc64
Provides: ldconfig
-Provides: /sbin/ldconfig
-Obsoletes: glibc64
Obsoletes: glibc-common
Obsoletes: glibc-debug
+Obsoletes: glibc64
Obsoletes: ldconfig
Conflicts: kernel < 2.6.0
Conflicts: ld.so < 1.9.9-10
@@ -219,7 +219,7 @@
Summary(pl): Narzędzia i dane używane przez glibc
Group: Development/Libraries
AutoReq: false
-PreReq: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
%description misc
Utilities and data used by glibc.
@@ -239,8 +239,8 @@
Summary(uk): äĎÄÁÔËĎ׌ ÂŚÂĚŚĎÔĹËÉ, ĐĎÔŇŚÂÎŚ ÄĚŃ ËĎÍĐŚĚŃĂŚ§
Group: Development/Libraries
Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: %{name}-headers = %{epoch}:%{version}-%{release}
Requires: %{name}-devel-utils = %{epoch}:%{version}-%{release}
+Requires: %{name}-headers = %{epoch}:%{version}-%{release}
Provides: %{name}-devel(%{_target_cpu}) = %{epoch}:%{version}-%{release}
Obsoletes: libiconv-devel
@@ -440,17 +440,17 @@
Summary(ru): ëÜŰÉŇŐŔÝÉĘ ÄĹÍĎÎ ÓĹŇ×ÉÓĎ× ÉÍĹÎ
Summary(uk): ëĹŰŐŔŢÉĘ ÄĹÍĎÎ ÓĹ×ŚÓŚ× ŚÍĹÎ
Group: Networking/Daemons
-PreReq: rc-scripts >= 0.2.0
+Requires(post): fileutils
+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(post,preun): /sbin/chkconfig
-Requires(post): fileutils
-Requires(postun): /usr/sbin/groupdel
-Requires(postun): /usr/sbin/userdel
Requires: %{name} = %{epoch}:%{version}-%{release}
%{?with_selinux:Requires: libselinux >= 1.18}
+Requires: rc-scripts >= 0.2.0
Provides: group(nscd)
Provides: user(nscd)
@@ -508,8 +508,8 @@
Summary(es): Base de datos de todos los locales soportados por glibc
Summary(pl): Baza danych locale dla wszystkich lokalizacji obsługiwanych
przez glibc
Group: Libraries
-Requires: iconv = %{epoch}:%{version}-%{release}
Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: iconv = %{epoch}:%{version}-%{release}
%description localedb-all
This package contains locale database for all locales supported by
@@ -1034,17 +1034,11 @@
chmod 000 /var/log/nscd
chown root:root /var/log/nscd
chmod 640 /var/log/nscd
-if [ -f /var/lock/subsys/nscd ]; then
- /etc/rc.d/init.d/nscd restart 1>&2
-else
- echo "Run \"/etc/rc.d/init.d/nscd start\" to start nscd daemon." 1>&2
-fi
+%service nscd restart "nscd daemon"
%preun -n nscd
if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/nscd ]; then
- /etc/rc.d/init.d/nscd stop 1>&2
- fi
+ %service nscd stop
/sbin/chkconfig --del nscd
fi
@@ -1383,6 +1377,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.590.2.32 2006/02/27 23:25:24 glen
+- use service, adapterized
+
Revision 1.590.2.31 2006/02/11 20:46:45 pluto
- ifarch ppc for libnldbl_nonshared.
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/glibc.spec?r1=1.590.2.31&r2=1.590.2.32&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
