This commit was manufactured by cvs2git to create tag 'AC-STABLE'.

Sprout from master 2006-04-30 11:25:12 UTC Elan Ruusamäe <glen@pld-linux.org> '- read /etc/profile.env if available'
Cherrypick from unlabeled-1.125.2 2006-09-06 16:27:55 UTC Elan Ruusamäe <glen@pld-linux.org> '- rel 5: without Conflicts on glibc to be able to upgrade on builders':
    setup.spec -> 1.125.2.1

diff --git a/setup.spec b/setup.spec
index 9c7b5506827d04f756c535c2aa7d4b56ac50a02a..b431fe36750d598c47a50a3561229d2999aa75f6 100644 (file)
--- a/setup.spec
+++ b/setup.spec
@@ -6,6 +6,7 @@
 %bcond_with    ssp     # enable stack-smashing protector (vide dietlibc.spec)
 #
 %define        iana_etc_ver    1.04
+%undefine      with_ccache
 #
 Summary:       Simple setup files
 Summary(de):   Einfache Setup-Dateien
@@ -17,7 +18,7 @@ Summary(pt_BR):       V
 Summary(tr):   Basit kurulum dosyalarý
 Name:          setup
 Version:       2.4.10
-Release:       2
+Release:       5
 License:       Public Domain, partially BSD-like
 Group:         Base
 Source0:       ftp://distfiles.pld-linux.org/src/%{name}-%{version}.tar.bz2
@@ -25,9 +26,11 @@ Source0:     ftp://distfiles.pld-linux.org/src/%{name}-%{version}.tar.bz2
 Source1:       http://www.sethwklein.net/projects/iana-etc/downloads/iana-etc-%{iana_etc_ver}.tar.bz2
 # Source1-md5: 9f769f7b2d0e519cf62dacb2b3b051d4
 Source2:       %{name}-update-fstab.c
+Source3:       postshell.c
 # This is source of non-iana changes in services file
 #Patch0:               %{name}-services.patch
 Patch0:                %{name}-securetty.patch
+Patch1:                %{name}-profile.env.patch
 BuildRequires: dietlibc-static
 BuildRequires: gawk
 Conflicts:     FHS < 2.3
@@ -73,16 +76,20 @@ dosyalar
 %prep
 %setup -q -a1
 %patch0 -p1
+%patch1 -p1
 install %{SOURCE2} update-fstab.c
+install %{SOURCE3} postshell.c
 
 %build
 %{__make} -C iana-etc-%{iana_etc_ver}
 
 %{__make} \
        OPT_FLAGS="%{rpmcflags} %{?with_ssp:-fno-stack-protector}" \
+       LDFLAGS="%{rpmldflags}" \
        CC="diet %{__cc}"
-%{__make} update-fstab \
-       OPT_FLAGS="%{rpmcflags}" \
+%{__make} postshell update-fstab \
+       OPT_FLAGS="%{rpmcflags} -Os" \
+       LDFLAGS="%{rpmldflags}" \
        CC="diet %{__cc}"
 
 %install
@@ -92,11 +99,12 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/shrc.d
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+install postshell $RPM_BUILD_ROOT%{_sbindir}
 install update-fstab $RPM_BUILD_ROOT%{_sbindir}
 
-install iana-etc-%{iana_etc_ver}/protocols $RPM_BUILD_ROOT/etc/protocols
+install iana-etc-%{iana_etc_ver}/protocols $RPM_BUILD_ROOT%{_sysconfdir}/protocols
 # don't overwrite files from setup tar-ball, fix it in original tar!
-#install iana-etc-%{iana_etc_ver}/services $RPM_BUILD_ROOT/etc/services
+#install iana-etc-%{iana_etc_ver}/services $RPM_BUILD_ROOT%{_sysconfdir}/services
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -105,27 +113,34 @@ rm -rf $RPM_BUILD_ROOT
 
 %triggerin -p %{_sbindir}/update-fstab -- %{name} < 2.4.10-1
 
+%post -p /sbin/postshell
+-/sbin/env-update -u
+
+%postun -p /sbin/postshell
+-/sbin/env-update -u
+
 %files
 %defattr(644,root,root,755)
 %doc ChangeLog
 %attr(755,root,root) %{_sbindir}/joinpasswd
+%attr(755,root,root) %{_sbindir}/postshell
 %attr(755,root,root) %{_sbindir}/update-fstab
 %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 mtime size) %{_sysconfdir}/env.d/*
+%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/env.d/*
 %dir %{_sysconfdir}/env.d
 %dir %{_sysconfdir}/shrc.d
-%attr(644,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fstab
-%attr(644,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/group
-%attr(644,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/host.conf
-%attr(644,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/hosts
-%attr(644,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/passwd
-%attr(644,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/profile
-%attr(644,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/protocols
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fstab
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/group
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/host.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/hosts
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/passwd
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/profile
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/protocols
 %attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/secure*
-%attr(644,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/services
-%attr(644,root,root) %config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/filesystems
-%attr(644,root,root) %config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/motd
-%attr(644,root,root) %config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/resolv.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/services
+%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/filesystems
+%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/motd
+%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/resolv.conf
 %ghost %{_sysconfdir}/shells