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

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src openpkg-web          Date:   12-Mar-2003 21:32:46
  Branch: HEAD                             Handle: 2003031220324203

  Modified files:
    openpkg-src/libwmf      libwmf.spec
    openpkg-web             news.txt

  Log:
    1. fix dependencies again; 2. reformat %description with par(1); 3.
    use more build flags to make sure our libs are picked up; 4. remove
    HTML docs from package

  Summary:
    Revision    Changes     Path
    1.13        +14 -6      openpkg-src/libwmf/libwmf.spec
    1.3667      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/libwmf/libwmf.spec
  ============================================================================
  $ cvs diff -u -r1.12 -r1.13 libwmf.spec
  --- openpkg-src/libwmf/libwmf.spec    12 Mar 2003 18:07:46 -0000      1.12
  +++ openpkg-src/libwmf/libwmf.spec    12 Mar 2003 20:32:45 -0000      1.13
  @@ -45,16 +45,17 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20020206, X11, make, gcc, libtool, zlib, jpeg, 
png, freetype, gd, ghostscript = %{V_ghostscript}, libxml
  -PreReq:       OpenPKG, openpkg >= 20020206, X11, ghostscript = %{V_ghostscript}
  +BuildPreReq:  OpenPKG, openpkg >= 20020206, X11, libxml, freetype, zlib, png, jpeg, 
gd, ghostscript = %{V_ghostscript}
  +PreReq:       OpenPKG, openpkg >= 20020206, X11, libxml, freetype, zlib, png, jpeg, 
gd, ghostscript = %{V_ghostscript}
   AutoReq:      no
   AutoReqProv:  no
   
   %description
  -    Libwmf is a library for reading vector images in Microsoft's native Windows
  -    Metafile Format (WMF) and for either displaying them in, e.g., an X window
  -    or converting them to more standard/open file formats such as, e.g., the
  -    W3C's XML-based Scaleable Vector Graphic (SVG) format.
  +    Libwmf is a library for reading vector images in Microsoft's native
  +    Windows Metafile Format (WMF) and for either displaying them in,
  +    e.g., an X window or converting them to more standard/open file
  +    formats such as, e.g., the W3C's XML-based Scaleable Vector Graphic
  +    (SVG) format.
   
   %prep
       %setup -q
  @@ -62,6 +63,8 @@
   %build
       CC="%{l_cc}" \
       CFLAGS="%{l_cflags -O}" \
  +    CPPFLAGS="%{l_cppflags}" \
  +    LDFLAGS="%{l_ldflags}" \
       ./configure \
           --prefix=%{l_prefix} \
           --with-docdir=%{l_prefix}/share/libwmf \
  @@ -84,6 +87,11 @@
       rm -rf $RPM_BUILD_ROOT
       %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
       strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
  +    rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/libwmf/html
  +    rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/libwmf/caolan
  +    rm -f $RPM_BUILD_ROOT%{l_prefix}/share/libwmf/*.html
  +    rm -f $RPM_BUILD_ROOT%{l_prefix}/share/libwmf/*.gif
  +    rm -f $RPM_BUILD_ROOT%{l_prefix}/share/libwmf/*.png
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
   
   %files -f files
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.3666 -r1.3667 news.txt
  --- openpkg-web/news.txt      12 Mar 2003 19:34:19 -0000      1.3666
  +++ openpkg-web/news.txt      12 Mar 2003 20:32:42 -0000      1.3667
  @@ -1,3 +1,4 @@
  +12-Mar-2003: Upgraded package: P<libwmf-0.2.8-20030312>
   12-Mar-2003: New package: P<transfig-3.2.4-20030312>
   12-Mar-2003: Upgraded package: P<pcre-4.1-20030312>
   12-Mar-2003: Upgraded package: P<screen-3.9.14-20030312>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to