Author: glen Date: Sat Apr 29 10:33:39 2006 GMT
Module: SPECS Tag: DEVEL
---- Log message:
- builds. not tested
---- Files affected:
SPECS:
proftpd.spec (1.211.2.3 -> 1.211.2.4)
---- Diffs:
================================================================
Index: SPECS/proftpd.spec
diff -u SPECS/proftpd.spec:1.211.2.3 SPECS/proftpd.spec:1.211.2.4
--- SPECS/proftpd.spec:1.211.2.3 Sat Apr 29 11:35:46 2006
+++ SPECS/proftpd.spec Sat Apr 29 12:33:33 2006
@@ -1,4 +1,6 @@
# $Revision$, $Date$
+# TODO
+# - mod_caps uses uname -r for detection
# Conditional build:
%bcond_without pam # disable PAM support
%bcond_without ipv6 # disable IPv6 and TCPD support
@@ -10,7 +12,7 @@
%bcond_with quotaldap # enable quota ldap support
%bcond_with quotamysql # enable quota mysql support
%bcond_with quotapgsql # enable quota pgsql support
-%bcond_with dso # enable DSO (available since 1.3.0)
+%bcond_without dso # enable DSO (available since 1.3.0)
%bcond_with linuxprivs # enable libcap support
%define with_dso 1
@@ -44,6 +46,7 @@
Patch4: %{name}-wtmp.patch
Patch5: %{name}-sendfile64.patch
Patch6: %{name}-CAN-2005-2390.patch
+Patch7: %{name}-configure.patch
URL: http://www.proftpd.org/
BuildRequires: autoconf
BuildRequires: automake
@@ -187,22 +190,23 @@
%endif
%setup -q -a 8 -n %{name}-%{version}%{?_rc}
-%patch0 -p1
-%patch1 -p1
+#%patch0 -p1
+#%patch1 -p1
#%patch2 -p1
-%patch3 -p1
-%patch4 -p1
+#%patch3 -p1
+#%patch4 -p1
#%patch5 -p1
#%patch6 -p1
+%patch7 -p1
# move mod_shaper code on to the source tree
mv mod_shaper/mod_shaper.c contrib/
%build
cp -f /usr/share/automake/config.sub .
%{__autoconf}
-RUN_DIR=%{_localstatedir} ; export RUN_DIR
-CFLAGS="%{rpmcflags} -I%{_includedir}/ncurses
%{?with_mysql:-I%{_includedir}/mysql}"
-CPPFLAGS="%{rpmcflags} -I%{_includedir}/ncurses
%{?with_mysql:-I%{_includedir}/mysql}"
+#RUN_DIR=%{_localstatedir} ; export RUN_DIR
+#CFLAGS="%{rpmcflags} -I%{_includedir}/ncurses
%{?with_mysql:-I%{_includedir}/mysql}"
+#CPPFLAGS="%{rpmcflags} -I%{_includedir}/ncurses
%{?with_mysql:-I%{_includedir}/mysql}"
MODULES="
mod_ratio
@@ -221,14 +225,17 @@
%{?with_pgsql:mod_sql mod_sql_postgres}
"
+MODARG=$(echo $MODULES | xargs | tr ' ' ':')
+
%configure \
--enable-autoshadow \
- %{?with_dso:--enable-dso --with-shared=$(echo $MODULES | tr ' ' ':')} \
- %{!?with_dso:--with-modules=$(echo $MODULES | tr ' ' ':')} \
+ %{?with_dso:--enable-dso --with-shared=$MODARG} \
+ %{!?with_dso:--with-modules=$MODARG} \
%{?with_ipv6:--enable-ipv6} \
%{!?with_ssl:--disable-tls} \
--enable-ctrls \
- --enable-sendfile
+ --enable-sendfile \
+ --enable-facl
%{__make}
@@ -242,7 +249,6 @@
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT \
- LIBEXECDIR=$RPM_BUILD_ROOT%{_libdir}/%{name} \
INSTALL_USER=%(id -u) \
INSTALL_GROUP=%(id -g)
@@ -268,6 +274,7 @@
rm -f $RPM_BUILD_ROOT%{_mandir}/ftpusers-path.diff*
%if %{with dso}
+mv $RPM_BUILD_ROOT%{_libdir}/mod_* $RPM_BUILD_ROOT%{_libdir}/%{name}
rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.a
rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la
%endif
@@ -413,6 +420,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.211.2.4 2006/04/29 10:33:33 glen
+- builds. not tested
+
Revision 1.211.2.3 2006/04/29 09:35:46 glen
- 1.3.0 tarball
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/proftpd.spec?r1=1.211.2.3&r2=1.211.2.4&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
