SPECS: kde-common-dirs.spec - add apps/{khtml, khtml/css} - check for packag...

[glen]

Author: glen                         Date: Fri Aug 29 19:23:27 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- add apps/{khtml,khtml/css}
- check for packaged files from FHS.spec

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

---- Diffs:

================================================================
Index: SPECS/kde-common-dirs.spec
diff -u SPECS/kde-common-dirs.spec:1.6 SPECS/kde-common-dirs.spec:1.7
--- SPECS/kde-common-dirs.spec:1.6	Tue Feb 12 19:09:11 2008
+++ SPECS/kde-common-dirs.spec	Fri Aug 29 21:23:22 2008
@@ -1,9 +1,12 @@
 # $Revision$, $Date$
+# avoid rpm 4.4.9 adding rm -rf buildroot, we need the dirs to check consistency
+%define		__spec_clean_body	%{nil}
+%define		_enable_debug_packages	0
 Summary:	K Desktop Environment - common directories
 Summary(pl.UTF-8):	Wspólne katalogi KDE (K Desktop Environment)
 Name:		kde-common-dirs
 Version:	0.1
-Release:	1
+Release:	2
 License:	LGPL
 Group:		X11/Libraries
 URL:		http://www.kde.org/
@@ -39,7 +42,22 @@
 	$RPM_BUILD_ROOT%{_desktopdir}/kde
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+cd $RPM_BUILD_ROOT
+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
+
+	# find finds also '.', so use option -B for diff
+	if rpm -qpl %{_rpmdir}/$RPMFILE | grep -v '^/$' | LC_ALL=C sort | diff -uB $TMPFILE - ; then
+		rm -rf $RPM_BUILD_ROOT
+	else
+		echo -e "\nNot so good, some directories are not included in package\n"
+		exit 1
+	fi
+	rm -f $TMPFILE
+}
+check_filesystem_dirs
 
 %files
 %defattr(644,root,root,755)
@@ -48,6 +66,8 @@
 %dir %{_datadir}/applnk/.hidden
 %dir %{_datadir}/apps
 %dir %{_datadir}/apps/kde
+%dir %{_datadir}/apps/khtml
+%dir %{_datadir}/apps/khtml/css
 %dir %{_datadir}/apps/kconf_update
 %dir %{_datadir}/apps/kstyle
 %dir %{_datadir}/apps/kstyle/themes
@@ -70,6 +90,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2008/08/29 19:23:22  glen
+- add apps/{khtml,khtml/css}
+- check for packaged files from FHS.spec
+
 Revision 1.6  2008/02/12 18:09:11  qboosh
 - pl
 - /usr/share/config bugfix
================================================================

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