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: 30-Dec-2002 16:28:12
Branch: HEAD Handle: 2002123015281101
Modified files:
openpkg-src/imagemagick imagemagick.spec
openpkg-web news.txt
Log:
switch to %option(s) and %l_cppflags
Summary:
Revision Changes Path
1.77 +9 -15 openpkg-src/imagemagick/imagemagick.spec
1.2439 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/imagemagick/imagemagick.spec
============================================================================
$ cvs diff -u -r1.76 -r1.77 imagemagick.spec
--- openpkg-src/imagemagick/imagemagick.spec 29 Dec 2002 08:44:13 -0000 1.76
+++ openpkg-src/imagemagick/imagemagick.spec 30 Dec 2002 15:28:12 -0000 1.77
@@ -24,12 +24,8 @@
##
# package options
-%ifndef with_perl
-%define with_perl %{l_test -p perl}
-%endif
-%ifndef with_x11
-%define with_x11 %{l_test -p x11}
-%endif
+%option with_perl %{l_test -p perl}
+%option with_x11 %{l_test -p x11}
# package version
%define V_major 5.5.3
@@ -50,7 +46,7 @@
Group: Graphics
License: GPL
Version: %{V_major}.%{V_minor}
-Release: 20021229
+Release: 20021230
# list of sources
Source0: ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-%{V_dist}.tar.gz
@@ -58,8 +54,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20021204, make, gcc, tiff, jpeg, bzip2, zlib,
png, freetype
-PreReq: OpenPKG, openpkg >= 20021204
+BuildPreReq: OpenPKG, openpkg >= 20021230, make, gcc, tiff, jpeg, bzip2, zlib,
png, freetype
+PreReq: OpenPKG, openpkg >= 20021230
%if "%{with_perl}" == "yes"
BuildPreReq: perl
PreReq: perl
@@ -82,9 +78,7 @@
Image processing operations are available from the command line, as
well as through C, C++, and PERL-based programming interfaces.
- Options:
- --define 'with_perl %{with_perl}'
- --define 'with_x11 %{with_x11}'
+ %options
%prep
%setup -q -n ImageMagick-%{V_major}
@@ -97,10 +91,10 @@
%build
CC="%{l_cc}" \
CXX="%{l_cxx}" \
- CFLAGS="%{l_cflags -O} -I%{l_prefix}/include -I%{l_prefix}/include/tiff" \
- CPPFLAGS="-I%{l_prefix}/include -I%{l_prefix}/include/tiff" \
+ CFLAGS="%{l_cflags -O} %{l_cppflags tiff}" \
+ CPPFLAGS="%{l_cppflags tiff}" \
CXXFLAGS="%{l_cxxflags -O}" \
- LDFLAGS="-L%{l_prefix}/lib" \
+ LDFLAGS="%{l_ldflags}" \
./configure \
--prefix=%{l_prefix} \
--without-magick-plus-plus \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.2438 -r1.2439 news.txt
--- openpkg-web/news.txt 30 Dec 2002 15:25:48 -0000 1.2438
+++ openpkg-web/news.txt 30 Dec 2002 15:28:11 -0000 1.2439
@@ -1,3 +1,4 @@
+30-Dec-2002: Upgraded package: P<imagemagick-5.5.3.1-20021230>
30-Dec-2002: Upgraded package: P<ghostscript-8.00-20021230>
30-Dec-2002: Upgraded package: P<gcc-3.2.1-20021230>
30-Dec-2002: Upgraded package: P<fsl-1.0.6-20021230>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
