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: 04-Feb-2005 20:56:50
Branch: HEAD Handle: 2005020419564900
Modified files:
openpkg-src/gift gift.spec
Log:
imagemagick is no longer required with giFT 0.11.8 and our vorbis-libs
package contains both libvorbis and libogg, so use both
Summary:
Revision Changes Path
1.12 +5 -13 openpkg-src/gift/gift.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/gift/gift.spec
============================================================================
$ cvs diff -u -r1.11 -r1.12 gift.spec
--- openpkg-src/gift/gift.spec 1 Jan 2005 10:49:32 -0000 1.11
+++ openpkg-src/gift/gift.spec 4 Feb 2005 19:56:49 -0000 1.12
@@ -34,11 +34,10 @@
Group: Network
License: GPL
Version: 0.11.8.1
-Release: 20041128
+Release: 20050204
# package options
-%option with_imagemagick yes
-%option with_vorbis yes
+%option with_vorbis yes
# list of sources
Source0: http://osdn.dl.sourceforge.net/gift/gift-%{version}.tar.bz2
@@ -51,10 +50,6 @@
PreReq: OpenPKG, openpkg >= 20040130
BuildPreReq: file
PreReq: file
-%if "%{with_imagemagick}" == "yes"
-BuildPreReq: imagemagick
-PreReq: imagemagick
-%endif
%if "%{with_vorbis}" == "yes"
BuildPreReq: vorbis-libs
PreReq: vorbis-libs
@@ -89,17 +84,14 @@
./configure \
--prefix=%{l_prefix} \
--enable-libmagic \
-%if "%{with_imagemagick}" == "yes"
- --enable-imagemagick \
- --with-Magick=%{l_prefix} \
-%else
- --disable-imagemagick \
-%endif
%if "%{with_vorbis}" == "yes"
--enable-libvorbis \
+ --enable-libogg \
--with-vorbis=%{l_prefix} \
+ --with-ogg=%{l_prefix} \
%else
--disable-libvorbis \
+ --disable-ogg \
%endif
--disable-shared
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
