From bbddbc091b452e63ee2684a3f9494e6fde91e59e Mon Sep 17 00:00:00 2001 From: wk333 <13474090681@163.com> Date: Wed, 27 Dec 2023 10:12:29 +0800 Subject: [PATCH] Replace vendor with openEuler marco --- proftpd.spec | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/proftpd.spec b/proftpd.spec index d5a1fee..617ae10 100644 --- a/proftpd.spec +++ b/proftpd.spec @@ -18,11 +18,9 @@ %global mod_vroot_version 0.9.11 -%global vendor %{?_vendor:%{_vendor}}%{!?_vendor:openEuler} - Name: proftpd Version: 1.3.8b -Release: 1 +Release: 2 Summary: Flexible, stable and highly-configurable FTP server License: GPLv2+ URL: http://www.proftpd.org/ @@ -61,7 +59,7 @@ BuildRequires: pcre-devel >= 7.0 BuildRequires: perl-generators BuildRequires: perl-interpreter BuildRequires: pkgconfig -%if %{?vendor:1}0 +%if %{?openEuler:1}0 BuildRequires: postgresql-devel %endif BuildRequires: sed @@ -141,7 +139,7 @@ Requires: openssl-devel Requires: pam-devel Requires: pcre-devel Requires: pkgconfig -%if %{?vendor:1}0 +%if %{?openEuler:1}0 Requires: postgresql-devel %endif Requires: sqlite-devel @@ -168,7 +166,7 @@ Requires: %{name} = %{version}-%{release} %description mysql Module to add MySQL support to the ProFTPD FTP server. -%if %{?vendor:1}0 +%if %{?openEuler:1}0 %package postgresql Summary: Module to add PostgreSQL support to the ProFTPD FTP server Requires: %{name} = %{version}-%{release} @@ -262,7 +260,7 @@ find doc/ contrib/ -name '*.orig' -delete %build # Modules to be built as DSO's (excluding mod_ifsession, always specified last) -%if %{?vendor:1}0 +%if %{?openEuler:1}0 SMOD1=mod_sql:mod_sql_passwd:mod_sql_mysql:mod_sql_postgres:mod_sql_sqlite %else SMOD1=mod_sql:mod_sql_passwd:mod_sql_mysql:mod_sql_sqlite @@ -511,7 +509,7 @@ fi %files mysql %{_libexecdir}/proftpd/mod_sql_mysql.so -%if %{?vendor:1}0 +%if %{?openEuler:1}0 %files postgresql %{_libexecdir}/proftpd/mod_sql_postgres.so %endif @@ -535,6 +533,9 @@ fi %{_mandir}/man1/ftpwho.1* %changelog +* Wed Dec 27 2023 wangkai <13474090681@163.com> - 1.3.8b-2 +- Replace vendor with openEuler marco + * Tue Dec 26 2023 wangkai <13474090681@163.com> - 1.3.8b-1 - Update to 1.3.8b for fix CVE-2023-51713,CVE-2023-48795