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 openpkg$ Date: 19-Sep-2003 11:18:24
Branch: HEAD Handle: 2003091910182202
Modified files:
openpkg-re/vcheck vc.aspell
openpkg-src/aspell aspell.spec
openpkg-web news.txt
Log:
add optional Perl API
Summary:
Revision Changes Path
1.4 +5 -0 openpkg-re/vcheck/vc.aspell
1.19 +78 -23 openpkg-src/aspell/aspell.spec
1.6645 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/vcheck/vc.aspell
============================================================================
$ cvs diff -u -r1.3 -r1.4 vc.aspell
--- openpkg-re/vcheck/vc.aspell 19 Apr 2003 06:07:02 -0000 1.3
+++ openpkg-re/vcheck/vc.aspell 19 Sep 2003 09:18:22 -0000 1.4
@@ -16,4 +16,9 @@
url = ftp://ftp.gnu.org/gnu/aspell/dict/en/
regex = aspell-en-(__VER__)\.tar\.bz2
}
+prog aspell:aspell-perl = {
+ version = 0.03
+ url = http://www.cpan.org/modules/by-module/Text/
+ regex = Text-Aspell-(__VER__)\.tar\.gz
+}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/aspell/aspell.spec
============================================================================
$ cvs diff -u -r1.18 -r1.19 aspell.spec
--- openpkg-src/aspell/aspell.spec 24 Jul 2003 11:38:25 -0000 1.18
+++ openpkg-src/aspell/aspell.spec 19 Sep 2003 09:18:24 -0000 1.19
@@ -24,9 +24,10 @@
##
# package version
-%define V_aspell 0.50.3
-%define V_aspell_en 0.51-0
-%define V_aspell_de 0.50-2
+%define V_aspell 0.50.3
+%define V_aspell_en 0.51-0
+%define V_aspell_de 0.50-2
+%define V_aspell_perl 0.03
# package information
Name: aspell
@@ -38,12 +39,16 @@
Group: Text
License: GPL
Version: %{V_aspell}
-Release: 20030724
+Release: 20030919
+
+# package options
+%option with_perl no
# list of sources
Source0: ftp://ftp.gnu.org/gnu/aspell/aspell-%{V_aspell}.tar.gz
Source1: ftp://ftp.gnu.org/gnu/aspell/dict/en/aspell-en-%{V_aspell_en}.tar.bz2
Source2: ftp://ftp.gnu.org/gnu/aspell/dict/de/aspell-de-%{V_aspell_de}.tar.bz2
+Source3:
http://www.cpan.org/modules/by-module/Text/Text-Aspell-%{V_aspell_perl}.tar.gz
Patch0: aspell.patch
# build information
@@ -51,6 +56,10 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20030708, gcc, ncurses
PreReq: OpenPKG, openpkg >= 20030708, ncurses, perl
+%if "%{with_perl}" == "yes"
+BuildPreReq: perl, perl-openpkg
+PreReq: perl, perl-openpkg
+%endif
AutoReq: no
AutoReqProv: no
@@ -66,28 +75,46 @@
when more than one Aspell process is open at once.
%prep
- %setup0 -q -c
- %setup1 -q -T -D -a 1
- %setup2 -q -T -D -a 2
- %patch0 -p0
+ %setup -q -c
+ %setup -q -T -D -a 1
+ %setup -q -T -D -a 2
+%if "%{with_perl}" == "yes"
+ %setup -q -T -D -a 3
+%endif
+ %patch -p0 -P 0
%build
- # configure GNU aspell
- cd aspell-%{V_aspell}
- CC="%{l_cc}" \
- CXX="%{l_cxx}" \
- CFLAGS="%{l_cflags -O}" \
- CXXFLAGS="%{l_cxxflags -O}" \
- CPPFLAGS="%{l_cppflags}" \
- ./configure \
- --prefix=%{l_prefix} \
- --sysconfdir=%{l_prefix}/etc/aspell \
- --enable-curses-include=%{l_prefix}/include/ncurses \
- --enable-curses="%{l_ldflags} -lncurses" \
- --disable-shared
+ ( cd aspell-%{V_aspell}
+ # configure GNU aspell
+ CC="%{l_cc}" \
+ CXX="%{l_cxx}" \
+ CFLAGS="%{l_cflags -O}" \
+ CXXFLAGS="%{l_cxxflags -O}" \
+ CPPFLAGS="%{l_cppflags}" \
+ ./configure \
+ --prefix=%{l_prefix} \
+ --sysconfdir=%{l_prefix}/etc/aspell \
+ --enable-curses-include=%{l_prefix}/include/ncurses \
+ --enable-curses="%{l_ldflags} -lncurses" \
+ --disable-shared
- # build GNU aspell
- %{l_make} %{l_mflags -O}
+ # build GNU aspell
+ %{l_make} %{l_mflags -O}
+ ) || exit $?
+
+ # optionally build Perl API
+%if "%{with_perl}" == "yes"
+ ( cd Text-Aspell-%{V_aspell_perl}
+ %{l_prefix}/bin/perl Makefile.PL \
+ PERL="%{l_prefix}/bin/perl" \
+ FULLPERL="%{l_prefix}/bin/perl" \
+ PREFIX=$RPM_BUILD_ROOT%{l_prefix} \
+ INSTALLDIRS=site \
+ CCFLAGS="-I`pwd`/../aspell-%{V_aspell}/interfaces/cc" \
+ LIBS="-L`pwd`/../aspell-%{V_aspell}/lib/.libs -laspell"
+ %{l_make} %{l_mflags -O} pure_all
+ ) || exit $?
+%endif
%install
rm -rf $RPM_BUILD_ROOT
@@ -99,6 +126,7 @@
-e 's;/usr/bin/perl;%{l_prefix}/bin/perl;' \
$RPM_BUILD_ROOT%{l_prefix}/bin/aspell-import
rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/doc
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/run-with-aspell
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/lib/aspell
@@ -127,7 +155,34 @@
%{l_make} %{l_mflags} install
) || exit $?
+ # optionally install Perl API
+%if "%{with_perl}" == "yes"
+ ( cd Text-Aspell-%{V_aspell_perl}
+ %{l_make} %{l_mflags -O} pure_install \
+ PERL="%{l_prefix}/bin/perl" \
+ FULLPERL="%{l_prefix}/bin/perl" \
+ PREFIX=$RPM_BUILD_ROOT%{l_prefix} \
+ INSTALLDIRS=site \
+ ) || exit $?
+%endif
+
+%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/perl" \
+ "%not %dir %{l_prefix}/lib/perl/*" \
+ "%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
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6644 -r1.6645 news.txt
--- openpkg-web/news.txt 19 Sep 2003 08:36:18 -0000 1.6644
+++ openpkg-web/news.txt 19 Sep 2003 09:18:22 -0000 1.6645
@@ -1,3 +1,4 @@
+19-Sep-2003: Upgraded package: P<aspell-0.50.3-20030919>
19-Sep-2003: Upgraded package: P<mysql-4.0.15a-20030919>
19-Sep-2003: Upgraded package: P<pgadmin-0.9.3.20030919-20030919>
19-Sep-2003: Upgraded package: P<mplayer-1.0pre1-20030919>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
