packages: filesystem/filesystem.spec - /var/log is in FHS - dropped _xmandi...

[qboosh]

Author: qboosh                       Date: Sat May  8 09:29:25 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- /var/log is in FHS
- dropped _xmandir macro - this directory won't change anymore

---- Files affected:
packages/filesystem:
   filesystem.spec (1.112 -> 1.113) 

---- Diffs:

================================================================
Index: packages/filesystem/filesystem.spec
diff -u packages/filesystem/filesystem.spec:1.112 packages/filesystem/filesystem.spec:1.113
--- packages/filesystem/filesystem.spec:1.112	Tue Apr 20 15:46:12 2010
+++ packages/filesystem/filesystem.spec	Sat May  8 11:29:20 2010
@@ -40,10 +40,6 @@
 # directory for *.idl files (for CORBA implementations)
 %define		_idldir		/usr/share/idl
 
-%if "%{pld_release}" == "ac"
-%define		_xmandir	/usr/X11R6/man
-%endif
-
 %description
 This package contains common directories for packages that extend some
 programs functionality, but don't require them themselves.
@@ -85,9 +81,9 @@
 # X11
 install -d $RPM_BUILD_ROOT/usr/X11R6/share
 for manp in man{1,2,3,4,5,6,7,8} ; do
-	install -d $RPM_BUILD_ROOT%{_xmandir}/$manp
+	install -d $RPM_BUILD_ROOT/usr/X11R6/man/$manp
 	for mloc in it ko pl; do
-		install -d $RPM_BUILD_ROOT%{_xmandir}/$mloc/$manp
+		install -d $RPM_BUILD_ROOT/usr/X11R6/man/$mloc/$manp
 	done
 done
 install -d $RPM_BUILD_ROOT/usr/share/wm-properties
@@ -119,7 +115,7 @@
 	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' | 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 | 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|var/log)$' > $TMPFILE
 
 	# find finds also '.', so use option -B for diff
 	rpm -qpl $RPMFILE $RPMFILE2 | grep -v '^/$' | LC_ALL=C sort | diff -uB - $TMPFILE || :
@@ -200,11 +196,11 @@
 
 %if "%{pld_release}" == "ac"
 %dir /usr/X11R6
-%dir %{_xmandir}
-%{_xmandir}/man*
-%lang(it) %{_xmandir}/it
-%lang(ko) %{_xmandir}/ko
-%lang(pl) %{_xmandir}/pl
+%dir /usr/X11R6/man
+/usr/X11R6/man/man*
+%lang(it) /usr/X11R6/man/it
+%lang(ko) /usr/X11R6/man/ko
+%lang(pl) /usr/X11R6/man/pl
 %dir /usr/X11R6/share
 
 %dir /usr/share/wm-properties
@@ -222,6 +218,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.113  2010/05/08 09:29:20  qboosh
+- /var/log is in FHS
+- dropped _xmandir macro - this directory won't change anymore
+
 Revision 1.112  2010/04/20 13:46:12  glen
 - if we want logrotate optional then /var/log/archive should be placed here or packages like mysql pull logrotate anyway
 - rel 34
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/filesystem/filesystem.spec?r1=1.112&r2=1.113&f=u