Merge branch 'jn/rpm-updates'

Conflicts:

	Makefile

diff --git a/Makefile b/Makefile
index 539ade0..61fc86b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -74,9 +74,10 @@ strip: all
 
 dist: tig.spec
        @mkdir -p $(TARNAME) && \
-       cp tig.spec $(TARNAME)
+       cp tig.spec $(TARNAME) && \
+       echo $(VERSION) > $(TARNAME)/VERSION
        git-archive --format=tar --prefix=$(TARNAME)/ HEAD > $(TARNAME).tar && \
-       tar rf $(TARNAME).tar $(TARNAME)/tig.spec && \
+       tar rf $(TARNAME).tar $(TARNAME)/tig.spec $(TARNAME)/VERSION && \
        gzip -f -9 $(TARNAME).tar && \
        md5sum $(TARNAME).tar.gz > $(TARNAME).tar.gz.md5
        @rm -rf $(TARNAME)

diff --git a/tig.spec.in b/tig.spec.in
index 2ce6cdb..2385fb8 100644 (file)
--- a/tig.spec.in
+++ b/tig.spec.in
@@ -1,5 +1,5 @@
 # -*- mode: rpm-spec-mode; encoding: utf-8; -*-
-# Pass '--without docs' to rpmbuild if you don't want the documentation
+# Pass '--without docs' to rpmbuild if you don't want the documentation to be build
 
 Summary:       Tig: text-mode interface for git
 Name:          tig
@@ -10,7 +10,7 @@ Group:                Development/Tools
 Vendor:        Jonas Fonseca <fonseca@diku.dk>
 URL:           http://jonas.nitro.dk/tig/
 Source:        http://jonas.nitro.dk/tig/releases/%{name}-%{version}.tar.gz
-BuildRequires:         ncurses-devel%{!?_without_docs:, xmlto, asciidoc > 6.0.3, /usr/bin/docbook2pdf}
+BuildRequires:         ncurses-devel%{!?_without_docs:, xmlto, asciidoc > 6.0.3}
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:      git-core, ncurses
 
@@ -31,7 +31,7 @@ Using it as a pager, it will display input from stdin and colorize it.
 CFLAGS="$RPM_OPT_FLAGS -DVERSION=tig-%{version}-%{release}"
 %{__make} %{_smp_mflags} \
        prefix=%{_prefix} \
-       all %{!?_without_docs: doc}
+       all %{!?_without_docs: doc-man doc-html}
 
 %install
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
@@ -49,8 +49,13 @@ CFLAGS="$RPM_OPT_FLAGS -DVERSION=tig-%{version}-%{release}"
 %doc README COPYING INSTALL SITES BUGS TODO tigrc
 %{!?_without_docs: %{_mandir}/man1/*.1*}
 %{!?_without_docs: %{_mandir}/man5/*.5*}
-%{!?_without_docs: %doc *.html *.pdf}
+%{!?_without_docs: %doc *.html}
+%{?_without_docs:  %doc *.txt}
 
 %changelog
+* Fri Jun  1 2007 Jakub Narebski <jnareb@gmail.com>
+- Include documentation sources for --without docs
+- Remove PDF version of manual from being build and installed
+
 * Mon May 28 2007 Jakub Narebski <jnareb@gmail.com>
 - Initial tig spec file