OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: t...@openpkg.org
Module: openpkg-src Date: 10-Apr-2009 19:42:42
Branch: HEAD Handle: 2009041018424200
Modified files:
openpkg-src/xpdf xpdf.spec
Log:
allow xpdf building without x11, e.g. if only pdftotext and alike
tools are needed
Summary:
Revision Changes Path
1.29 +11 -2 openpkg-src/xpdf/xpdf.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/xpdf/xpdf.spec
============================================================================
$ cvs diff -u -r1.28 -r1.29 xpdf.spec
--- openpkg-src/xpdf/xpdf.spec 1 Jan 2008 15:07:46 -0000 1.28
+++ openpkg-src/xpdf/xpdf.spec 10 Apr 2009 17:42:42 -0000 1.29
@@ -1,6 +1,6 @@
##
## xpdf.spec -- OpenPKG RPM Package Specification
-## Copyright (c) 2000-2008 OpenPKG Foundation e.V. <http://openpkg.net/>
+## Copyright (c) 2000-2009 OpenPKG Foundation e.V. <http://openpkg.net/>
##
## Permission to use, copy, modify, and distribute this software for
## any purpose with or without fee is hereby granted, provided that
@@ -36,7 +36,10 @@
Group: Postscript
License: GPL
Version: %{V_base}pl%{V_patchlevel}
-Release: 20080101
+Release: 20090410
+
+# package options
+%option with_x11 yes
# list of sources
Source0: ftp://ftp.foolabs.com/pub/xpdf/xpdf-%{V_base}.tar.gz
@@ -47,8 +50,10 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040130, gcc, gcc::with_cxx = yes
PreReq: OpenPKG, openpkg >= 20040130
+%if "%{with_x11}" == "yes"
BuildPreReq: X11, freetype >= 2.2, t1lib, xpm, openmotif
PreReq: X11, freetype >= 2.2, t1lib, xpm, openmotif
+%endif
AutoReq: no
AutoReqProv: no
@@ -85,6 +90,7 @@
./configure \
--prefix=%{l_prefix} \
--sysconfdir=%{l_prefix}/etc/xpdf \
+%if "%{with_x11}" == "yes"
--with-x \
--x-includes=`%{l_rc} --query x11_incdir` \
--x-libraries=`%{l_rc} --query x11_libdir` \
@@ -95,6 +101,9 @@
--with-t1-library=%{l_prefix}/lib \
--with-freetype2-includes=%{l_prefix}/include \
--with-freetype2-library=%{l_prefix}/lib \
+%else
+ --without-x \
+%endif
--enable-a4-paper
%{l_make} %{l_mflags -O}
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
