OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 06-Jun-2003 12:29:27
Branch: HEAD Handle: 2003060611292601
Modified files:
openpkg-src/proftpd proftpd.spec
openpkg-web news.txt
Log:
use getopt package to avoid conflicts, require openssl for postgresl
Summary:
Revision Changes Path
1.51 +17 -4 openpkg-src/proftpd/proftpd.spec
1.4754 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/proftpd/proftpd.spec
============================================================================
$ cvs diff -u -r1.50 -r1.51 proftpd.spec
--- openpkg-src/proftpd/proftpd.spec 5 Jun 2003 06:43:12 -0000 1.50
+++ openpkg-src/proftpd/proftpd.spec 6 Jun 2003 10:29:27 -0000 1.51
@@ -33,7 +33,7 @@
Group: FTP
License: GPL
Version: 1.2.8
-Release: 20030605
+Release: 20030606
# package options
%option with_mysql no
@@ -50,8 +50,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20030103, ncurses, make
-PreReq: OpenPKG, openpkg >= 20030103, ncurses
+BuildPreReq: OpenPKG, openpkg >= 20030103, ncurses, getopt, make
+PreReq: OpenPKG, openpkg >= 20030103, ncurses, getopt
%if "%{with_mysql}" == "yes"
BuildPreReq: MYSQL
%endif
@@ -60,7 +60,7 @@
PreReq: PAM
%endif
%if "%{with_pgsql}" == "yes"
-BuildPreReq: postgresql
+BuildPreReq: postgresql, openssl
%endif
AutoReq: no
AutoReqProv: no
@@ -83,6 +83,17 @@
%prep
%setup -q
+ # utils also require link with getopt
+ %{l_shtool} subst \
+ -e 's;\(\$(BUILD_FTPCOUNT_OBJS).*\);\1 %{l_ldflags} -lgetopt;g' \
+ -e 's;\(\$(BUILD_FTPSHUT_OBJS).*\);\1 %{l_ldflags} -lgetopt;g' \
+ -e 's;\(\$(BUILD_FTPTOP_OBJS).*\);\1 %{l_ldflags} -lgetopt;g' \
+ -e 's;\(\$(BUILD_FTPWHO_OBJS).*\);\1 %{l_ldflags} -lgetopt;g' \
+ Makefile.in
+ # libpq also requires openssl
+ %{l_shtool} subst \
+ -e 's;-lpq;-lpq -lssl -lcrypto;g' \
+ contrib/mod_sql_postgres.c
%build
# make non-standard "rundir" the same as standard "sysconfdir"
@@ -120,6 +131,7 @@
%else
CPPFLAGS="%{l_cppflags ncurses}" \
LDFLAGS="%{l_ldflags}" \
+ LIBS="-lgetopt" \
%endif
./configure \
--prefix=%{l_prefix} \
@@ -128,6 +140,7 @@
--with-modules="$MOD" \
--with-includes="$MOD_INC" \
--with-libraries="$MOD_LIB" \
+ --without-getopt \
%if "%{with_pam}" == "yes"
--enable-auth-pam
%else
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.4753 -r1.4754 news.txt
--- openpkg-web/news.txt 6 Jun 2003 10:02:57 -0000 1.4753
+++ openpkg-web/news.txt 6 Jun 2003 10:29:26 -0000 1.4754
@@ -1,3 +1,4 @@
+06-Jun-2003: Upgraded package: P<proftpd-1.2.8-20030606>
06-Jun-2003: New package: P<ghostscript-esp-7.05.6-20030606>
06-Jun-2003: New package: P<cups-1.1.19-20030606>
06-Jun-2003: Upgraded package: P<bind-9.2.2-20030606>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
