SPECS: filesystem.spec - add helper file for filesystem-debuginfo ...

[glen]

Author: glen                         Date: Thu Jan 31 16:58:42 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- add helper file for filesystem-debuginfo packaged dirs

---- Files affected:
SPECS:
   filesystem.spec (1.82 -> 1.83) 

---- Diffs:

================================================================
Index: SPECS/filesystem.spec
diff -u SPECS/filesystem.spec:1.82 SPECS/filesystem.spec:1.83
--- SPECS/filesystem.spec:1.82	Thu Jan 31 17:44:16 2008
+++ SPECS/filesystem.spec	Thu Jan 31 17:58:36 2008
@@ -83,17 +83,28 @@
 	$RPM_BUILD_ROOT%{_fontsdir}/{{100,75}dpi,OTF,Speedo,Type1/{afm,pfm},TTF,cyrillic,local,misc} \
 	$RPM_BUILD_ROOT{%{_idldir},%{_privsepdir}}
 
+%if "%{_lib}" == "lib64"
+install -d \
+	$RPM_BUILD_ROOT/lib64/security \
+	$RPM_BUILD_ROOT/usr/lib64/pkgconfig \
+	$RPM_BUILD_ROOT/usr/lib64/browser-plugins
+%endif
+
 %if %{with debuginfo}
 install -d \
+	$RPM_BUILD_ROOT/usr/lib/debug/%{_lib} \
 	$RPM_BUILD_ROOT/usr/lib/debug%{_libdir} \
+	$RPM_BUILD_ROOT/usr/lib/debug/lib/security \
 	$RPM_BUILD_ROOT/usr/src/debug
-%endif
 
 %if "%{_lib}" == "lib64"
 install -d \
-	$RPM_BUILD_ROOT/lib64/security \
-	$RPM_BUILD_ROOT/usr/lib64/pkgconfig \
-	$RPM_BUILD_ROOT/usr/lib64/browser-plugins
+	$RPM_BUILD_ROOT/usr/lib/debug/lib64/security
+%endif
+
+find $RPM_BUILD_ROOT/usr/lib/debug -type d | while read line; do
+	echo "%exclude %dir ${line#$RPM_BUILD_ROOT}"
+done > $RPM_BUILD_ROOT/usr/src/debug/%{name}-debuginfo.files
 %endif
 
 # create this for %clean
@@ -104,18 +115,22 @@
 tar -xf checkfiles.tar -C $RPM_BUILD_ROOT
 cd $RPM_BUILD_ROOT
 
-# %{_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
+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 finds also '.', so use option -B for diff
+	rpm -qpl $RPMFILE $RPMFILE2 | grep -v '^/$' | sort | diff -uB $TMPFILE - || :
 
-# find finds also '.', so use option -B for diff
-rpm -qpl $RPMFILE $RPMFILE2 | grep -v '^/$' | sort | diff -uB $TMPFILE - || :
+	rm -f $TMPFILE
+}
 
-rm -f $TMPFILE
+check_filesystem_dirs
 
 %files
 %defattr(644,root,root,755)
@@ -170,7 +185,9 @@
 %defattr(644,root,root,755)
 %dir /usr/lib/debug
 /usr/lib/debug/*
+
 %dir /usr/src/debug
+/usr/src/debug/filesystem-debuginfo.files
 %endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -179,6 +196,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.83  2008-01-31 16:58:36  glen
+- add helper file for filesystem-debuginfo packaged dirs
+
 Revision 1.82  2008-01-31 16:44:16  glen
 - backup install root for %clean
 - allow _enable_debug_packages 0 to disable debug package
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/filesystem.spec?r1=1.82&r2=1.83&f=u