[rpms/trafficserver] trafficserver-9.2.14-1: Merge branch 'master' into epel7

[Jan-Frode Myklebust <janfrode@tanso.net>]

A new commit has been pushed.

Repo   : rpms/trafficserver
Branch : trafficserver-9.2.14-1
Commit : 20499532fcc40db297be1cf2076e09424b17bf00
Author : Jan-Frode Myklebust <janfrode@tanso.net>
Date   : 2014-07-16T11:02:32+02:00
Stats  : +20/-15 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/trafficserver/c/20499532fcc40db297be1cf2076e09424b17bf00?branch=trafficserver-9.2.14-1

Log:
Merge branch 'master' into epel7

---
diff --git a/.gitignore b/.gitignore
index 994de2a..4cbacdd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,5 @@
 /trafficserver-4.2.0.tar.bz2.asc
 /trafficserver-4.2.1.tar.bz2
 /trafficserver-4.2.1.tar.bz2.asc
+/trafficserver-5.0.0.tar.bz2
+/trafficserver-5.0.0.tar.bz2.asc

diff --git a/sources b/sources
index 9273ef8..ab22092 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-18f7d56650cba260c8cce3bf4abfa56c  trafficserver-4.2.1.tar.bz2
-15fcd107ea9321b01905ebf0d9bb6c65  trafficserver-4.2.1.tar.bz2.asc
+ad1fe1b45c38664f3714810ee950b2c7  trafficserver-5.0.0.tar.bz2
+8f6f6bac5d8c073fd453ec1866beed9b  trafficserver-5.0.0.tar.bz2.asc

diff --git a/trafficserver.keyring b/trafficserver.keyring
index 339f15b..db4393b 100644
Binary files a/trafficserver.keyring and b/trafficserver.keyring differ

diff --git a/trafficserver.spec b/trafficserver.spec
index 3ae014b..f69e818 100644
--- a/trafficserver.spec
+++ b/trafficserver.spec
@@ -2,8 +2,8 @@
 %define _hardened_build 1
 Summary:	Fast, scalable and extensible HTTP/1.1 compliant caching proxy server
 Name:		trafficserver
-Version:	4.2.1
-Release:	2%{?dist}
+Version:	5.0.0
+Release:	0%{?dist}
 License:	ASL 2.0
 Group:		System Environment/Daemons
 Source0:	http://www.apache.org/dist/%{name}/%{name}-%{version}.tar.bz2
@@ -67,16 +67,6 @@ make DESTDIR=$RPM_BUILD_ROOT install
 # so we rename these to ts-enable, ts-exit and ts-disable.
 mkdir -p $RPM_BUILD_ROOT/usr/share/man/man1
 cp doc/man/*.1 $RPM_BUILD_ROOT/usr/share/man/man1/
-mv $RPM_BUILD_ROOT/usr/share/man/man1/enable.1 \
-$RPM_BUILD_ROOT/usr/share/man/man1/ts-enable.1
-mv $RPM_BUILD_ROOT/usr/share/man/man1/disable.1 \
-$RPM_BUILD_ROOT/usr/share/man/man1/ts-disable.1
-mv $RPM_BUILD_ROOT/usr/share/man/man1/exit.1 \
-$RPM_BUILD_ROOT/usr/share/man/man1/ts-exit.1
-cat <<EOF > README.fedora
-The man-pages for enable, disable and exit was renamed to ts-enable,
-ts-disable and ts-exit to avoid conflicts with other man-pages.
-EOF
 
 # Remove duplicate man-pages:
 rm -rf $RPM_BUILD_ROOT%{_docdir}/trafficserver
@@ -113,6 +103,7 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/trafficserver/plugins/cacheurl.la
 rm -f $RPM_BUILD_ROOT/%{_libdir}/trafficserver/plugins/gzip.la
 rm -f $RPM_BUILD_ROOT/%{_libdir}/trafficserver/plugins/libloader.la
 rm -f $RPM_BUILD_ROOT/%{_libdir}/trafficserver/plugins/header_rewrite.la
+rm -f $RPM_BUILD_ROOT/%{_libdir}/trafficserver/plugins/tcpinfo.la
 
 rm -f $RPM_BUILD_ROOT/%{_libdir}/perl5/perllocal.pod
 rm -f $RPM_BUILD_ROOT/%{_libdir}/perl5/auto/Apache/TS/.packlist
@@ -134,7 +125,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-, ats, ats, -)
-%doc README CHANGES NOTICE README.fedora LICENSE
+%doc README CHANGES NOTICE LICENSE
 %attr(0644,root,root) %{_mandir}/man1/*
 %attr(0644,root,root) %{_mandir}/man3/*
 %attr(0755,root,root) %{_bindir}/traffic*
@@ -219,6 +210,18 @@ header files, and Apache httpd style module build system.
 %attr(0644,root,root) %{_libdir}/trafficserver/*.so
 
 %changelog
+* Wed Jul 16 2014 Jan-Frode Myklebust <janfrode@tanso.net> - 5.0.0-0
+- New major version.
+
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.2.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Thu May 22 2014 Petr Machata <pmachata@redhat.com> - 4.2.1-4
+- Rebuild for boost 1.55.0
+
+* Wed May 21 2014 Jaroslav Škarvada <jskarvad@redhat.com> - 4.2.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Changes/f21tcl86
+
 * Wed Apr 30 2014 Jan-Frode Myklebust <janfrode@tanso.net> - 4.2.1-2
 - Bump release tag. RC1 became final.