X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=setup.spec;h=b302b1ae0e4478466a9b5512f919e5e71db48778;hb=7cb026a667d3503da37fa037fe00a2450287391a;hp=432224b05e030ce74b2e83a5df3aa8817deb43e4;hpb=710b97ce28d44682a6765a620edfc0c5a9b4073b;p=packages%2Fsetup.git

diff --git a/setup.spec b/setup.spec
index 432224b..b302b1a 100644
--- a/setup.spec
+++ b/setup.spec
@@ -1,7 +1,10 @@
+#
 # TODO:
 # - make some README.PLD with system features description
-%bcond_with	pp	# disable stack protector (vide dietlibc.spec)
-
+#
+# 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
@@ -12,12 +15,13 @@ Summary(pt_BR):	V
 Summary(tr):	Basit kurulum dosyalarý
 Name:		setup
 Version:	2.4.6
-Release:	2
+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:	33afa2766c28f1fb8331bd9209bf6b04
-Patch0:		setup-fstab.patch
+Patch0:		%{name}-fstab.patch
+Patch1:		%{name}-special_users.patch
 BuildRequires:	dietlibc-static
 Conflicts:	FHS < 2.3
 AutoReqProv:	no
@@ -62,10 +66,11 @@ dosyalar
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__make} \
-	OPT_FLAGS="%{rpmcflags} %{?with_pp:-fno-stack-protector}" \
+	OPT_FLAGS="%{rpmcflags} %{?with_ssp:-fno-stack-protector}" \
 	CC="diet %{__cc}"
 
 %install