cleanup packaging

fontconfig/fontconfig.spec

@@ -32,10 +32,7 @@ Class:        BASE
 Group:        XWindow
 License:      GPL
 Version:      2.8.0
-Release:      20091121
-
-#   package options
-%option       with_x11  no
+Release:      20101127
 
 #   list of sources
 Source0:      http://fontconfig.org/release/fontconfig-%{version}.tar.gz
@@ -46,10 +43,6 @@ BuildPreReq:  OpenPKG, openpkg >= 20100101, make, gcc, grep
 PreReq:       OpenPKG, openpkg >= 20100101
 BuildPreReq:  libiconv, freetype, expat, libxml
 PreReq:       libiconv, freetype, expat, libxml
-%if "%{with_x11}" == "yes"
-BuildPreReq:  X11
-PreReq:       X11
-%endif
 
 %description
     Fontconfig is a library for configuring and customizing font access.
@@ -70,15 +63,6 @@ PreReq:       X11
     %patch -p0
 
 %build
-%if "%{with_x11}" == "yes"
-    x11inc=`%{l_rc} --query x11_incdir`
-    x11lib=`%{l_rc} --query x11_libdir`
-    %{l_shtool} subst \
-        -e "s;/usr/X11R6/lib/X11;$x11lib/X11;g" \
-        -e 's;/usr/X11/lib/X11;;g' \
-        -e 's;/usr/lib/X11;;g' \
-        configure
-%endif
     ( echo 'ac_cv_prog_HASDOCBOOK=${ac_cv_prog_HASDOCBOOK=no}'
     ) >config.cache
     CC="%{l_cc}" \
@@ -91,38 +75,21 @@ PreReq:       X11
         --cache-file=./config.cache \
         --prefix=%{l_prefix} \
         --mandir=%{l_prefix}/man \
-%if "%{with_x11}" == "yes"
-        --with-x \
-        --x-includes=$x11inc \
-        --x-libraries=$x11lib \
-        --with-default-fonts=$x11lib/X11/fonts/TTF \
-%else
-        --without-x \
-%endif
-        --with-glib-prefix=%{l_prefix} \
         --with-freetype-config=%{l_prefix}/bin/freetype-config \
         --with-expat=%{l_prefix} \
         --with-confdir=%{l_prefix}/etc/fontconfig \
-        --with-docdir=%{l_prefix}/share/fontconfig \
         --with-cache-dir=%{l_prefix}/var/fontconfig \
-        --disable-nls \
         --disable-shared
     %{l_make} %{l_mflags -O}
 
 %install
-    %{l_shtool} mkdir -f -p -m 755 \
-        $RPM_BUILD_ROOT%{l_prefix}/etc/fontconfig \
-        $RPM_BUILD_ROOT%{l_prefix}/share/fontconfig
     %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
+    rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/doc >/dev/null 2>&1 || true
     strip  $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
-    rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/fontconfig/fontconfig-devel
-    rm -f  $RPM_BUILD_ROOT%{l_prefix}/share/fontconfig/*.html
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
         %{l_files_std} \
         '%config %{l_prefix}/etc/fontconfig/*.conf' \
-        '%config %{l_prefix}/etc/fontconfig/conf.d/*.conf' \
-        '%doc %{l_prefix}/share/fontconfig/*.pdf' \
-        '%doc %{l_prefix}/share/fontconfig/*.txt'
+        '%config %{l_prefix}/etc/fontconfig/conf.d/*.conf'
 
 %files -f files