[mod_suphp] Fix %description path to README.fedora if doc dir is unversioned (#993976).

Ville Skyttä scop at fedoraproject.org
Wed Dec 11 17:13:17 UTC 2013


commit 6eaeb054cf1338ec404d5959393a914d448309fe
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Wed Dec 11 19:13:18 2013 +0200

    Fix %description path to README.fedora if doc dir is unversioned (#993976).
    
    - Fix bogus date in %changelog.

 mod_suphp.spec |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/mod_suphp.spec b/mod_suphp.spec
index fa29864..eb72f02 100644
--- a/mod_suphp.spec
+++ b/mod_suphp.spec
@@ -28,7 +28,7 @@
 Summary: An apache2 module for executing PHP scripts with the permissions of their owners
 Name: mod_suphp
 Version: 0.6.3
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 Source0: http://www.suphp.org/download/suphp-%{version}.tar.gz
@@ -52,7 +52,7 @@ their owners. It consists of an Apache module (mod_suphp) and a setuid root
 binary (suphp) that is called by the Apache module to change the uid of the
 process executing the PHP interpreter.
 
-Please take a look at %{_docdir}/%{name}-%{version}/README.fedora for 
+Please take a look at %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}/README.fedora for
 installation instructions.
 
 %prep
@@ -122,6 +122,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec 11 2013 Ville Skyttä <ville.skytta at iki.fi> - 0.6.3-13
+- Fix %%description path to README.fedora if doc dir is unversioned (#993976).
+- Fix bogus date in %%changelog.
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.3-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
@@ -181,7 +185,7 @@ rm -rf $RPM_BUILD_ROOT
 * Mon Feb 06 2006 Andreas Thienemann <andreas at bawue.net> 0.6.1-1
 - Updated to 0.6.1
 
-* Tue Jul 09 2005 Andreas Thienemann <andreas at bawue.net> 0.5.2-8
+* Sat Jul 09 2005 Andreas Thienemann <andreas at bawue.net> 0.5.2-8
 - Added a dependency on a specific httpd-mmn
 
 * Tue Jul 05 2005 Andreas Thienemann <andreas at bawue.net> 0.5.2-7


More information about the scm-commits mailing list