- adapterized (avoid macros with /usr/include/{ncurses,freetype}*)

Changed files:
    proftpd.spec -> 1.214

diff --git a/proftpd.spec b/proftpd.spec
index 286e388d568a71cabc0ebe6fa3b6b1ee2b0efc56..e64d70218103a747722a80ab28b671338c7d727a 100644 (file)
--- a/proftpd.spec
+++ b/proftpd.spec
@@ -119,12 +119,12 @@ This package also includes mod_shaper module from
 Summary:       inetd configs for proftpd
 Summary(pl):   Pliki konfiguracyjne do u¿ycia proftpd poprzez inetd
 Group:         Daemons
-PreReq:                %{name}-common = %{epoch}:%{version}-%{release}
-PreReq:                rc-inetd
 Requires(post):        fileutils
 Requires(post):        grep
 Requires(post):        sed >= 4.0
 Requires(triggerpostun):       sed >= 4.0
+Requires:      %{name}-common = %{epoch}:%{version}-%{release}
+Requires:      rc-inetd
 Provides:      proftpd = %{epoch}:%{version}-%{release}
 Provides:      ftpserver
 Obsoletes:     proftpd-standalone
@@ -152,13 +152,13 @@ Pliki konfiguracyjna ProFTPD do startowania demona poprzez inetd.
 Summary:       Standalone daemon configs for proftpd
 Summary(pl):   Pliki konfiguracyjne do startowania proftpd w trybie standalone
 Group:         Daemons
-PreReq:                %{name}-common = %{epoch}:%{version}-%{release}
-PreReq:                rc-scripts
-Requires(post,preun):  /sbin/chkconfig
 Requires(post):        fileutils
 Requires(post):        grep
 Requires(post):        sed >= 4.0
+Requires(post,preun):  /sbin/chkconfig
 Requires(triggerpostun):       sed >= 4.0
+Requires:      %{name}-common = %{epoch}:%{version}-%{release}
+Requires:      rc-scripts
 Provides:      proftpd = %{epoch}:%{version}-%{release}
 Provides:      ftpserver
 Obsoletes:     proftpd-inetd
@@ -204,8 +204,8 @@ mv mod_shaper/mod_shaper.c contrib/
 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}"
+CFLAGS="%{rpmcflags} -I/usr/include/ncurses %{?with_mysql:-I%{_includedir}/mysql}"
+CPPFLAGS="%{rpmcflags} -I/usr/include/ncurses %{?with_mysql:-I%{_includedir}/mysql}"
 
 MODULES="
 mod_ratio