- added -special_users.patch, rel. 3

[packages/setup.git] / setup.spec

diff --git a/setup.spec b/setup.spec
index 5fc20b4f92edda199529e9933c83cac606886322..b302b1ae0e4478466a9b5512f919e5e71db48778 100644 (file)
--- a/setup.spec
+++ b/setup.spec
@@ -1,5 +1,10 @@
+#
 # TODO:
 # - make some README.PLD with system features description
+#
+# Conditional build:
+%bcond_with    ssp     # disable stack-smashing protector (vide dietlibc.spec)
+#
 Summary:       Simple setup files
 Summary(de):   Einfache Setup-Dateien
 Summary(es):   Varios archivos básicos de configuración
@@ -9,13 +14,16 @@ 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.4.5
-Release:       2
+Version:       2.4.6
+Release:       3
 License:       Public Domain, partially BSD-like
 Group:         Base
 Source0:       http://piorun.ds.pg.gda.pl/~blues/SOURCES/%{name}-%{version}.tar.bz2
-# Source0-md5: 620d450c5bbc6097fafd3bbfc798ece7
+# Source0-md5: 33afa2766c28f1fb8331bd9209bf6b04
+Patch0:                %{name}-fstab.patch
+Patch1:                %{name}-special_users.patch
 BuildRequires: dietlibc-static
+Conflicts:     FHS < 2.3
 AutoReqProv:   no
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -56,17 +64,20 @@ Bu paket, passwd, group, profile gibi 
 dosyalarýný içerir.
 
 %prep
-%setup -q 
+%setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
 %{__make} \
-       OPT_FLAGS="%{rpmcflags}" \
+       OPT_FLAGS="%{rpmcflags} %{?with_ssp:-fno-stack-protector}" \
        CC="diet %{__cc}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT/etc/shrc.d
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -80,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT
 %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) /etc/env.d/*
+%dir /etc/env.d
+%dir /etc/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