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: 03-Oct-2006 15:50:42
Branch: HEAD Handle: 2006100314504100
Added files:
openpkg-src/fontconfig fontconfig.patch
Modified files:
openpkg-src/fontconfig fontconfig.spec
Log:
fix packaging: freetype dependency and manual page directory
Summary:
Revision Changes Path
1.6 +12 -0 openpkg-src/fontconfig/fontconfig.patch
1.36 +6 -10 openpkg-src/fontconfig/fontconfig.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/fontconfig/fontconfig.patch
============================================================================
$ cvs diff -u -r0 -r1.6 fontconfig.patch
--- /dev/null 2006-10-03 15:50:35 +0200
+++ fontconfig.patch 2006-10-03 15:50:42 +0200
@@ -0,0 +1,12 @@
+Index: fontconfig.pc.in
+--- fontconfig.pc.in.orig 2006-09-04 00:37:14 +0200
++++ fontconfig.pc.in 2006-10-03 15:36:33 +0200
+@@ -6,6 +6,7 @@
+ Name: Fontconfig
+ Description: Font configuration and customization library
+ Version: @VERSION@
++Requires: freetype2
+ Libs: -L${libdir} -lfontconfig
+-Libs.private: @EXPAT_LIBS@
++Libs.private: -liconv @EXPAT_LIBS@
+ Cflags: -I${includedir}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/fontconfig/fontconfig.spec
============================================================================
$ cvs diff -u -r1.35 -r1.36 fontconfig.spec
--- openpkg-src/fontconfig/fontconfig.spec 25 Sep 2006 17:56:08 -0000
1.35
+++ openpkg-src/fontconfig/fontconfig.spec 3 Oct 2006 13:50:41 -0000
1.36
@@ -33,10 +33,11 @@
Group: XWindow
License: GPL
Version: 2.4.1
-Release: 20060925
+Release: 20061003
# list of sources
Source0: http://fontconfig.org/release/fontconfig-%{version}.tar.gz
+Patch0: fontconfig.patch
# build information
Prefix: %{l_prefix}
@@ -64,25 +65,19 @@
%prep
%setup -q
+ %patch -p0
%build
x11inc=`%{l_rc} --query x11_incdir`
x11lib=`%{l_rc} --query x11_libdir`
-
- # make configure look only in our path
%{l_shtool} subst \
-e '/LINENO: error: C[+]* preprocessor/{N;N;N;N;s/.*/:/;}' \
-e "s;/usr/X11R6/lib/X11;$x11lib/X11;g" \
-e 's;/usr/X11/lib/X11;;g' \
-e 's;/usr/lib/X11;;g' \
configure
-
- # add iconv, freetype and expat dependencies
- %{l_shtool} subst \
- -e '/^Libs:/s;$; -liconv -lfreetype -lexpat;' \
- fontconfig.pc.in
-
- echo 'ac_cv_prog_HASDOCBOOK=${ac_cv_prog_HASDOCBOOK=no}' >config.cache
+ ( echo 'ac_cv_prog_HASDOCBOOK=${ac_cv_prog_HASDOCBOOK=no}'
+ ) >config.cache
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
CPPFLAGS="%{l_cppflags}" \
@@ -91,6 +86,7 @@
./configure \
--cache-file=./config.cache \
--prefix=%{l_prefix} \
+ --mandir=%{l_prefix}/man \
--with-x \
--x-includes=$x11inc \
--x-libraries=$x11lib \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
