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: 22-Dec-2007 20:01:36
Branch: HEAD Handle: 2007122219013600
Modified files:
openpkg-src/giflib giflib.spec
Removed files:
openpkg-src/giflib giflib.patch
Log:
reduce packaging to original giflib as libungif is no longer
maintained because no longer needed (LZW patent on GIF already expired
in 2003)
Summary:
Revision Changes Path
1.2 +0 -20 openpkg-src/giflib/giflib.patch
1.31 +26 -64 openpkg-src/giflib/giflib.spec
____________________________________________________________________________
rm -f openpkg-src/giflib/giflib.patch <<'@@ .'
Index: openpkg-src/giflib/giflib.patch
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/giflib/giflib.spec
============================================================================
$ cvs diff -u -r1.30 -r1.31 giflib.spec
--- openpkg-src/giflib/giflib.spec 1 Jan 2007 17:38:07 -0000 1.30
+++ openpkg-src/giflib/giflib.spec 22 Dec 2007 19:01:36 -0000 1.31
@@ -22,104 +22,66 @@
## SUCH DAMAGE.
##
-# package versions
-%define V_main 4.1.4
-%define V_giflib 4.1.4
-%define V_libungif 4.1.4
-
# package information
Name: giflib
Summary: Graphics Interchange Format Library
-URL: http://sourceforge.net/projects/libungif/
+URL: http://sourceforge.net/projects/giflib/
Vendor: Gershon Elbor, Eric S. Raymond, Toshio Kuratomi
Packager: OpenPKG Foundation e.V.
Distribution: OpenPKG Community
Class: PLUS
Group: Graphics
License: LGPL
-Version: %{V_main}
-Release: 20061013
+Version: 4.1.6
+Release: 20071222
# package options
%option with_tools no
# list of sources
-Source0:
http://switch.dl.sourceforge.net/sourceforge/libungif/giflib-%{V_giflib}.tar.gz
-Source1:
http://switch.dl.sourceforge.net/sourceforge/libungif/libungif-%{V_libungif}.tar.gz
-Patch0: giflib.patch
+Source0:
http://switch.dl.sourceforge.net/giflib/giflib-%{version}.tar.gz
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, gcc, autoconf
+BuildPreReq: OpenPKG, openpkg >= 20040130, gcc
PreReq: OpenPKG, openpkg >= 20040130
AutoReq: no
AutoReqProv: no
%description
- These are manipulation libraries for Graphics Interchange Format
- (GIF) images. This package contains both giflib (supports
- compression but requires licensing) and libungif (supports no
- compression, hence does not require licensing). Both are source and
- binary compatible.
+ This is a manipulation library and corresponding utilities for the
+ popular Graphics Interchange Format (GIF) image format.
%track
- prog giflib:giflib = {
- version = %{V_giflib}
- url = http://prdownloads.sourceforge.net/libungif/
+ prog giflib = {
+ version = %{version}
+ url = http://prdownloads.sourceforge.net/giflib/
regex = giflib-(\d+\.\d+\.\d+)\.tar\.gz
}
- prog giflib:libungif = {
- version = %{V_libungif}
- url = http://prdownloads.sourceforge.net/libungif/
- regex = libungif-(\d+\.\d+\.\d+)\.tar\.gz
- }
%prep
- %setup -q -c
- %setup -q -T -D -a 1
- %patch -p0 -d giflib-%{V_giflib}
+ %setup -q
%build
- ( cd giflib-%{V_giflib}
- %{l_prefix}/bin/autoconf
- %{l_prefix}/bin/autoheader
- echo "ac_cv_lib_X11_main=no" >config.cache
- AUTOCONF="true" \
- AUTOHEADER="true" \
- AUTOMAKE="true" \
- ACLOCAL="true" \
- CC="%{l_cc}" \
- CFLAGS="%{l_cflags -O}" \
- GREP="grep" \
- ./configure \
- --cache-file=./config.cache \
- --prefix=%{l_prefix} \
- --without-x \
- --disable-shared
- %{l_make} %{l_mflags -O}
- ) || exit $?
- ( cd libungif-%{V_libungif}
- echo "ac_cv_lib_X11_main=no" >config.cache
- CC="%{l_cc}" \
- CFLAGS="%{l_cflags -O}" \
- GREP="grep" \
- ./configure \
- --cache-file=./config.cache \
- --prefix=%{l_prefix} \
- --without-x \
- --disable-shared
- %{l_make} %{l_mflags -O}
- ) || exit $?
+ echo "ac_cv_lib_X11_main=no" >config.cache
+ AUTOCONF="true" \
+ AUTOHEADER="true" \
+ AUTOMAKE="true" \
+ ACLOCAL="true" \
+ CC="%{l_cc}" \
+ CFLAGS="%{l_cflags -O}" \
+ GREP="grep" \
+ ./configure \
+ --cache-file=./config.cache \
+ --prefix=%{l_prefix} \
+ --without-x \
+ --disable-shared
+ %{l_make} %{l_mflags -O}
%install
rm -rf $RPM_BUILD_ROOT
- ( cd libungif-%{V_libungif}
- %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
- ) || exit $?
- ( cd giflib-%{V_giflib}
- %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
- ) || exit $?
+ %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
%if "%{with_tools}" != "yes"
rm -rf $RPM_BUILD_ROOT%{l_prefix}/bin
%endif
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
