OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 07-Sep-2008 21:08:59
Branch: HEAD Handle: 2008090720085900
Modified files:
openpkg-src/pango pango.spec
Log:
allow us to build pango without X11 support by default
Summary:
Revision Changes Path
1.80 +13 -2 openpkg-src/pango/pango.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/pango/pango.spec
============================================================================
$ cvs diff -u -r1.79 -r1.80 pango.spec
--- openpkg-src/pango/pango.spec 7 Sep 2008 17:52:57 -0000 1.79
+++ openpkg-src/pango/pango.spec 7 Sep 2008 19:08:59 -0000 1.80
@@ -39,6 +39,9 @@
Version: %{V_pango_major}.%{V_pango_minor}
Release: 20080907
+# package options
+%option with_x11 no
+
# list of sources
Source0:
http://ftp.gnome.org/pub/GNOME/sources/pango/%{V_pango_major}/pango-%{version}.tar.bz2
Patch0: pango.patch
@@ -46,12 +49,16 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, X11, make, gcc, pkgconfig
-PreReq: OpenPKG, openpkg >= 20040130, X11
+BuildPreReq: OpenPKG, openpkg >= 20040130, make, gcc, pkgconfig
+PreReq: OpenPKG, openpkg >= 20040130
BuildPreReq: glib2 >= %{V_glib_major}
PreReq: glib2 >= %{V_glib_major}
BuildPreReq: gettext, libiconv, freetype, fontconfig, xft, cairo >= 1.7.4
PreReq: gettext, libiconv, freetype, fontconfig, xft, cairo >= 1.7.4
+%if "%{with_x11}" == "yes"
+BuildPreReq: X11, xft
+PreReq: X11, xft
+%endif
AutoReq: no
AutoReqProv: no
@@ -92,9 +99,13 @@
--cache-file=./config.cache \
--prefix=%{l_prefix} \
--mandir=%{l_prefix}/man \
+%if "%{with_x11}" == "yes"
--with-x \
--x-includes=`%{l_rc} --query x11_incdir` \
--x-libraries=`%{l_rc} --query x11_libdir` \
+%else
+ --without-x \
+%endif
--with-html-dir="%{l_prefix}/share/pango/doc" \
--with-xml-catalog="%{l_prefix}/share/sgml/catalog.xml" \
--disable-dependency-tracking \
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
