[git-annex] create manpages when no ikiwiki

Jens Petersen petersen at fedoraproject.org
Tue Dec 11 04:33:02 UTC 2012


commit 1075d88ea0a2ac43614af3b1ff850fec51c81bef
Author: Jens Petersen <petersen at redhat.com>
Date:   Tue Dec 11 13:32:52 2012 +0900

    create manpages when no ikiwiki
    
    rename docs bcond to ikiwiki

 git-annex.spec |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/git-annex.spec b/git-annex.spec
index 3f6ad1b..9439f01 100644
--- a/git-annex.spec
+++ b/git-annex.spec
@@ -1,11 +1,11 @@
 # https://fedoraproject.org/wiki/Packaging:Haskell
 # https://fedoraproject.org/wiki/PackagingDrafts/Haskell
 
-%bcond_without docs
+%bcond_without ikiwiki
 
 Name:           git-annex
 Version:        3.20121009
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Manage files with git, without checking their contents into git
 
 License:        GPLv3+
@@ -47,7 +47,7 @@ BuildRequires:  ghc-transformers-base-devel
 BuildRequires:  ghc-unix-devel
 BuildRequires:  ghc-utf8-string-devel
 BuildRequires:  git
-%if %{with docs}
+%if %{with ikiwiki}
 BuildRequires:  ikiwiki
 BuildRequires:  perl(Image::Magick)
 %endif
@@ -74,7 +74,7 @@ on. Pushing to another git repository will make git-annex there aware of the
 annexed file, and it can be used to retrieve its content from the key-value
 store.
 
-%if %{with docs}
+%if %{with ikiwiki}
 %package docs
 Summary:        %{summary}
 Group:          Documentation
@@ -93,8 +93,10 @@ This package contains the documentation for %{name} in HTML format.
 %build
 %ghc_bin_build
 
-%if %{with docs}
+%if %{with ikiwiki}
 make docs
+%else
+make git-annex.1 git-annex-shell.1
 %endif
 
 
@@ -114,13 +116,16 @@ install -m 0644 git-annex-shell.1 %{buildroot}%{_mandir}/man1
 %{_mandir}/man1/git-annex.1*
 %{_mandir}/man1/git-annex-shell.1*
 
-%if %{with docs}
+%if %{with ikiwiki}
 %files docs
 %doc html/
 %endif
 
 
 %changelog
+* Tue Dec 11 2012 Jens Petersen <petersen at redhat.com> - 3.20121009-2
+- create manpages when no ikiwiki
+
 * Tue Nov 06 2012 Jens Petersen <petersen at redhat.com> - 3.20121009-1
 - update to 3.20121009
 


More information about the scm-commits mailing list