SPECS: kde-common-dirs.spec - exclude paths from FHS/filesystem - add apps/...

[glen]

Author: glen                         Date: Fri Aug 29 19:29:15 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- exclude paths from FHS/filesystem
- add apps/kjava

---- Files affected:
SPECS:
   kde-common-dirs.spec (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: SPECS/kde-common-dirs.spec
diff -u SPECS/kde-common-dirs.spec:1.7 SPECS/kde-common-dirs.spec:1.8
--- SPECS/kde-common-dirs.spec:1.7	Fri Aug 29 21:23:22 2008
+++ SPECS/kde-common-dirs.spec	Fri Aug 29 21:29:09 2008
@@ -46,7 +46,8 @@
 check_filesystem_dirs() {
 	RPMFILE=%{name}-%{version}-%{release}.%{_target_cpu}.rpm
 	TMPFILE=$(mktemp)
-	find | sed -e 's|^\.||g' -e 's|^$||g' | LC_ALL=C sort > $TMPFILE
+	# NOTE: we must exclude from check all existing dirs belonging to FHS
+	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/doc|usr/share/applications|usr/share/man|usr/share/man/pl|usr/src|var|var/lock)$' > $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
@@ -66,6 +67,7 @@
 %dir %{_datadir}/applnk/.hidden
 %dir %{_datadir}/apps
 %dir %{_datadir}/apps/kde
+%dir %{_datadir}/apps/kjava
 %dir %{_datadir}/apps/khtml
 %dir %{_datadir}/apps/khtml/css
 %dir %{_datadir}/apps/kconf_update
@@ -90,6 +92,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2008/08/29 19:29:09  glen
+- exclude paths from FHS/filesystem
+- add apps/kjava
+
 Revision 1.7  2008/08/29 19:23:22  glen
 - add apps/{khtml,khtml/css}
 - check for packaged files from FHS.spec
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kde-common-dirs.spec?r1=1.7&r2=1.8&f=u