[python-ldaptor/f19: 2/3] use unversioned documentation directory

jvcelak jvcelak at fedoraproject.org
Mon Sep 2 15:35:06 UTC 2013


commit 0608238662785eedfd0f60e5e34aa3b3d12dfa9a
Author: Jan Vcelak <jvcelak at fedoraproject.org>
Date:   Mon Sep 2 17:33:37 2013 +0200

    use unversioned documentation directory
    
    Resolves: #994059

 python-ldaptor.spec |   24 ++++++++++++++----------
 1 files changed, 14 insertions(+), 10 deletions(-)
---
diff --git a/python-ldaptor.spec b/python-ldaptor.spec
index fa155f5..e0c8aa7 100644
--- a/python-ldaptor.spec
+++ b/python-ldaptor.spec
@@ -1,11 +1,12 @@
 %global checkout_date 20120515
 %global checkout_hash 29a06fa
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
 %global required_modules pyparsing python-twisted-core python-twisted-names python-twisted-mail python-zope-interface
 
 Name: python-ldaptor
 Version: 0.0.44
-Release: 3.%{checkout_date}git%{checkout_hash}%{?dist}
+Release: 4.%{checkout_date}git%{checkout_hash}%{?dist}
 Summary: Python LDAP client library
 License: LGPLv2
 URL: https://github.com/antong/ldaptor
@@ -81,14 +82,14 @@ chmod a+x %{buildroot}%{python_sitelib}/ldaptor/ldapfilter.py
 
 # install documentation
 mkdir -p %{buildroot}%{_docdir}
-install -d -m 0755 %{buildroot}%{_docdir}/%{name}-%{version}
+install -d -m 0755 %{buildroot}%{_pkgdocdir}
 for docdir in addressbook-slides api examples ldap-intro; do
-	cp -r doc/$docdir %{buildroot}%{_docdir}/%{name}-%{version}/
+	cp -r doc/$docdir %{buildroot}%{_pkgdocdir}/
 done
 
 # make *.py files in documentation not executable, rename to avoid byte-compilation
-mv %{buildroot}%{_docdir}/%{name}-%{version}/examples/ldif2ldif{,.py}
-for pyfile in $(find %{buildroot}%{_docdir}/%{name}-%{version}/examples -name "*.py"); do
+mv %{buildroot}%{_pkgdocdir}/examples/ldif2ldif{,.py}
+for pyfile in $(find %{buildroot}%{_pkgdocdir}/examples -name "*.py"); do
 	chmod a-x $pyfile
 	mv $pyfile $pyfile.example
 done
@@ -96,7 +97,7 @@ done
 
 %files
 %doc COPYING TODO README.md
-%exclude %{_docdir}/%{name}-%{version}/*/
+%exclude %{_pkgdocdir}/*/
 %dir %{_sysconfdir}/ldaptor
 %config(noreplace) %{_sysconfdir}/ldaptor/global.cfg
 %{_datadir}/%{name}/
@@ -104,16 +105,19 @@ done
 %{python_sitelib}/ldaptor
 
 %files doc
-%doc %{_docdir}/%{name}-%{version}/addressbook-slides/
-%doc %{_docdir}/%{name}-%{version}/api/
-%doc %{_docdir}/%{name}-%{version}/examples/
-%doc %{_docdir}/%{name}-%{version}/ldap-intro/
+%doc %{_pkgdocdir}/addressbook-slides/
+%doc %{_pkgdocdir}/api/
+%doc %{_pkgdocdir}/examples/
+%doc %{_pkgdocdir}/ldap-intro/
 
 %files tools
 %{_bindir}/ldaptor-*
 
 
 %changelog
+* Mon Sep 02 2013 Jan Vcelak <jvcelak at fedoraproject.org> 0.0.44-4.20120515git29a06fa
+- use unversioned documentation directory, resolves #994059
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.44-3.20120515git29a06fa
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 


More information about the scm-commits mailing list