[libapreq2/epel7] Revert "Switch to unversioned docs directory."
bojan
bojan at fedoraproject.org
Mon Feb 17 20:45:46 UTC 2014
commit be7cb48f6d03afa6b81bd599281a6dc0ef002920
Author: Bojan Smojver <bojan at rexursive.com>
Date: Tue Feb 18 07:45:17 2014 +1100
Revert "Switch to unversioned docs directory."
This reverts commit 44cfd7ae45a51b67fd8b93513107bc92119b9318.
libapreq2.spec | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/libapreq2.spec b/libapreq2.spec
index 56f685b..3d36fd6 100644
--- a/libapreq2.spec
+++ b/libapreq2.spec
@@ -6,7 +6,7 @@
Name: libapreq2
Version: 2.13
-Release: 14%{?dist}
+Release: 13%{?dist}
Summary: Apache HTTP request library
Group: System Environment/Libraries
@@ -78,14 +78,16 @@ chmod +x %{__perl_provides}
# Fix up paths in doc tag files:
# ap*-1-config in FC5, ap*-config in earlier
+aprver=$(apr-1-config --version || apr-config --version)
+apuver=$(apu-1-config --version || apu-config --version)
%{__perl} -pi -e \
- "s|<path>.*?</path>|<path>%{_docdir}/%{name}-devel/</path>|" \
+ "s|<path>.*?</path>|<path>%{_docdir}/%{name}-devel-%{version}/</path>|" \
docs/apreq2.tag
%{__perl} -pi -e \
- "s|<path>.*?</path>|<path>%{_docdir}/apr-devel/html/</path>|" \
+ "s|<path>.*?</path>|<path>%{_docdir}/apr-devel-$aprver/html/</path>|" \
docs/apr.tag
%{__perl} -pi -e \
- "s|<path>.*?</path>|<path>%{_docdir}/apr-util-devel/html/</path>|" \
+ "s|<path>.*?</path>|<path>%{_docdir}/apr-util-devel-$apuver/html/</path>|" \
docs/apu.tag
%patch0
@@ -169,9 +171,6 @@ rm -rf $RPM_BUILD_ROOT
%changelog
-* Thu Aug 8 2013 Bojan Smojver <bojan at rexursive.com> - 2.13-14
-- switch to unversioned documentation directory
-
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.13-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
More information about the scm-commits
mailing list