rpms/xorg-x11-apps/devel xorg-x11-apps.spec,1.10,1.11

[fedora-cvs-commits redhat com]

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-apps/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24989

Modified Files:
	xorg-x11-apps.spec 
Log Message:
spec cleanups


Index: xorg-x11-apps.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-apps/devel/xorg-x11-apps.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-apps.spec	24 Feb 2006 12:14:19 -0000	1.10
+++ xorg-x11-apps.spec	1 Mar 2006 06:18:26 -0000	1.11
@@ -62,7 +62,6 @@
       pushd $app
 
       case $app in
-#         oclock*|x11perf*|xclipboard*|xclock*|xconsole*|xload*|xlogo*|xmag*|xmessage*)
          x11perf*)
             aclocal ; automake ; autoconf
          ;;
@@ -88,28 +87,12 @@
    done
 }
 
-# FIXME: Move/rename manpages to correct location (still broke in RC2)
-%if 0
-{
-    WRONG_DIR=$RPM_BUILD_ROOT%{_mandir}/man1
-    MAN1X_DIR=$RPM_BUILD_ROOT%{_mandir}/man1x
-
-    [ ! -d $MAN1X_DIR ] && mkdir -p $MAN1X_DIR
-    mv ${WRONG_DIR}/* ${MAN1X_DIR}/
-    for each in ${MAN1X_DIR}/* ; do
-        mv $each ${each/.1/.1x}
-    done
-    rmdir $WRONG_DIR
-}
-%endif
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
 %doc
-%dir %{_bindir}
 %{_bindir}/luit
 %{_bindir}/oclock
 %{_bindir}/x11perf
@@ -130,7 +113,6 @@
 %{_bindir}/xpr
 %{_bindir}/xwd
 %{_bindir}/xwud
-%dir %{_datadir}
 %dir %{_datadir}/X11
 %dir %{_datadir}/X11/app-defaults
 %{_datadir}/X11/app-defaults/Clock-color
@@ -149,8 +131,7 @@
 %{_datadir}/X11/x11perfcomp/fillblnk
 %{_datadir}/X11/x11perfcomp/perfboth
 %{_datadir}/X11/x11perfcomp/perfratio
-%dir %{_mandir}
-%dir %{_mandir}/man1
+#%dir %{_mandir}/man1x
 %{_mandir}/man1/xcursorgen.1x*
 %{_mandir}/man1/Xmark.1x*
 %{_mandir}/man1/luit.1x*