OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Matthias Kurz
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 10-Sep-2005 16:30:55
Branch: HEAD Handle: 2005091015305400
Modified files:
openpkg-src/pango pango.spec
Log:
build without dlopened modules
Summary:
Revision Changes Path
1.47 +10 -14 openpkg-src/pango/pango.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/pango/pango.spec
============================================================================
$ cvs diff -u -r1.46 -r1.47 pango.spec
--- openpkg-src/pango/pango.spec 3 Sep 2005 09:40:16 -0000 1.46
+++ openpkg-src/pango/pango.spec 10 Sep 2005 14:30:54 -0000 1.47
@@ -38,7 +38,7 @@
Group: XWindow
License: GPL
Version: %{V_pango}
-Release: 20050903
+Release: 20050910
# list of sources
Source0:
ftp://ftp.gtk.org/pub/gtk/v%{V_gtk_major}/pango-%{V_pango}.tar.bz2
@@ -49,8 +49,10 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040130, X11, make, gcc, pkgconfig
PreReq: OpenPKG, openpkg >= 20040130, X11
-BuildPreReq: glib2 >= %{V_glib_major}, libiconv, freetype, fontconfig, xft,
cairo >= 0.9.2-20050820
-PreReq: glib2 >= %{V_glib_major}, libiconv, freetype, fontconfig, xft,
cairo >= 0.9.2-20050820
+BuildPreReq: glib2 >= %{V_glib_major}
+PreReq: glib2 >= %{V_glib_major}
+BuildPreReq: gettext, libiconv, freetype, fontconfig, xft, cairo >=
0.9.2-20050820
+PreReq: gettext, libiconv, freetype, fontconfig, xft, cairo >=
0.9.2-20050820
AutoReq: no
AutoReqProv: no
@@ -79,7 +81,6 @@
-e 's;lib\(p[a-zA-Z0-9]*\)-\$(PANGO_API_VERSION);lib\1;g' \
-e 's;[EMAIL PROTECTED]@;;g' \
-e '/moduledir =/s;/\$(PANGO_MODULE_VERSION);;g' \
- -e 's;\(pango_querymodules_LDFLAGS *=\);\1 -static;' \
Makefile.in */Makefile.in */*/Makefile.in \
pango\*.pc.in
@@ -101,24 +102,19 @@
--disable-dependency-tracking \
--disable-debug \
--disable-rebuilds \
- --enable-shared \
- --enable-static
-
- # build pango libraries only statically
- %{l_shtool} subst \
- -e 's;^LIBRARY_LIBTOOL_OPTIONS = .*;\0 -static;' \
- pango/Makefile
+ --disable-shared \
+
--with-included-modules="arabic-fc,basic-fc,basic-x,hangul-fc,hebrew-fc,indic-fc,khmer-fc,syriac-fc,thai-fc,tibetan-fc"
%{l_make} %{l_mflags -O}
%install
rm -rf $RPM_BUILD_ROOT
%{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
- mkdir -p $RPM_BUILD_ROOT%{l_prefix}/doc
-
- # supply pango.modules
%{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/doc \
$RPM_BUILD_ROOT%{l_prefix}/etc/pango
+
+ # supply pango.modules
$RPM_BUILD_ROOT%{l_prefix}/bin/pango-querymodules \
$RPM_BUILD_ROOT%{l_prefix}/lib/pango/modules/*.so \
| sed "s,$RPM_BUILD_ROOT,," \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
