OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-web, openpkg-src Date: 18-Sep-2002 12:39:36
Branch: HEAD Handle: 2002091811393501
Modified files:
openpkg-src/imagemagick imagemagick.spec
openpkg-web news.txt
Log:
add optional Perl API support
Summary:
Revision Changes Path
1.58 +49 -5 openpkg-src/imagemagick/imagemagick.spec
1.1580 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
Index: openpkg-src/imagemagick/imagemagick.spec
============================================================
$ cvs diff -u -r1.57 -r1.58 imagemagick.spec
--- openpkg-src/imagemagick/imagemagick.spec 13 Sep 2002 08:29:29 -0000 1.57
+++ openpkg-src/imagemagick/imagemagick.spec 18 Sep 2002 10:39:36 -0000 1.58
@@ -23,6 +23,11 @@
## SUCH DAMAGE.
##
+# package options
+%ifndef with_perl
+%define with_perl no
+%endif
+
# package version
%define V_major 5.4.9
%define V_minor 1
@@ -42,7 +47,7 @@
Group: Graphics
License: GPL
Version: %{V_major}.%{V_minor}
-Release: 20020913
+Release: 20020918
# list of sources
Source0: ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-%{V_dist}.tar.gz
@@ -52,6 +57,10 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20020206, make, gcc, tiff, jpeg, bzip2, zlib,
png, freetype
PreReq: OpenPKG, openpkg >= 20020206
+%if "%{with_perl}" == "yes"
+BuildPreReq: perl
+PreReq: perl
+%endif
AutoReq: no
AutoReqProv: no
@@ -70,6 +79,7 @@
%setup -q -n ImageMagick-%{V_major}
%{l_shtool} subst \
-e 's/\([ ]*tagnames=.*echo.*tagnames,[FC][7X][7X].*\)/ if [ ".$tagnames" =
. ]; then \1; fi/' \
+ -e 's/\/magick -lMagick/\/magick\/.libs -lMagick/' \
configure
%build
@@ -93,10 +103,30 @@
%install
rm -rf $RPM_BUILD_ROOT
+
%{l_make} %{l_mflags} install \
prefix=$RPM_BUILD_ROOT%{l_prefix} \
exec_prefix=$RPM_BUILD_ROOT%{l_prefix} \
- pkgdocdir=$RPM_BUILD_ROOT%{l_prefix}/share/ImageMagick
+ pkgdocdir=$RPM_BUILD_ROOT%{l_prefix}/share/ImageMagick/
+
+%if "%{with_perl}" == "yes"
+ ( cd PerlMagick
+ %{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/lib/perl5
+ %{l_shtool} subst \
+ -e "s;-L%{l_prefix}/lib;-L$RPM_BUILD_ROOT%{l_prefix}/lib;g" \
+ -e "s;-I%{l_prefix}/include;-I$RPM_BUILD_ROOT%{l_prefix}/include;g" \
+ Makefile.PL
+ %{l_prefix}/bin/perl Makefile.PL \
+ PREFIX=$RPM_BUILD_ROOT%{l_prefix} \
+ PERL=%{l_prefix}/bin/perl \
+ FULLPERL=%{l_prefix}/bin/perl
+ %{l_make} %{l_mflags}
+ %{l_make} %{l_mflags} install
+ )
+%endif
+
+ strip $RPM_BUILD_ROOT%{l_prefix}/bin/* 2> /dev/null || true
( cd $RPM_BUILD_ROOT%{l_prefix} || exit 1
rm -rf lib/ImageMagick
rm -f bin/Magick-config
@@ -104,15 +134,29 @@
rm -f bin/iptcutil
rm -f man/man1/Magick-config.1
rm -f man/man4/miff.4
- rm -rf include
- rm -rf lib
rm -rf share/ImageMagick/www
rm -f share/ImageMagick/*.txt
rm -f share/ImageMagick/*.html
rm -rf share/ImageMagick/images
)
- strip $RPM_BUILD_ROOT%{l_prefix}/bin/* 2> /dev/null || true
+
+%if "%{with_perl}" != "yes"
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
+%else
+ eval `%{l_prefix}/bin/perl -V:installarchlib -V:installprivlib
-V:installsitearch -V:installsitelib`
+ %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
+ %{l_files_std} \
+ '%not %dir %{l_prefix}/lib/perl5' \
+ '%not %dir %{l_prefix}/lib/perl5/*' \
+ "%not %dir $installarchlib" \
+ "%not %dir $installprivlib" \
+ "%not %dir $installsitearch" \
+ "%not %dir $installsitelib" \
+ "%not %dir $installarchlib/auto" \
+ "%not %dir $installprivlib/auto" \
+ "%not %dir $installsitearch/auto" \
+ "%not %dir $installsitelib/auto"
+%endif
%files -f files
Index: openpkg-web/news.txt
============================================================
$ cvs diff -u -r1.1579 -r1.1580 news.txt
--- openpkg-web/news.txt 18 Sep 2002 09:52:05 -0000 1.1579
+++ openpkg-web/news.txt 18 Sep 2002 10:39:35 -0000 1.1580
@@ -1,3 +1,4 @@
+18-Sep-2002: Upgraded package: P<imagemagick-5.4.9.1-20020918>
18-Sep-2002: New package: P<doclifter-1.0.1-20020918>
18-Sep-2002: Upgraded package: P<vim-6.1.186-20020918>
18-Sep-2002: Upgraded package: P<perl-xml-20020918-20020918>
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
