- s/mnt/media/ in fstab

[packages/setup.git] / setup.spec

diff --git a/setup.spec b/setup.spec
index e1dd30e3634a92e0564fb2a55fdd7f198b6bb1b8..f5f5e5512156c8e30e67eef1f7248b5a99c9f365 100644 (file)
--- a/setup.spec
+++ b/setup.spec
@@ -1,6 +1,7 @@
 # TODO:
 # - make some README.PLD with system features description
-# - use joinpasswd in post
+%bcond_with    pp      # disable stack protector (vide dietlibc.spec)
+
 Summary:       Simple setup files
 Summary(de):   Einfache Setup-Dateien
 Summary(es):   Varios archivos básicos de configuración
@@ -9,17 +10,16 @@ Summary(ja): 
 Summary(pl):   Podstawowe pliki systemu Linux
 Summary(pt_BR):        Vários arquivos básicos de configuração
 Summary(tr):   Basit kurulum dosyalarý
-Patch0:                setup-services-callbook2sieve.patch
-Patch1:                setup-services-IRRd.patch
 Name:          setup
-Version:       2.4.4
-Release:       1.4
+Version:       2.4.5
+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: 74484812aa2e01e5b2fa5c4e8276969a
-BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+# Source0-md5: 620d450c5bbc6097fafd3bbfc798ece7
+BuildRequires: dietlibc-static
 AutoReqProv:   no
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _sbindir        /sbin
 
@@ -59,13 +59,11 @@ dosyalar
 
 %prep
 %setup -q 
-%patch0 -p1
-%patch1 -p1
 
 %build
 %{__make} \
-       OPT_FLAGS="%{rpmcflags}" \
-       CC=%{__cc}
+       OPT_FLAGS="%{rpmcflags} %{?with_pp:-fno-stack-protector}" \
+       CC="diet %{__cc}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -75,8 +73,7 @@ rm -rf $RPM_BUILD_ROOT
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%triggerpostun -- %{name} < %{version}-%{release}
-%{_sbindir}/joinpasswd
+%triggerpostun -p %{_sbindir}/joinpasswd -- %{name} < %{version}-%{release}
 
 %files
 %defattr(644,root,root,755)