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                      Date:   16-Oct-2004 15:47:07
  Branch: HEAD                             Handle: 2004101614470700

  Modified files:
    openpkg-src/tiff        tiff.spec
  Removed files:
    openpkg-src/tiff        tiff.patch

  Log:
    upgrading package: tiff 3.6.1 -> 3.7.0

  Summary:
    Revision    Changes     Path
    1.2         +0  -132    openpkg-src/tiff/tiff.patch
    1.36        +31 -48     openpkg-src/tiff/tiff.spec
  ____________________________________________________________________________

  rm -f openpkg-src/tiff/tiff.patch <<'@@ .'
  Index: openpkg-src/tiff/tiff.patch
  ============================================================================
  [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/tiff/tiff.spec
  ============================================================================
  $ cvs diff -u -r1.35 -r1.36 tiff.spec
  --- openpkg-src/tiff/tiff.spec        14 Oct 2004 15:12:24 -0000      1.35
  +++ openpkg-src/tiff/tiff.spec        16 Oct 2004 13:47:07 -0000      1.36
  @@ -27,20 +27,17 @@
   Name:         tiff
   Summary:      Tag Image File Format (TIFF) Image Library
   URL:          http://www.libtiff.org/
  -Vendor:       SGI
  +Vendor:       Sam Leffler
   Packager:     The OpenPKG Project
   Distribution: OpenPKG
   Class:        BASE
   Group:        Graphics
   License:      GPL
  -Version:      3.6.1
  -Release:      20041014
  +Version:      3.7.0
  +Release:      20041016
   
   #   list of sources
  -Source0:      ftp://ftp.remotesensing.org/pub/libtiff/tiff-v%{version}.tar.gz
  -Patch0:       
ftp://ftp.altlinux.org/pub/people/ldv/tiff/libtiff-3.6.1-alt-bound.patch
  -Patch1:       
ftp://ftp.altlinux.org/pub/people/ldv/tiff/libtiff-3.6.1-chris-bound.patch
  -Patch2:       tiff.patch
  +Source0:      ftp://ftp.remotesensing.org/pub/libtiff/tiff-%{version}.tar.gz
   
   #   build information
   Prefix:       %{l_prefix}
  @@ -53,68 +50,54 @@
   AutoReqProv:  no
   
   %description
  -    TIFF is a widely used format for storing image data.
  +    Tag Image File Format (TIFF) is a widely used format for storing
  +    Timage data. he library, along with associated tool programs, should
  +    Thandle most of your needs for reading and writing TIFF images.
   
   %track
       prog tiff = {
           version   = %{version}
           url       = ftp://ftp.remotesensing.org/pub/libtiff/
  -        regex     = tiff-v((\d+\.)*\d+)\.tar\.gz
  +        regex     = tiff-((\d+\.)*\d+)\.tar\.gz
       }
   
   %prep
  -    %setup -q -n tiff-v%{version}
  -    %patch -p1 -P 0 1
  -    %patch -p0 -P 2
  +    %setup -q
   
   %build
       CC="%{l_cc}" \
       CFLAGS="%{l_cflags -O}" \
  +    CPPFLAGS="%{l_cppflags}" \
  +    LDFLAGS="%{l_ldflags}" \
       ./configure \
  -        --prefix=$RPM_BUILD_ROOT%{l_prefix} \
  -        --with-DSO=no \
  -        --with-LIBGL=no \
  -        --with-LIBIMAGE=no \
  -        --with-JPEG=yes \
  -        --with-ZIP=yes \
  -        --with-DIRS-LIBINC="%{l_prefix}/include" \
  -        --with-DIR-JPEGLIB="%{l_prefix}/lib" \
  -        --with-DIR-GZLIB="%{l_prefix}/lib" \
  -        --noninteractive
  +        --prefix=%{l_prefix} \
  +        --includedir=%{l_prefix}/include/tiff \
  +        --disable-shared \
  +        --enable-static \
  +        --enable-ccitt \
  +        --enable-packbits \
  +        --enable-lzw \
  +        --enable-thunder \
  +        --enable-next \
  +        --enable-logluv \
  +        --enable-zlib \
  +        --enable-pixarlog \
  +        --enable-jpeg \
  +        --with-zlib-include-dir=%{l_prefix}/include \
  +        --with-zlib-lib-dir=%{l_prefix}/lib \
  +        --with-jpeg-include-dir=%{l_prefix}/include \
  +        --with-jpeg-lib-dir=%{l_prefix}/lib \
  +        --without-x
       %{l_make} %{l_mflags -O}
   
   %install
       rm -rf $RPM_BUILD_ROOT
  -    %{l_shtool} mkdir -f -p -m 755 \
  -        $RPM_BUILD_ROOT%{l_prefix}/bin \
  -        $RPM_BUILD_ROOT%{l_prefix}/lib \
  -        $RPM_BUILD_ROOT%{l_prefix}/include/tiff \
  -        $RPM_BUILD_ROOT%{l_prefix}/man/man1 \
  -        $RPM_BUILD_ROOT%{l_prefix}/man/man3
  -    ( cd libtiff && %{l_tar} cf - libtiff.*) |\
  -        ( cd $RPM_BUILD_ROOT%{l_prefix}/lib && %{l_tar} xf - ) || exit $?
  -    ( cd libtiff && %{l_tar} cf - *.h) |\
  -        ( cd $RPM_BUILD_ROOT%{l_prefix}/include/tiff && %{l_tar} xf - ) || exit $?
  -    ( cd tools
  -      for tool in *; do
  -          if [ -x $tool ]; then
  -              echo $tool
  -          fi
  -      done
  -    ) | (cd tools && xargs %{l_tar} cf - ) |\
  -        ( cd $RPM_BUILD_ROOT%{l_prefix}/bin && %{l_tar} xf - ) || exit $?
  -    ( cd man/apps && %{l_tar} cf - *.1) |\
  -        ( cd $RPM_BUILD_ROOT%{l_prefix}/man/man1 && %{l_tar} xf -) || exit $?
  -    ( cd man/lib
  +    %{l_make} %{l_mflags -O} install DESTDIR=$RPM_BUILD_ROOT
  +    ( cd $RPM_BUILD_ROOT%{l_prefix}/man/man3
         for manpage in *.3t; do
             base=`echo $manpage | sed -e 's;\.3t$;;'`
             mv $base.3t $base.3
  -          echo $base.3
         done
  -    ) | ( cd man/lib && xargs %{l_tar} cf - ) |\
  -        (cd $RPM_BUILD_ROOT%{l_prefix}/man/man3 && %{l_tar} xf -) || exit $?
  -    ( cd $RPM_BUILD_ROOT%{l_prefix}/lib
  -      rm -f libtiff.so* libtiff.def 2>&1 || true
       ) || exit $?
       strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to