From 369976b9a0f04fdf2023705bf43aae7a1a617eb9 Mon Sep 17 00:00:00 2001
From: Matthias Saou <thias@fedoraproject.org>
Date: Apr 28 2006 09:23:46 +0000
Subject: Mark some more config files as noreplace, fix nasty -rpath (#190122).


---

diff --git a/proftpd-1.3.0-rpath.patch b/proftpd-1.3.0-rpath.patch
new file mode 100644
index 0000000..a3967cc
--- /dev/null
+++ b/proftpd-1.3.0-rpath.patch
@@ -0,0 +1,24 @@
+diff -Naupr proftpd-1.3.0.orig/configure proftpd-1.3.0/configure
+--- proftpd-1.3.0.orig/configure	2006-03-09 19:20:04.000000000 +0100
++++ proftpd-1.3.0.orig/configure	2006-03-09 19:20:04.000000000 +0100
+@@ -19660,7 +19660,7 @@ if test "${enable_dso+set}" = set; then
+       ac_build_core_modules="$ac_build_core_modules modules/mod_dso.o"
+       ac_build_addl_includes="$INCLTDL $ac_build_addl_includes"
+ 
+-      MAIN_LDFLAGS="-L\$(top_srcdir)/lib/libltdl -dlopen self -export-dynamic -rpath \$(DESTDIR)\$(sbindir)"
++      MAIN_LDFLAGS="-L\$(top_srcdir)/lib/libltdl -dlopen self -export-dynamic"
+       MAIN_LIBS="\$(LIBLTDL)"
+ 
+       MODULE_LDFLAGS="-avoid-version -export-dynamic -module"
+diff -Naupr proftpd-1.3.0.orig/configure.in proftpd-1.3.0/configure.in
+--- proftpd-1.3.0.orig/configure.in	2006-03-09 19:12:35.000000000 +0100
++++ proftpd-1.3.0.orig/configure.in	2006-03-09 19:12:35.000000000 +0100
+@@ -372,7 +372,7 @@ AC_ARG_ENABLE(dso,
+       ac_build_core_modules="$ac_build_core_modules modules/mod_dso.o"
+       ac_build_addl_includes="$INCLTDL $ac_build_addl_includes"
+ 
+-      MAIN_LDFLAGS="-L\$(top_srcdir)/lib/libltdl -dlopen self -export-dynamic -rpath \$(DESTDIR)\$(sbindir)"
++      MAIN_LDFLAGS="-L\$(top_srcdir)/lib/libltdl -dlopen self -export-dynamic"
+       MAIN_LIBS="\$(LIBLTDL)"
+ 
+       MODULE_LDFLAGS="-avoid-version -export-dynamic -module"
diff --git a/proftpd.spec b/proftpd.spec
index 4c3939f..712b585 100644
--- a/proftpd.spec
+++ b/proftpd.spec
@@ -1,7 +1,7 @@
 Summary: Flexible, stable and highly-configurable FTP server
 Name: proftpd
 Version: 1.3.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.proftpd.org/
@@ -12,6 +12,7 @@ Source3: proftpd-xinetd
 Source4: proftpd.logrotate
 Source5: welcome.msg
 Source6: proftpd.pam
+Patch0: proftpd-1.3.0-rpath.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: pam >= 0.59
 Requires(post): /sbin/chkconfig
@@ -62,6 +63,7 @@ Module to add PostgreSQL support to the ProFTPD FTP server.
 
 %prep
 %setup
+%patch0 -p1 -b .rpath
 
 
 %build
@@ -144,8 +146,8 @@ fi
 %config(noreplace) %{_sysconfdir}/proftpd.conf
 %config(noreplace) %{_sysconfdir}/xinetd.d/xproftpd
 %config %{_sysconfdir}/ftpusers
-%config %{_sysconfdir}/pam.d/proftpd
-%config %{_sysconfdir}/logrotate.d/proftpd
+%config(noreplace) %{_sysconfdir}/pam.d/proftpd
+%config(noreplace) %{_sysconfdir}/logrotate.d/proftpd
 %{_sysconfdir}/rc.d/init.d/proftpd
 %{_mandir}/*/*
 %{_bindir}/*
@@ -177,6 +179,11 @@ fi
 
 
 %changelog
+* Fri Apr 28 2006 Matthias Saou <http://freshrpms.net/> 1.3.0-2
+- Mark pam.d and logrotate.d config files as noreplace.
+- Include patch to remove -rpath to DESTDIR/usr/sbin/ in the proftpd binary
+  when DSO is enabled (#190122).
+
 * Fri Apr 21 2006 Matthias Saou <http://freshrpms.net/> 1.3.0-1
 - Update to 1.3.0 final.
 - Remove no longer needed PostgreSQL and OpenSSL detection workarounds.