[packaging] build without docs so we don't require xorg macros

rpm/xkeyboard-config.spec

@@ -1,13 +1,5 @@
-# 
-# Do NOT Edit the Auto-generated Part!
-# Generated by: spectacle version 0.25
-# 
-
 Name:       xkeyboard-config
 
-# >> macros
-# << macros
-
 Summary:    Alternative xkb data files
 Version:    2.5.1
 Release:    1
@@ -16,14 +8,6 @@ License:    MIT
 BuildArch:  noarch
 URL:        http://www.freedesktop.org/wiki/Software/XKeyboardConfig#Releases
 Source0:    http://xorg.freedesktop.org/archive/individual/data/%{name}-%{version}.tar.bz2
-Source100:  xkeyboard-config.yaml
-Patch0:     fix-rx51-enter.patch
-Patch1:     n950-support.patch
-Patch2:     n950-makefile.in-manual-fix.patch
-Patch3:     n810-support.patch
-BuildRequires:  pkgconfig(xorg-macros)
-BuildRequires:  pkgconfig
-BuildRequires:  xkbcomp
 BuildRequires:  perl(XML::Parser)
 BuildRequires:  gettext
 BuildRequires:  intltool
@@ -44,24 +28,11 @@ Development files for %{name}.
 
 
 %prep
-%setup -q -n %{name}-%{version}
-
-# fix-rx51-enter.patch
-%patch0 -p1
-# n950-support.patch
-%patch1 -p1
-# n950-makefile.in-manual-fix.patch
-%patch2 -p1
-# n810-support.patch
-%patch3 -p1
-# >> setup
-# << setup
+%setup -q -n %{name}-%{version}/%{name}
 
 %build
-# >> build pre
-# << build pre
 
-%configure --disable-static \
+%autogen --disable-static \
     --enable-compat-rules \
     --with-xkb-base=%{_datadir}/X11/xkb \
     --disable-xkbcomp-symlink \
@@ -70,17 +41,10 @@ Development files for %{name}.
 
 make %{?jobs:-j%jobs}
 
-# >> build post
-# << build post
-
 %install
 rm -rf %{buildroot}
-# >> install pre
-
-# << install pre
 %make_install
 
-# >> install post
 # Remove unnecessary symlink
 rm -f $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled
 
@@ -96,21 +60,14 @@ find ./usr/share/X11 -type f | sed -e "s/^\.//g" >> $FILESLIST
 popd
 }
 
-
-# << install post
-
 %fdupes  %{buildroot}//usr/share/X11
 
 %files -f files.list
 %defattr(-,root,root,-)
-# >> files
 %{_datadir}/X11/xkb/rules/xorg
 %{_datadir}/X11/xkb/rules/xorg.lst
 %{_datadir}/X11/xkb/rules/xorg.xml
-# << files
 
 %files devel
 %defattr(-,root,root,-)
-# >> files devel
 %{_datadir}/pkgconfig/xkeyboard-config.pc
-# << files devel

xkeyboard-config/Makefile.am

@@ -1,6 +1,7 @@
 AUTOMAKE_OPTIONS = foreign
 
-SUBDIRS = compat geometry keycodes po rules symbols types docs man
+#SUBDIRS = compat geometry keycodes po rules symbols types docs man
+SUBDIRS = compat geometry keycodes po rules symbols types
 
 pkgconfigdir = $(datadir)/pkgconfig
 pkgconfig_DATA = xkeyboard-config.pc

xkeyboard-config/configure.ac

@@ -4,13 +4,13 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 
 # Require X.Org macros 1.12 or later for XORG_WITH_XSLTPROC
-m4_ifndef([XORG_MACROS_VERSION],
-          [m4_fatal([must install xorg-macros 1.12 or later before
-          running autoconf/autogen])])
-XORG_MACROS_VERSION(1.12)
-XORG_MANPAGE_SECTIONS
-XORG_WITH_XSLTPROC
-AC_PROG_SED
+#m4_ifndef([XORG_MACROS_VERSION],
+#          [m4_fatal([must install xorg-macros 1.12 or later before
+#          running autoconf/autogen])])
+#XORG_MACROS_VERSION(1.12)
+#XORG_MANPAGE_SECTIONS
+#XORG_WITH_XSLTPROC
+#AC_PROG_SED
 
 AC_SUBST(VERSION)
 
@@ -103,9 +103,9 @@ symbols/sun_vndr/Makefile
 symbols/xfree68_vndr/Makefile
 types/Makefile
 xkeyboard-config.pc
-docs/Makefile
-man/Makefile
 ])
+#docs/Makefile
+#man/Makefile
 
 echo '***********************************************************'
 echo "  $PACKAGE_NAME is configured with the following parameters:"