pali pushed to cherokee (epel7). "conflict fix, rpath fix"

[notifications at fedoraproject.org]

>From 77a76106415a2d94946db664e66d48dbab4c5b67 Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot at fedoraproject.org>
Date: Thu, 6 Nov 2008 18:54:30 +0000
Subject: conflict fix, rpath fix


diff --git a/cherokee.spec b/cherokee.spec
index a3b2c34..7da99d0 100644
--- a/cherokee.spec
+++ b/cherokee.spec
@@ -3,7 +3,7 @@
 
 Name:           cherokee
 Version:        0.10.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Flexible and Fast Webserver
 
 Group:          Applications/Internet
@@ -15,6 +15,8 @@ Source1:        %{name}.init
 Source2:        %{name}.logrotate
 
 BuildRequires:  openssl-devel pam-devel pcre-devel mysql-devel
+# For spawn-fcgi
+Requires:	lighttpd-fastcgi
 Requires(post): chkconfig
 Requires(preun): chkconfig
 Requires(preun): initscripts
@@ -41,11 +43,11 @@ This package holds the development files for cherokee.
 %prep
 %setup -q
 
-
 %build
-%configure \
-    --with-wwwroot=%{_var}/www/%{name} \
-    --enable-tls=openssl --enable-pthreads --enable-trace --disable-static
+%configure --with-wwwroot=%{_var}/www/%{name} --enable-tls=openssl --enable-pthreads --enable-trace --disable-static --disable-rpath
+# Get rid of rpath
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 make %{?_smp_mflags}
 
 
@@ -75,6 +77,11 @@ mv ChangeLog ChangeLog.iso8859-1
 chmod -x COPYING
 iconv -f ISO8859-1 -t UTF8 ChangeLog.iso8859-1 > ChangeLog
 
+# Get rid of spawn-fcgi bits, they conflict with the lighttpd-fastcgi package
+# but are otherwise identical.
+rm -rf %{buildroot}%{_bindir}/spawn-fcgi
+rm -rf %{buildroot}%{_mandir}/man1/spawn-fcgi.*
+
 
 %clean
 rm -rf %{buildroot}
@@ -111,7 +118,7 @@ fi
 %{_bindir}/cget
 %{_bindir}/cherokee-panic
 %{_bindir}/cherokee-tweak
-%{_bindir}/spawn-fcgi
+# %%{_bindir}/spawn-fcgi
 %{_sbindir}/cherokee
 %{_sbindir}/cherokee-admin
 %{_sbindir}/cherokee-worker
@@ -128,7 +135,7 @@ fi
 %doc %{_mandir}/man1/cherokee-tweak.1*
 %doc %{_mandir}/man1/cherokee-admin.1*
 %doc %{_mandir}/man1/cherokee-worker.1*
-%doc %{_mandir}/man1/spawn-fcgi.1*
+# %%doc %{_mandir}/man1/spawn-fcgi.1*
 %dir %{_var}/www/%{name}/
 %dir %{_var}/www/%{name}/images/
 %config(noreplace) %{_var}/www/%{name}/images/cherokee-logo.png
@@ -148,6 +155,10 @@ fi
 
 
 %changelog
+* Thu Nov  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.10.0-2
+- do not package spawn-fcgi files (lighttpd-fastcgi provides them)
+  Resolves bz 469947
+- get rid of rpath in compiled files
 * Fri Oct 31 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.10.0-1
 - updated to 0.10.0
 * Sun Sep 07 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.8.1-2
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/cherokee.git/commit/?h=epel7&id=77a76106415a2d94946db664e66d48dbab4c5b67