rpms/cherokee/EL-4 cherokee.spec,1.2,1.3 import.log,1.2,1.3
Pavel Lisý
pali at fedoraproject.org
Tue Dec 16 16:40:13 UTC 2008
- Previous message (by thread): rpms/gvfs/F-10 gvfs-1.1.2-http-leak.patch, NONE, 1.1 gvfs-smb-browse-auth.patch, 1.1, 1.2 gvfs.spec, 1.94, 1.95
- Next message (by thread): rpms/cherokee/EL-5 cherokee.spec,1.2,1.3 import.log,1.2,1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: pali
Update of /cvs/pkgs/rpms/cherokee/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27791/EL-4
Modified Files:
cherokee.spec import.log
Log Message:
Unowned directories, Resolves bz 474634
Index: cherokee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/EL-4/cherokee.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cherokee.spec 31 Oct 2008 17:05:10 -0000 1.2
+++ cherokee.spec 16 Dec 2008 16:39:42 -0000 1.3
@@ -3,7 +3,7 @@
Name: cherokee
Version: 0.10.0
-Release: 1%{?dist}
+Release: 3%{?dist}
Summary: Flexible and Fast Webserver
Group: Applications/Internet
@@ -15,6 +15,8 @@
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 @@
%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 @@
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 @@
%{_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,8 @@
%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/
%dir %{_var}/www/%{name}/
%dir %{_var}/www/%{name}/images/
%config(noreplace) %{_var}/www/%{name}/images/cherokee-logo.png
@@ -140,7 +148,7 @@
%defattr(-,root,root,-)
%{_mandir}/man1/cherokee-config.1*
%{_bindir}/cherokee-config
-##%{_includedir}/%{name}
+%dir %{_includedir}/%{name}/
%{_includedir}/%{name}/*.h
%{_libdir}/pkgconfig/%{name}.pc
%{_datadir}/aclocal/%{name}.m4
@@ -148,6 +156,12 @@
%changelog
+* Tue Dec 16 2008 Pavel Lisy <pavel.lisy at gmail.com> - 0.10.0-3
+- Unowned directories, Resolves bz 474634
+* 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
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/cherokee/EL-4/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log 31 Oct 2008 17:05:10 -0000 1.2
+++ import.log 16 Dec 2008 16:39:42 -0000 1.3
@@ -1,2 +1,3 @@
cherokee-0_8_1-2_fc9:EL-4:cherokee-0.8.1-2.fc9.src.rpm:1224446340
cherokee-0_10_0-1_fc10:EL-4:cherokee-0.10.0-1.fc10.src.rpm:1225472547
+cherokee-0_10_0-3_fc10:EL-4:cherokee-0.10.0-3.fc10.src.rpm:1229445539
- Previous message (by thread): rpms/gvfs/F-10 gvfs-1.1.2-http-leak.patch, NONE, 1.1 gvfs-smb-browse-auth.patch, 1.1, 1.2 gvfs.spec, 1.94, 1.95
- Next message (by thread): rpms/cherokee/EL-5 cherokee.spec,1.2,1.3 import.log,1.2,1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list