X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=setup.spec;h=b4db3dad39e662bb1c73696f8c513e291d355b9a;hb=36832d8557095547eafc672ff3ba7530bdd80165;hp=751acf9d7e338590b27797cf1a9894d1f25d631a;hpb=c14440b1e9eaf744d13cee91f7012d78f950c081;p=packages%2Fsetup.git

diff --git a/setup.spec b/setup.spec
index 751acf9..b4db3da 100644
--- a/setup.spec
+++ b/setup.spec
@@ -1,77 +1,121 @@
+#
+# TODO:
+# - make some README.PLD with system features description
+#
+# Conditional build:
+%bcond_with	ssp	# disable stack-smashing protector (vide dietlibc.spec)
+#
+%define	iana_etc_ver	1.03
+#
 Summary:	Simple setup files
-Summary(de):	Einfache Setup-Dateien 
+Summary(de):	Einfache Setup-Dateien
+Summary(es):	Varios archivos básicos de configuración
 Summary(fr):	Fichiers de configuration simples
+Summary(ja):	¥µ¥ó¥×¥ë¥»¥Ã¥È¥¢¥Ã¥×¥Õ¥¡¥¤¥ë
 Summary(pl):	Podstawowe pliki systemu Linux
+Summary(pt_BR):	Vários arquivos básicos de configuração
 Summary(tr):	Basit kurulum dosyalarý
 Name:		setup
-Version:	2.3.1
-Release:	1
-License:	public domain
+Version:	2.4.6
+Release:	8.1
+License:	Public Domain, partially BSD-like
 Group:		Base
-Group(pl):	Bazowe
 Source0:	%{name}-%{version}.tar.bz2
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-Buildarch:	noarch
+# Source0-md5:	33afa2766c28f1fb8331bd9209bf6b04
+Source1:	http://www.sethwklein.net/projects/iana-etc/downloads/iana-etc-%{iana_etc_ver}.tar.bz2
+# Source1-md5:	670da9e41179d618498f5d614b7f4636
+Patch0:		%{name}-fstab.patch
+Patch1:		%{name}-special_users.patch
+BuildRequires:	dietlibc-static
+BuildRequires:	gawk
+Conflicts:	FHS < 2.3
 AutoReqProv:	no
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%define		_sbindir	/sbin
 
 %description
 This package contains a number of very important configuration and
 setup files, including the passwd, group, profile files, etc.
 
-%description -l pl
-Pakiet ten zawiera wiele bardzo wa¿nych plików konfiguracyjnych dla
-twojego systemu.
-
 %description -l de
 Dieses Paket enthält wichtige Konfigurations- und Setup-Dateien, u.a.
 passwd-, group-, profile-Dateien usw.
 
+%description -l es
+Este paquete contiene una variedad de archivos de configuración y
+setup muy importantes, incluyendo el passwd, group, archivos de
+"perfil", etc.
+
 %description -l fr
 Ce paquetage contient un nombre de fichiers de configuration très
 importants, comme passwd, group, les fichiers profile, etc.
 
+%description -l ja
+¤³¤Îsetup¥Ñ¥Ã¥±¡¼¥¸¤Ë¤Ï¡¢passwd, group, profile ¤Ê¤É¤Î¡¢
+½ÅÍפʥ·¥¹¥Æ¥àÀßÄê¥Õ¥¡¥¤¥ë¤¬´Þ¤Þ¤ì¤Æ¤Þ¤¹¡£
+
+%description -l pl
+Pakiet ten zawiera wiele bardzo wa¿nych plików konfiguracyjnych dla
+Twojego systemu.
+
+%description -l pt_BR
+Este pacote contém uma variedade de arquivos de configuração e setup
+muito importantes, incluindo o passwd, group, arquivos de "perfil",
+etc.
+
 %description -l tr
 Bu paket, passwd, group, profile gibi çok önemli ayar ve kurulum
 dosyalarýný içerir.
 
 %prep
-%setup -q
+%setup -q -a1
+%patch0 -p1
+%patch1 -p1
+
+%build
+%{__make} -C iana-etc-%{iana_etc_ver}
+
+%{__make} \
+	OPT_FLAGS="%{rpmcflags} %{?with_ssp:-fno-stack-protector}" \
+	CC="diet %{__cc}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
+
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/shrc.d
 
-cp -a * $RPM_BUILD_ROOT
+install iana-etc-%{iana_etc_ver}/protocols $RPM_BUILD_ROOT/etc/protocols
+install iana-etc-%{iana_etc_ver}/services $RPM_BUILD_ROOT/etc/services
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%triggerin -- %{name} < %{version}-%{release}
-[ "$1" = "1" ] && exit 0
-[ ! -e /etc/group.rpmnew ] && exit 0
-cat /etc/group.rpmnew | while read GROUPLINE ; do
-	GR="`echo $GROUPLINE | cut -f 1 -d ':'`"
-	if ! grep -q "^$GR" /etc/group ; then
-		echo "$GROUPLINE" >> /etc/group
-	fi
-done
+%triggerpostun -p %{_sbindir}/joinpasswd -- %{name} < %{version}-%{release}
 
 %files
 %defattr(644,root,root,755)
-
-%dir %{_sysconfdir}/profile.d
-%attr(755,root,root) %{_sysconfdir}/profile.d/*.sh
-%attr(755,root,root) %{_sysconfdir}/profile.d/*.csh
-%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/passwd
-%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/group
-%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/services
-%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/host.conf
-%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/hosts
-%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/motd
-%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/profile
-%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/protocols
-%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/filesystems
-%ghost %{_sysconfdir}/shells
-
+%doc ChangeLog
+%attr(755,root,root) %{_sbindir}/joinpasswd
+%attr(755,root,root) /etc/profile.d/*.sh
+%attr(755,root,root) /etc/profile.d/*.csh
+%dir /etc/profile.d
+%attr(644,root,root) %config(noreplace,missingok) %verify(not md5 size mtime) %{_sysconfdir}/env.d/*
+%dir %{_sysconfdir}/env.d
+%dir %{_sysconfdir}/shrc.d
+%attr(644,root,root) %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/fstab
+%attr(644,root,root) %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/group
+%attr(644,root,root) %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/host.conf
+%attr(644,root,root) %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/hosts
+%attr(644,root,root) %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/passwd
+%attr(644,root,root) %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/profile
+%attr(644,root,root) %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/protocols
 %attr(600,root,root) %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/secure*
+%attr(644,root,root) %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/services
+%attr(644,root,root) %config(noreplace,missingok) %verify(not md5 size mtime) %{_sysconfdir}/filesystems
+%attr(644,root,root) %config(noreplace,missingok) %verify(not md5 size mtime) %{_sysconfdir}/motd
+%attr(644,root,root) %config(noreplace,missingok) %verify(not md5 size mtime) %{_sysconfdir}/resolv.conf
+%ghost %{_sysconfdir}/shells