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:   05-Jul-2004 09:33:14
  Branch: OPENPKG_2_1_SOLID                Handle: 2004070508331300

  Modified files:           (Branch: OPENPKG_2_1_SOLID)
    openpkg-src/giflib      giflib.spec

  Log:
    MFC: upgrade to giflib 4.1.3 and provide option for installing the
    tools, too

  Summary:
    Revision    Changes     Path
    1.18.2.2    +13 -15     openpkg-src/giflib/giflib.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/giflib/giflib.spec
  ============================================================================
  $ cvs diff -u -r1.18.2.1 -r1.18.2.2 giflib.spec
  --- openpkg-src/giflib/giflib.spec    2 Jul 2004 15:25:01 -0000       1.18.2.1
  +++ openpkg-src/giflib/giflib.spec    5 Jul 2004 07:33:13 -0000       1.18.2.2
  @@ -24,14 +24,14 @@
   ##
   
   #   package versions
  -%define       V_main              4.1
  -%define       V_giflib            4.1.0
  -%define       V_libungif          4.1.3
  +%define       V_main      4.1.3
  +%define       V_giflib    4.1.3
  +%define       V_libungif  4.1.3
   
   #   package information
   Name:         giflib
   Summary:      Graphics Interchange Format Library
  -URL:          http://prtr-13.ucsc.edu/~badger/software/libungif/
  +URL:          http://sourceforge.net/projects/libungif/
   Vendor:       Gershon Elbor, Eric S. Raymond, Toshio Kuratomi
   Packager:     The OpenPKG Project
   Distribution: OpenPKG
  @@ -41,10 +41,12 @@
   Version:      %{V_main}
   Release:      2.1.0
   
  +#   package options
  +%option       with_tools  no
  +
   #   list of sources
  -Source0:      ftp://prtr-13.ucsc.edu/pub/libungif/giflib-%{V_giflib}.tar.gz
  +Source0:      
http://osdn.dl.sourceforge.net/sourceforge/libungif/giflib-%{V_giflib}.tar.gz
   Source1:      
http://osdn.dl.sourceforge.net/sourceforge/libungif/libungif-%{V_libungif}.tar.gz
  -Source2:      ftp://ftp.gnu.org/gnu/libtool/libtool-1.3.5.tar.gz
   
   #   build information
   Prefix:       %{l_prefix}
  @@ -63,10 +65,8 @@
   
   %track
       prog giflib:giflib = {
  -        disabled
  -        comment   = "rse: URL valid according to homepage, but FTP server empty"
           version   = %{V_giflib}
  -        url       = ftp://prtr-13.ucsc.edu/pub/libungif/
  +        url       = http://prdownloads.sourceforge.net/libungif/
           regex     = giflib-(\d+\.\d+\.\d+)\.tar\.gz
       }
       prog giflib:libungif = {
  @@ -78,10 +78,6 @@
   %prep
       %setup -q -c
       %setup -q -T -D -a 1
  -    %setup -q -T -D -a 2
  -    for file in ltmain.sh ltconfig config.guess config.sub; do
  -        cp libtool-*/$file giflib-%{V_giflib}/
  -    done
   
   %build
       ( cd giflib-%{V_giflib}
  @@ -105,13 +101,15 @@
   
   %install
       rm -rf $RPM_BUILD_ROOT
  -    ( cd giflib-%{V_giflib}
  +    ( cd libungif-%{V_libungif}
         %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
       ) || exit $?
  -    ( cd libungif-%{V_libungif}
  +    ( cd giflib-%{V_giflib}
         %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
       ) || exit $?
  +%if "%{with_tools}" != "yes"
       rm -rf $RPM_BUILD_ROOT%{l_prefix}/bin
  +%endif
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
   
   %files -f files
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to