SPECS: FHS.spec, filesystem.spec - %{_rpmfilename} consist of tags...

[glen]

Author: glen                         Date: Sat Feb  9 10:33:33 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- %{_rpmfilename} consist of tags, not macros, it will never work

---- Files affected:
SPECS:
   FHS.spec (1.130 -> 1.131) , filesystem.spec (1.85 -> 1.86) 

---- Diffs:

================================================================
Index: SPECS/FHS.spec
diff -u SPECS/FHS.spec:1.130 SPECS/FHS.spec:1.131
--- SPECS/FHS.spec:1.130	Fri Feb  8 22:18:47 2008
+++ SPECS/FHS.spec	Sat Feb  9 11:33:27 2008
@@ -87,11 +87,9 @@
 cd $RPM_BUILD_ROOT
 
 check_filesystem_dirs() {
-	# %{_rpmfilename} is not expanded, so use
-	# %{name}-%{version}-%{release}.%{buildarch}.rpm
 	RPMFILE=%{name}-%{version}-%{release}.%{_target_cpu}.rpm
 	TMPFILE=$(mktemp)
-	find . | sed -e 's|^\.||g' -e 's|^$||g' | LC_ALL=C sort > $TMPFILE
+	find | sed -e 's|^\.||g' -e 's|^$||g' | LC_ALL=C sort > $TMPFILE
 
 	# find finds also '.', so use option -B for diff
 	if rpm -qpl %{_rpmdir}/$RPMFILE | grep -v '^/$' | LC_ALL=C sort | diff -uB $TMPFILE - ; then
@@ -217,6 +215,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.131  2008-02-09 10:33:27  glen
+- %{_rpmfilename} consist of tags, not macros, it will never work
+
 Revision 1.130  2008-02-08 21:18:47  glen
 - rpm 4.4.9+ compatible %clean
 

================================================================
Index: SPECS/filesystem.spec
diff -u SPECS/filesystem.spec:1.85 SPECS/filesystem.spec:1.86
--- SPECS/filesystem.spec:1.85	Fri Feb  8 22:20:22 2008
+++ SPECS/filesystem.spec	Sat Feb  9 11:33:27 2008
@@ -119,16 +119,14 @@
 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
 }
@@ -199,6 +197,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.86  2008-02-09 10:33:27  glen
+- %{_rpmfilename} consist of tags, not macros, it will never work
+
 Revision 1.85  2008-02-08 21:20:22  glen
 - BR: mktemp
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/FHS.spec?r1=1.130&r2=1.131&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/filesystem.spec?r1=1.85&r2=1.86&f=u