[trafficserver] Remove duplicate man-pages in _docdir/trafficserver/.

Jan-Frode Myklebust janfrode at fedoraproject.org
Mon Jun 25 12:24:00 UTC 2012


commit 46061ec2ea8f64ef6f342c79d93ac90038a0eeeb
Author: Jan-Frode Myklebust <janfrode at tanso.net>
Date:   Mon Jun 25 14:23:32 2012 +0200

    Remove duplicate man-pages in _docdir/trafficserver/.

 trafficserver.spec |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/trafficserver.spec b/trafficserver.spec
index a3ec170..2bca39a 100644
--- a/trafficserver.spec
+++ b/trafficserver.spec
@@ -3,7 +3,7 @@
 Summary:	Fast, scalable and extensible HTTP/1.1 compliant caching proxy server
 Name:		trafficserver
 Version:	3.2.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	ASL 2.0
 Group:		System Environment/Daemons
 Source0:	http://www.apache.org/dist/%{name}/%{name}-%{version}.tar.bz2
@@ -65,6 +65,8 @@ 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 %{_docdir}/trafficserver
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
 install -m 644 -p %{SOURCE1} \
@@ -108,7 +110,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-, ats, ats, -)
-%doc README CHANGES NOTICE README.fedora LICENSE
+%doc README CHANGES NOTICE README.fedora LICENSE 
 %attr(0644, root, root) /usr/share/man/man1/*
 %attr(0755,root,root) /usr/bin/traffic*
 %attr(0755,root,root) %dir %{_libdir}/trafficserver
@@ -187,9 +189,11 @@ header files, and Apache httpd style module build system.
 %attr(0755,root,root) %dir %{_libdir}/trafficserver
 %attr(0755,root,root) %dir %{_libdir}/trafficserver/plugins
 %attr(0644,root,root) %{_libdir}/trafficserver/*.so
-%{_docdir}/trafficserver
 
 %changelog
+* Mon Jun 25 2012 Jan-Frode Myklebust <janfrode at tanso.net> - 3.2.0-2
+- Remove duplicate man-pages.
+
 * Sat Jun 23 2012 Jan-Frode Myklebust <janfrode at tanso.net> - 3.2.0-1
 - Update to v3.2.0
 


More information about the scm-commits mailing list