[trafficserver] Remove some perl junk.
Jan-Frode Myklebust
janfrode at fedoraproject.org
Thu Oct 10 19:27:20 UTC 2013
commit 4b2ab9616f74e330d3fe9f5cff84272b5115a18d
Author: Jan-Frode Myklebust <janfrode at tanso.net>
Date: Thu Oct 10 21:26:38 2013 +0200
Remove some perl junk.
trafficserver.spec | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
---
diff --git a/trafficserver.spec b/trafficserver.spec
index fb57b07..5a51d1a 100644
--- a/trafficserver.spec
+++ b/trafficserver.spec
@@ -7,14 +7,16 @@ Release: 1%{?dist}
License: ASL 2.0
Group: System Environment/Daemons
Source0: http://www.apache.org/dist/%{name}/%{name}-%{version}.tar.bz2
-Source1: trafficserver.sysconf
-Source2: trafficserver.service
-Source3: trafficserver.tmpfilesd
+Source1: http://www.apache.org/dist/%{name}/%{name}-%{version}.tar.bz2.asc
+Source2: trafficserver.keyring
+Source3: trafficserver.sysconf
+Source4: trafficserver.service
+Source5: trafficserver.tmpfilesd
URL: http://trafficserver.apache.org/index.html
# BuildRoot is only needed for EPEL5:
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: autoconf, automake, libtool, openssl-devel, tcl-devel, expat-devel
-BuildRequires: pcre-devel, zlib-devel, xz-devel, gcc-c++
+BuildRequires: pcre-devel, zlib-devel, xz-devel, gcc-c++, gnupg, perl-ExtUtils-MakeMaker
# trafficserver fails to build on ppc and others, TS-1131, see lib/ts/ink_queue.h
ExclusiveArch: %{ix86} x86_64 ia64 %{arm}
Requires: initscripts
@@ -35,6 +37,8 @@ Apache Traffic Server is a fast, scalable and extensible HTTP/1.1 compliant
caching proxy server.
%prep
+gpgv --homedir /tmp --keyring %{SOURCE2} --status-fd=1 %{SOURCE1} %{SOURCE0} | grep -q '^\[GNUPG:\] GOODSIG'
+
%setup -q
%patch2 -p1 -b .patch2
@@ -75,13 +79,13 @@ EOF
rm -rf $RPM_BUILD_ROOT%{_docdir}/trafficserver
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
-install -m 644 -p %{SOURCE1} \
+install -m 644 -p %{SOURCE3} \
$RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/trafficserver
%if %{?fedora}0 > 140 || %{?rhel}0 > 60
-install -D -m 0644 -p %{SOURCE2} \
+install -D -m 0644 -p %{SOURCE4} \
$RPM_BUILD_ROOT/lib/systemd/system/trafficserver.service
-install -D -m 0644 -p %{SOURCE3} \
+install -D -m 0644 -p %{SOURCE5} \
$RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/trafficserver.conf
%else
mkdir -p $RPM_BUILD_ROOT/etc/init.d/
@@ -104,7 +108,10 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/trafficserver/plugins/stats_over_http.la
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}/perl5/perllocal.pod
+rm -f $RPM_BUILD_ROOT/%{_libdir}/perl5/auto/Apache/TS/.packlist
#
perl -pi -e 's/^CONFIG.*proxy.config.proxy_name STRING.*$/CONFIG proxy.config.proxy_name STRING FIXME.example.com/' \
@@ -123,12 +130,15 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-, ats, ats, -)
%doc README CHANGES NOTICE README.fedora LICENSE
%attr(0644,root,root) %{_mandir}/man1/*
+%attr(0644,root,root) %{_mandir}/man3/*
%attr(0755,root,root) %{_bindir}/traffic*
%attr(0755,root,root) %{_bindir}/tspush
%attr(0755,root,root) %dir %{_libdir}/trafficserver
%attr(0755,root,root) %dir %{_libdir}/trafficserver/plugins
%attr(0755,root,root) %{_libdir}/trafficserver/*.so.*
%attr(0755,root,root) %{_libdir}/trafficserver/plugins/*.so
+%attr(0644,root,root) %{_datadir}/perl5/Apache/TS.pm
+%attr(0644,root,root) %{_datadir}/perl5/Apache/TS/*
%config(noreplace) /etc/trafficserver/*
%if %{?fedora}0 > 140 || %{?rhel}0 > 60
%attr(0644, root, root) /lib/systemd/system/trafficserver.service
@@ -212,6 +222,8 @@ header files, and Apache httpd style module build system.
[TS-2207] - Centos5 out of tree perl build fails
[TS-2217] - remove the option to turn off body factory - setting it to 0 will result in empty responses
+- Automatically verify GPG signature during RPM prep.
+
* Tue Sep 3 2013 Jan-Frode Myklebust <janfrode at tanso.net> - 4.0.1-1
- Update to 4.0.1. What's new in v4.0.0:
https://cwiki.apache.org/confluence/display/TS/What%27s+new+in+v4.0.0
More information about the scm-commits
mailing list