- added fhs.patch (FHS 2.0 compatible)

- removed -s install flags (install breaks if strip fail)
- stripped executable and libraries
- fixed typo

Changed files:
    XFree86.spec -> 1.24

diff --git a/XFree86.spec b/XFree86.spec
index e6421ce8dc8d09cadc7e02b3cbc03fbd5b5d1a8c..1a660d729af707ea61d77f126dbb29e45f3af2ae 100644 (file)
--- a/XFree86.spec
+++ b/XFree86.spec
@@ -67,6 +67,8 @@ Patch34:      XFree86-dainbramage.patch
 Patch35:       XFree86-ncurses.patch
 # Compile X serwers againsty system installed libz.so
 Patch36:       XFree86-HasZlib.patch
+# Man dir in /usr/X11R6/share/man or /usr/share/man
+Patch37:       XFree86-fhs.patch
 
 BuildPrereq:   ncurses-devel
 BuildPrereq:   zlib-devel
@@ -1008,6 +1010,7 @@ Summary(pl): XAuth
 %patch34 -p1 -b .dainbramage
 %patch35 -p1 -b .ncurses
 %patch36 -p1 -b .HasZlib
+%patch37 -p1 -b .fhs
 
 ## Clean up to save a *lot* of disk space
 find . -name "*.orig" -print | xargs rm -f
@@ -1025,10 +1028,13 @@ install -d $RPM_BUILD_ROOT/usr/X11R6/{bin,lib/X11,man/man{1,3,5}} \
        $RPM_BUILD_ROOT/etc/{pam.d,rc.d/init.d,}
 
 make -C xc  "DESTDIR=$RPM_BUILD_ROOT" \
-           "INSTBINFLAGS=-m 755 -s" \
-           "INSTPGMFLAGS=-m 755 -s" \
+           "INSTBINFLAGS=-m 755" \
+           "INSTPGMFLAGS=-m 755" \
             install install.man
 
+strip $RPM_BUILD_ROOT/usr/X11R6/bin/* || :
+strip --strip-unneeded $RPM_BUILD_ROOT/usr/X11R6/lib/{lib*.so.*.*,modules/*} || :
+
 # setup the default X server
 rm -f $RPM_BUILD_ROOT/usr/X11R6/bin/X
 ln -s Xwrapper $RPM_BUILD_ROOT/usr/X11R6/bin/X
@@ -1057,9 +1063,9 @@ for i in xdm twm fs xsm xinit; do
 done
 
 # make TrueType font dir, touch default .dir and .scale files
-install        -d $RPM_BUILD_ROOT/usr/X11R6/lib/X11/fonts/TrueType
-echo 0 >  $RPM_BUILD_ROOT/usr/X11R6/lib/X11/fonts/TrueType/fonts.dir
-echo 0 >  $RPM_BUILD_ROOT/usr/X11R6/lib/X11/fonts/TrueType/fonts.scale
+install        -d $RPM_BUILD_ROOT/usr/share/fonts/TrueType
+echo 0 >  $RPM_BUILD_ROOT/usr/share/fonts/TrueType/fonts.dir
+echo 0 >  $RPM_BUILD_ROOT/usr/share/fonts/TrueType/fonts.scale
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/xdm
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/xdm
@@ -1078,12 +1084,12 @@ done
 # /usr is NFS / read-only mountable
 mkdir -p $RPM_BUILD_ROOT/var/state/xkb
 cp -a $RPM_BUILD_ROOT/usr/X11R6/lib/X11/xkb/compiled/* \
-       $RPM_BUILD_ROOT/var/sytate/xkb
+       $RPM_BUILD_ROOT/var/state/xkb
 rm -rf $RPM_BUILD_ROOT/usr/X11R6/lib/X11/xkb/compiled
 ln -sf ../../../../../var/state/xkb \
        $RPM_BUILD_ROOT/usr/X11R6/lib/X11/xkb/compiled
 
-gzip -9nf $RPM_BUILD_ROOT/usr/X11R6/man/man[135]/*
+gzip -9nf $RPM_BUILD_ROOT/usr/X11R6/share/man/man[135]/*
 
 %post libs
 grep "^/usr/X11R6/lib$" /etc/ld.so.conf >/dev/null 2>&1
@@ -1248,80 +1254,80 @@ rm -rf $RPM_BUILD_ROOT
 
 /usr/X11R6/include/X11/bitmaps
 
-/usr/X11R6/man/man1/lbxproxy.1*
-/usr/X11R6/man/man1/proxymngr.1*
-/usr/X11R6/man/man1/xfindproxy.1*
-/usr/X11R6/man/man1/xfwp.1*
-/usr/X11R6/man/man1/xrx.1*
-/usr/X11R6/man/man1/lndir.1*
-/usr/X11R6/man/man1/makestrs.1*
-/usr/X11R6/man/man1/makeg.1*
-/usr/X11R6/man/man1/mkdirhier.1*
-/usr/X11R6/man/man1/appres.1*
-/usr/X11R6/man/man1/bdftopcf.1*
-/usr/X11R6/man/man1/beforelight.1*
-/usr/X11R6/man/man1/bitmap.1*
-/usr/X11R6/man/man1/bmtoa.1*
-/usr/X11R6/man/man1/atobm.1*
-/usr/X11R6/man/man1/editres.1*
-/usr/X11R6/man/man1/fsinfo.1*
-/usr/X11R6/man/man1/fslsfonts.1*
-/usr/X11R6/man/man1/fstobdf.1*
-/usr/X11R6/man/man1/iceauth.1*
-/usr/X11R6/man/man1/mkfontdir.1*
-/usr/X11R6/man/man1/showrgb.1*
-/usr/X11R6/man/man1/rstart.1*
-/usr/X11R6/man/man1/rstartd.1*
-/usr/X11R6/man/man1/smproxy.1*
-/usr/X11R6/man/man1/twm.1*
-/usr/X11R6/man/man1/x11perf.1*
-/usr/X11R6/man/man1/x11perfcomp.1*
-/usr/X11R6/man/man1/xclipboard.1*
-/usr/X11R6/man/man1/xcutsel.1*
-/usr/X11R6/man/man1/xclock.1*
-/usr/X11R6/man/man1/xcmsdb.1*
-/usr/X11R6/man/man1/xconsole.1*
-/usr/X11R6/man/man1/sessreg.1*
-/usr/X11R6/man/man1/xdpyinfo.1*
-/usr/X11R6/man/man1/dga.1*
-/usr/X11R6/man/man1/xfd.1*
-/usr/X11R6/man/man1/xhost.1*
-/usr/X11R6/man/man1/xieperf.1*
-/usr/X11R6/man/man1/xinit.1*
-/usr/X11R6/man/man1/startx.1*
-/usr/X11R6/man/man1/setxkbmap.1*
-/usr/X11R6/man/man1/xkbcomp.1*
-/usr/X11R6/man/man1/xkbevd.1*
-/usr/X11R6/man/man1/xkbprint.1*
-/usr/X11R6/man/man1/xkill.1*
-/usr/X11R6/man/man1/xlogo.1*
-/usr/X11R6/man/man1/xlsatoms.1*
-/usr/X11R6/man/man1/xlsclients.1*
-/usr/X11R6/man/man1/xlsfonts.1*
-/usr/X11R6/man/man1/xmag.1*
-/usr/X11R6/man/man1/xmh.1*
-/usr/X11R6/man/man1/xmodmap.1*
-/usr/X11R6/man/man1/xprop.1*
-/usr/X11R6/man/man1/xrdb.1*
-/usr/X11R6/man/man1/xrefresh.1*
-/usr/X11R6/man/man1/xset.1*
-/usr/X11R6/man/man1/xsetmode.1*
-/usr/X11R6/man/man1/xsetpointer.1*
-/usr/X11R6/man/man1/xsetroot.1*
-/usr/X11R6/man/man1/xsm.1*
-/usr/X11R6/man/man1/xstdcmap.1*
-/usr/X11R6/man/man1/xterm.1*
-/usr/X11R6/man/man1/resize.1*
-/usr/X11R6/man/man1/xvidtune.1*
-/usr/X11R6/man/man1/xwd.1*
-/usr/X11R6/man/man1/xwininfo.1*
-/usr/X11R6/man/man1/xwud.1*
-/usr/X11R6/man/man1/Xserver.1*
-/usr/X11R6/man/man1/XFree86.1*
-/usr/X11R6/man/man1/reconfig.1*
-/usr/X11R6/man/man1/xf86config.1*
-/usr/X11R6/man/man1/SuperProbe.1*
-/usr/X11R6/man/man1/xon.1*
+/usr/X11R6/share/man/man1/lbxproxy.1*
+/usr/X11R6/share/man/man1/proxymngr.1*
+/usr/X11R6/share/man/man1/xfindproxy.1*
+/usr/X11R6/share/man/man1/xfwp.1*
+/usr/X11R6/share/man/man1/xrx.1*
+/usr/X11R6/share/man/man1/lndir.1*
+/usr/X11R6/share/man/man1/makestrs.1*
+/usr/X11R6/share/man/man1/makeg.1*
+/usr/X11R6/share/man/man1/mkdirhier.1*
+/usr/X11R6/share/man/man1/appres.1*
+/usr/X11R6/share/man/man1/bdftopcf.1*
+/usr/X11R6/share/man/man1/beforelight.1*
+/usr/X11R6/share/man/man1/bitmap.1*
+/usr/X11R6/share/man/man1/bmtoa.1*
+/usr/X11R6/share/man/man1/atobm.1*
+/usr/X11R6/share/man/man1/editres.1*
+/usr/X11R6/share/man/man1/fsinfo.1*
+/usr/X11R6/share/man/man1/fslsfonts.1*
+/usr/X11R6/share/man/man1/fstobdf.1*
+/usr/X11R6/share/man/man1/iceauth.1*
+/usr/X11R6/share/man/man1/mkfontdir.1*
+/usr/X11R6/share/man/man1/showrgb.1*
+/usr/X11R6/share/man/man1/rstart.1*
+/usr/X11R6/share/man/man1/rstartd.1*
+/usr/X11R6/share/man/man1/smproxy.1*
+/usr/X11R6/share/man/man1/twm.1*
+/usr/X11R6/share/man/man1/x11perf.1*
+/usr/X11R6/share/man/man1/x11perfcomp.1*
+/usr/X11R6/share/man/man1/xclipboard.1*
+/usr/X11R6/share/man/man1/xcutsel.1*
+/usr/X11R6/share/man/man1/xclock.1*
+/usr/X11R6/share/man/man1/xcmsdb.1*
+/usr/X11R6/share/man/man1/xconsole.1*
+/usr/X11R6/share/man/man1/sessreg.1*
+/usr/X11R6/share/man/man1/xdpyinfo.1*
+/usr/X11R6/share/man/man1/dga.1*
+/usr/X11R6/share/man/man1/xfd.1*
+/usr/X11R6/share/man/man1/xhost.1*
+/usr/X11R6/share/man/man1/xieperf.1*
+/usr/X11R6/share/man/man1/xinit.1*
+/usr/X11R6/share/man/man1/startx.1*
+/usr/X11R6/share/man/man1/setxkbmap.1*
+/usr/X11R6/share/man/man1/xkbcomp.1*
+/usr/X11R6/share/man/man1/xkbevd.1*
+/usr/X11R6/share/man/man1/xkbprint.1*
+/usr/X11R6/share/man/man1/xkill.1*
+/usr/X11R6/share/man/man1/xlogo.1*
+/usr/X11R6/share/man/man1/xlsatoms.1*
+/usr/X11R6/share/man/man1/xlsclients.1*
+/usr/X11R6/share/man/man1/xlsfonts.1*
+/usr/X11R6/share/man/man1/xmag.1*
+/usr/X11R6/share/man/man1/xmh.1*
+/usr/X11R6/share/man/man1/xmodmap.1*
+/usr/X11R6/share/man/man1/xprop.1*
+/usr/X11R6/share/man/man1/xrdb.1*
+/usr/X11R6/share/man/man1/xrefresh.1*
+/usr/X11R6/share/man/man1/xset.1*
+/usr/X11R6/share/man/man1/xsetmode.1*
+/usr/X11R6/share/man/man1/xsetpointer.1*
+/usr/X11R6/share/man/man1/xsetroot.1*
+/usr/X11R6/share/man/man1/xsm.1*
+/usr/X11R6/share/man/man1/xstdcmap.1*
+/usr/X11R6/share/man/man1/xterm.1*
+/usr/X11R6/share/man/man1/resize.1*
+/usr/X11R6/share/man/man1/xvidtune.1*
+/usr/X11R6/share/man/man1/xwd.1*
+/usr/X11R6/share/man/man1/xwininfo.1*
+/usr/X11R6/share/man/man1/xwud.1*
+/usr/X11R6/share/man/man1/Xserver.1*
+/usr/X11R6/share/man/man1/XFree86.1*
+/usr/X11R6/share/man/man1/reconfig.1*
+/usr/X11R6/share/man/man1/xf86config.1*
+/usr/X11R6/share/man/man1/SuperProbe.1*
+/usr/X11R6/share/man/man1/xon.1*
 
 %ifnarch sparc
 
@@ -1344,7 +1350,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) /usr/X11R6/lib/X11/xdm
 %attr(755,root,root) /usr/X11R6/bin/xdm
 %attr(755,root,root) /usr/X11R6/bin/sessreg
-/usr/X11R6/man/man1/xdm.1*
+/usr/X11R6/share/man/man1/xdm.1*
 
 %files -n xfs
 %defattr(644,root,root,755)
@@ -1357,15 +1363,15 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) /usr/X11R6/bin/fslsfonts
 %attr(755,root,root) /usr/X11R6/bin/fstobdf
 
-/usr/X11R6/man/man1/xfs.1*
-/usr/X11R6/man/man1/fsinfo.1*
-/usr/X11R6/man/man1/fslsfonts.1*
-/usr/X11R6/man/man1/fstobdf.1*  
+/usr/X11R6/share/man/man1/xfs.1*
+/usr/X11R6/share/man/man1/fsinfo.1*
+/usr/X11R6/share/man/man1/fslsfonts.1*
+/usr/X11R6/share/man/man1/fstobdf.1*  
 
 %files -n xauth
 %defattr(644,root,root,755)
 %attr(755,root,root) /usr/X11R6/bin/xauth
-/usr/X11R6/man/man1/xauth.1*
+/usr/X11R6/share/man/man1/xauth.1*
 
 %files libs
 %defattr(644,root,root,755)
@@ -1390,10 +1396,10 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) /usr/X11R6/bin/makedepend
 %attr(755,root,root) /usr/X11R6/bin/xmkmf
 
-/usr/X11R6/man/man1/imake.1*
-/usr/X11R6/man/man1/makedepend.1*
-/usr/X11R6/man/man1/xmkmf.1*
-/usr/X11R6/man/man3/*
+/usr/X11R6/share/man/man1/imake.1*
+/usr/X11R6/share/man/man1/makedepend.1*
+/usr/X11R6/share/man/man1/xmkmf.1*
+/usr/X11R6/share/man/man3/*
 
 %files static
 %defattr(644,root,root,755)
@@ -1402,20 +1408,20 @@ rm -rf $RPM_BUILD_ROOT
 %files Xvfb
 %defattr(644,root,root,755)
 %attr(755,root,root) /usr/X11R6/bin/Xvfb
-/usr/X11R6/man/man1/Xvfb.1*
+/usr/X11R6/share/man/man1/Xvfb.1*
 
 %files Xnest
 %defattr(644,root,root,755)
 %attr(755,root,root) /usr/X11R6/bin/Xnest
-/usr/X11R6/man/man1/Xnest.1*
+/usr/X11R6/share/man/man1/Xnest.1*
 
 %ifarch i386 i486 i586 i686 alpha
 
 %files SVGA
 %defattr(644,root,root,755)
 %attr(755,root,root) /usr/X11R6/bin/XF86_SVGA
-/usr/X11R6/man/man1/XF86_SVGA.1*
-/usr/X11R6/man/man5/XF86Config.5*
+/usr/X11R6/share/man/man1/XF86_SVGA.1*
+/usr/X11R6/share/man/man5/XF86Config.5*
 %endif
 
 %ifarch i386 i486 i586 i686 sparc
@@ -1423,8 +1429,8 @@ rm -rf $RPM_BUILD_ROOT
 %files VGA16
 %defattr(644,root,root,755)
 %attr(755,root,root) /usr/X11R6/bin/XF86_VGA16
-/usr/X11R6/man/man1/XF86_VGA16.1*
-/usr/X11R6/man/man5/XF86Config.5*
+/usr/X11R6/share/man/man1/XF86_VGA16.1*
+/usr/X11R6/share/man/man5/XF86Config.5*
 %endif
 
 %ifarch i386 i486 i586 i686
@@ -1432,9 +1438,9 @@ rm -rf $RPM_BUILD_ROOT
 %files W32
 %defattr(644,root,root,755)
 %attr(755,root,root) /usr/X11R6/bin/XF86_W32
-/usr/X11R6/man/man1/XF86_W32.1*
-/usr/X11R6/man/man1/XF86_Accel.1*
-/usr/X11R6/man/man5/XF86Config.5*
+/usr/X11R6/share/man/man1/XF86_W32.1*
+/usr/X11R6/share/man/man1/XF86_Accel.1*
+/usr/X11R6/share/man/man5/XF86Config.5*
 %endif
 
 %ifarch i386 i486 i586 i686 alpha
@@ -1442,8 +1448,8 @@ rm -rf $RPM_BUILD_ROOT
 %files Mono
 %defattr(644,root,root,755)
 %attr(755,root,root) /usr/X11R6/bin/XF86_Mono
-/usr/X11R6/man/man1/XF86_Mono.1*
-/usr/X11R6/man/man5/XF86Config.5*
+/usr/X11R6/share/man/man1/XF86_Mono.1*
+/usr/X11R6/share/man/man5/XF86Config.5*
 %endif
 
 %ifarch i386 i486 i586 i686 alpha
@@ -1451,9 +1457,9 @@ rm -rf $RPM_BUILD_ROOT
 %files S3
 %defattr(644,root,root,755)
 %attr(755,root,root) /usr/X11R6/bin/XF86_S3
-/usr/X11R6/man/man1/XF86_S3.1*
-/usr/X11R6/man/man1/XF86_Accel.1*
-/usr/X11R6/man/man5/XF86Config.5*
+/usr/X11R6/share/man/man1/XF86_S3.1*
+/usr/X11R6/share/man/man1/XF86_Accel.1*
+/usr/X11R6/share/man/man5/XF86Config.5*
 %endif
 
 %ifarch i386 i486 i586 i686 alpha
@@ -1461,9 +1467,9 @@ rm -rf $RPM_BUILD_ROOT
 %files S3V
 %defattr(644,root,root,755)
 %attr(755,root,root) /usr/X11R6/bin/XF86_S3V
-/usr/X11R6/man/man1/XF86_S3.1*
-/usr/X11R6/man/man1/XF86_Accel.1*
-/usr/X11R6/man/man5/XF86Config.5*
+/usr/X11R6/share/man/man1/XF86_S3.1*
+/usr/X11R6/share/man/man1/XF86_Accel.1*
+/usr/X11R6/share/man/man5/XF86Config.5*
 %endif
 
 %ifarch i386 i486 i586 i686
@@ -1471,9 +1477,9 @@ rm -rf $RPM_BUILD_ROOT
 %files 8514
 %defattr(644,root,root,755)
 %attr(755,root,root) /usr/X11R6/bin/XF86_8514
-/usr/X11R6/man/man1/XF86_8514.1*
-/usr/X11R6/man/man1/XF86_Accel.1*
-/usr/X11R6/man/man5/XF86Config.5*
+/usr/X11R6/share/man/man1/XF86_8514.1*
+/usr/X11R6/share/man/man1/XF86_Accel.1*
+/usr/X11R6/share/man/man5/XF86Config.5*
 %endif
 
 %ifarch i386 i486 i586 i686
@@ -1481,9 +1487,9 @@ rm -rf $RPM_BUILD_ROOT
 %files Mach8
 %defattr(644,root,root,755)
 %attr(755,root,root) /usr/X11R6/bin/XF86_Mach8
-/usr/X11R6/man/man1/XF86_Mach8.1*
-/usr/X11R6/man/man1/XF86_Accel.1*
-/usr/X11R6/man/man5/XF86Config.5*
+/usr/X11R6/share/man/man1/XF86_Mach8.1*
+/usr/X11R6/share/man/man1/XF86_Accel.1*
+/usr/X11R6/share/man/man5/XF86Config.5*
 %endif
 
 %ifarch i386 i486 i586 i686
@@ -1491,26 +1497,26 @@ rm -rf $RPM_BUILD_ROOT
 %files Mach32
 %defattr(644,root,root,755)
 %attr(755,root,root) /usr/X11R6/bin/XF86_Mach32
-/usr/X11R6/man/man1/XF86_Mach32.1*
-/usr/X11R6/man/man1/XF86_Accel.1*
-/usr/X11R6/man/man5/XF86Config.5*
+/usr/X11R6/share/man/man1/XF86_Mach32.1*
+/usr/X11R6/share/man/man1/XF86_Accel.1*
+/usr/X11R6/share/man/man5/XF86Config.5*
 %endif
 
 %files Mach64
 %defattr(644, root, root, 755)
 %attr(755,root,root) /usr/X11R6/bin/XF86_Mach64
-/usr/X11R6/man/man1/XF86_Mach64.1*
-/usr/X11R6/man/man1/XF86_Accel.1*
-/usr/X11R6/man/man5/XF86Config.5*
+/usr/X11R6/share/man/man1/XF86_Mach64.1*
+/usr/X11R6/share/man/man1/XF86_Accel.1*
+/usr/X11R6/share/man/man5/XF86Config.5*
 
 %ifarch i386 i486 i586 i686 alpha
 
 %files P9000
 %defattr(644, root, root, 755)
 %attr(755,root,root) /usr/X11R6/bin/XF86_P9000
-/usr/X11R6/man/man1/XF86_P9000.1*
-/usr/X11R6/man/man1/XF86_Accel.1*
-/usr/X11R6/man/man5/XF86Config.5*
+/usr/X11R6/share/man/man1/XF86_P9000.1*
+/usr/X11R6/share/man/man1/XF86_Accel.1*
+/usr/X11R6/share/man/man5/XF86Config.5*
 %endif
 
 %ifarch i386 i486 i586 i686
@@ -1518,9 +1524,9 @@ rm -rf $RPM_BUILD_ROOT
 %files AGX
 %defattr(644, root, root, 755)
 %attr(755,root,root) /usr/X11R6/bin/XF86_AGX
-/usr/X11R6/man/man1/XF86_AGX.1*
-/usr/X11R6/man/man1/XF86_Accel.1*
-/usr/X11R6/man/man5/XF86Config.5*
+/usr/X11R6/share/man/man1/XF86_AGX.1*
+/usr/X11R6/share/man/man1/XF86_Accel.1*
+/usr/X11R6/share/man/man5/XF86Config.5*
 %endif
 
 %ifarch i386 i486 i586 i686
@@ -1528,9 +1534,9 @@ rm -rf $RPM_BUILD_ROOT
 %files I128
 %defattr(644, root, root, 755)
 %attr(755,root,root) /usr/X11R6/bin/XF86_I128
-/usr/X11R6/man/man1/XF86_I128.1*
-/usr/X11R6/man/man1/XF86_Accel.1*
-/usr/X11R6/man/man5/XF86Config.5*
+/usr/X11R6/share/man/man1/XF86_I128.1*
+/usr/X11R6/share/man/man1/XF86_Accel.1*
+/usr/X11R6/share/man/man5/XF86Config.5*
 %endif
 
 %ifarch alpha
@@ -1538,7 +1544,7 @@ rm -rf $RPM_BUILD_ROOT
 %files TGA
 %defattr(644, root, root, 755)
 %attr(755,root,root) /usr/X11R6/bin/XF86_TGA
-/usr/X11R6/man/man5/XF86Config.5*
+/usr/X11R6/share/man/man5/XF86Config.5*
 %endif
 
 %ifarch sparc
@@ -1578,7 +1584,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %ifarch m68k 
 %attr(755,root,root) /usr/X11R6/bin/XF68_FBDev
-/usr/X11R6/man/man1/XF68_FBDev.1*
+/usr/X11R6/share/man/man1/XF68_FBDev.1*
 %else
 %attr(755,root,root) /usr/X11R6/bin/XF86_FBDev
 %endif
@@ -1588,8 +1594,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) /usr/X11R6/bin/XF86Setup
 %attr(755,root,root) /usr/X11R6/bin/xmseconfig
 /usr/X11R6/lib/X11/XF86Setup
-/usr/X11R6/man/man1/XF86Setup.1*
-/usr/X11R6/man/man1/xmseconfig.1*
+/usr/X11R6/share/man/man1/XF86Setup.1*
+/usr/X11R6/share/man/man1/xmseconfig.1*
 
 %changelog
 * Tue Apr 20 1999 Artur Frysiak <wiget@pld.org.pl>