[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openpkg-cvs
Subject:    [CVS] OpenPKG: openpkg-src/freetype/ freetype.spec
From:       "Michael Schloh" <ms () openpkg ! net>
Date:       2005-06-30 15:55:43
Message-ID: 20050630155543.B546D1B5051 () master ! openpkg ! org
[Download RAW message or body]

  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Michael Schloh
  Root:   /v/openpkg/cvs                   Email:  ms@openpkg.net
  Module: openpkg-src                      Date:   30-Jun-2005 17:55:43
  Branch: HEAD                             Handle: 2005063016554300

  Modified files:
    openpkg-src/freetype    freetype.spec

  Log:
    BASE package rrdtool in its present form requires a freetype shared
    object

  Summary:
    Revision    Changes     Path
    1.50        +17 -1      openpkg-src/freetype/freetype.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/freetype/freetype.spec
  ============================================================================
  $ cvs diff -u -r1.49 -r1.50 freetype.spec
  --- openpkg-src/freetype/freetype.spec	24 Mar 2005 11:18:50 -0000	1.49
  +++ openpkg-src/freetype/freetype.spec	30 Jun 2005 15:55:43 -0000	1.50
  @@ -33,7 +33,10 @@
   Group:        Graphics
   License:      GPL
   Version:      2.1.9
  -Release:      20041018
  +Release:      20050630
  +
  +#   package options
  +%option       with_shared   no
   
   #   list of sources
   Source0:      ftp://ftp.freetype.org/freetype/freetype2/freetype-%{version}.tar.gz
  @@ -74,6 +77,13 @@
           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}
  @@ -81,6 +91,12 @@
   %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
[prev in list] [next in list] [prev in thread] [next in thread]