- revert ghost /initrd on HEAD too; rel 17

[packages/filesystem.git] / filesystem.spec

diff --git a/filesystem.spec b/filesystem.spec
index 5df8979a422b92a33aa407c86c123d6f7505f7fb..9256698f28c6e7ed0f2655498a6b5d78d7f73cf2 100644 (file)
--- a/filesystem.spec
+++ b/filesystem.spec
@@ -16,7 +16,7 @@ Summary:      Common directories
 Summary(pl.UTF-8):     Wspólne katalogi
 Name:          filesystem
 Version:       3.0
-Release:       16
+Release:       17
 License:       GPL
 Group:         Base
 BuildRequires: automake
@@ -118,16 +118,14 @@ tar -xf checkfiles.tar -C $RPM_BUILD_ROOT
 cd $RPM_BUILD_ROOT
 
 check_filesystem_dirs() {
-       # %{_rpmfilename} is not expanded, so use
-       # %{name}-%{version}-%{release}.%{buildarch}.rpm
        RPMFILE=%{_rpmdir}/%{name}-%{version}-%{release}.%{_target_cpu}.rpm
        RPMFILE2=%{?with_debuginfo:%{_rpmdir}/%{name}-debuginfo-%{version}-%{release}.%{_target_cpu}.rpm}
        TMPFILE=$(mktemp)
        # note: we must exclude from check all existing dirs belonging to FHS
-       find . | sed -e 's|^\.||g' -e 's|^$||g' | sort | grep -v $TMPFILE | grep -E -v '^/(etc|etc/X11|home|lib|lib64|usr|usr/include|usr/lib|usr/lib64|usr/share|usr/share/man|usr/share/man/pl|usr/src|var|var/lock)$' > $TMPFILE
+       find | sed -e 's|^\.||g' -e 's|^$||g' | LC_ALL=C sort | grep -v $TMPFILE | grep -E -v '^/(etc|etc/X11|home|lib|lib64|usr|usr/include|usr/lib|usr/lib64|usr/share|usr/share/man|usr/share/man/pl|usr/src|var|var/lock)$' > $TMPFILE
 
        # find finds also '.', so use option -B for diff
-       rpm -qpl $RPMFILE $RPMFILE2 | grep -v '^/$' | sort | diff -uB $TMPFILE - || :
+       rpm -qpl $RPMFILE $RPMFILE2 | grep -v '^/$' | LC_ALL=C sort | diff -uB $TMPFILE - || :
 
        rm -f $TMPFILE
 }
@@ -146,7 +144,7 @@ check_filesystem_dirs
 %dir /etc/xdg/autostart
 %dir /home/users
 %attr(751,root,adm) %dir /home/services
-%ghost %dir /initrd
+%dir /initrd
 %dir /lib/firmware
 %dir /lib/security
 %dir /selinux