Author: glen Date: Sat Apr 29 11:25:44 2006 GMT
Module: SPECS Tag: DEVEL
---- Log message:
- reviewed patches, clean duplicate BR
---- Files affected:
SPECS:
proftpd.spec (1.211.2.9 -> 1.211.2.10)
---- Diffs:
================================================================
Index: SPECS/proftpd.spec
diff -u SPECS/proftpd.spec:1.211.2.9 SPECS/proftpd.spec:1.211.2.10
--- SPECS/proftpd.spec:1.211.2.9 Sat Apr 29 13:04:48 2006
+++ SPECS/proftpd.spec Sat Apr 29 13:25:39 2006
@@ -42,21 +42,17 @@
Patch3: %{name}-noautopriv.patch
Patch4: %{name}-wtmp.patch
Patch5: %{name}-sendfile64.patch
-Patch6: %{name}-CAN-2005-2390.patch
-Patch7: %{name}-configure.patch
+Patch6: %{name}-configure.patch
URL: http://www.proftpd.org/
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libwrap-devel
%{?with_quotamysql:BuildRequires: mysql-devel}
-%{?with_quotamysql:BuildRequires: mysql-devel}
BuildRequires: ncurses-devel
%{?with_quotaldap:BuildRequires: openldap-devel}
-%{?with_quotaldap:BuildRequires: openldap-devel}
%{?with_ssl:BuildRequires: openssl-devel >= 0.9.7d}
%{?with_pam:BuildRequires: pam-devel}
%{?with_quotapgsql:BuildRequires: postgresql-devel}
-%{?with_quotapgsql:BuildRequires: postgresql-devel}
BuildRequires: rpmbuild(macros) >= 1.268
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -203,14 +199,13 @@
%prep
%setup -q -a 8 -n %{name}-%{version}%{?_rc}
-#%patch0 -p1
-#%patch1 -p1
-#%patch2 -p1
-#%patch3 -p1
-#%patch4 -p1
-#%patch5 -p1
-#%patch6 -p1
-%patch7 -p1
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+#%patch5 -p1 NEEDS UPDATE
+%patch6 -p1
# move mod_shaper code on to the source tree
mv mod_shaper/mod_shaper.c contrib/
@@ -412,6 +407,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.211.2.10 2006/04/29 11:25:39 glen
+- reviewed patches, clean duplicate BR
+
Revision 1.211.2.9 2006/04/29 11:04:48 glen
- merge %service and epoch fixes from HEAD
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/proftpd.spec?r1=1.211.2.9&r2=1.211.2.10&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
