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: 06-Jul-2005 16:35:51
Branch: HEAD Handle: 2005070615355100
Modified files:
openpkg-src/freetype freetype.spec
Log:
Backout recent change of providing a "with_shared" option as this
is AFAIK not necessary now that the "rrdtool" package was fixed to
correctly build its RRDs.so against the libfreetype.a.
Summary:
Revision Changes Path
1.51 +1 -17 openpkg-src/freetype/freetype.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/freetype/freetype.spec
============================================================================
$ cvs diff -u -r1.50 -r1.51 freetype.spec
--- openpkg-src/freetype/freetype.spec 30 Jun 2005 15:55:43 -0000
1.50
+++ openpkg-src/freetype/freetype.spec 6 Jul 2005 14:35:51 -0000
1.51
@@ -33,10 +33,7 @@
Group: Graphics
License: GPL
Version: 2.1.9
-Release: 20050630
-
-# package options
-%option with_shared no
+Release: 20050706
# list of sources
Source0:
ftp://ftp.freetype.org/freetype/freetype2/freetype-%{version}.tar.gz
@@ -77,13 +74,6 @@
builds/unix/configure
%build
-%if "%{with_shared}" == "yes"
- %{l_make} %{l_mflags} setup \
- CFG="--prefix=%{l_prefix} --enable-shared --disable-static"
- %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
- mv $RPM_BUILD_ROOT%{l_prefix}/lib dyn
- rm -rf $RPM_BUILD_ROOT
-%endif
%{l_make} %{l_mflags} setup \
CFG="--prefix=%{l_prefix} --disable-shared"
%{l_make} %{l_mflags}
@@ -91,12 +81,6 @@
%install
rm -rf $RPM_BUILD_ROOT
%{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
-%if "%{with_shared}" == "yes"
- %{l_shtool} mkdir -f -p -m 755 \
- $RPM_BUILD_ROOT%{l_prefix}/lib/ftdyn
- %{l_shtool} install -c -m 644 \
- dyn/lib*.s[ol]* dyn/pkgconfig/*.pc
$RPM_BUILD_ROOT%{l_prefix}/lib/ftdyn/
-%endif
rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/*.orig
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
