Build man pages; spec cleanups

This patch adds the git man pages to the 'git-core' package, which fixes
the git-buildpackage feature checks for various git commands. It also
fixes git-help(1), which expects the man pages to exist.

Other details of the patch:

- Depend on asciidoc/xmlto, required for building the man pages
- Remove documentation in HTML and text formats (duplicates man pages)
- spec cleanup: Use %{_datadir} instead of /usr/share
- spec cleanup: Remove %defattr macros that are added by default

Change-Id: If1b01506e1bd80e5da2e7a9776f8ec3e01cbbea2

diff --git a/packaging/git.changes b/packaging/git.changes
index e8953c8baa4c699c47e38762473aa9b9c44800e3..84284ee3d5461e0e351c00b051f3589e6039c96e 100644 (file)
--- a/packaging/git.changes
+++ b/packaging/git.changes
@@ -1,3 +1,10 @@
+* Tue Apr 02 2013 Patrick McCarty <patrick.mccarty@linux.intel.com> ed4a775
+- (TZPC-1773) Package the man pages, required for git-buildpackage
+- Depend on asciidoc/xmlto, required for building the man pages
+- Remove documentation in HTML and text formats (duplicates man pages)
+- spec cleanup: Use %{_datadir} instead of /usr/share
+- spec cleanup: Remove %defattr macros that are added by default
+
 * Fri Mar 22 2013 Anas Nashif <anas.nashif@intel.com> accepted/trunk/20130216.045217@4c2988b
 - Do not require perl-base
 

diff --git a/packaging/git.spec b/packaging/git.spec
index f0a11d34795433d648ac93eccfbe74ef2e4f96fe..3df67c93bc712f4077e8f4f95edca29e532f53c1 100644 (file)
--- a/packaging/git.spec
+++ b/packaging/git.spec
@@ -8,6 +8,7 @@ Summary:        Fast, scalable, distributed revision control system
 Url:            http://git-scm.com
 Group:          Development/Tools
 Source:         %{name}-%{version}.tar.gz
+BuildRequires:  asciidoc
 BuildRequires:  curl
 BuildRequires:  expat-devel
 BuildRequires:  fdupes
@@ -16,6 +17,7 @@ BuildRequires:  libcurl-devel
 BuildRequires:  libopenssl-devel
 BuildRequires:  perl-Error
 BuildRequires:  python
+BuildRequires:  xmlto
 Requires:       git-core = %{version}
 
 %description
@@ -172,12 +174,13 @@ EOF
 #
 chmod 755 .make
 ./.make all %{?_smp_mflags}
+./.make doc
 
 %check
 make %{?_smp_mflags} test
 
 %install
-./.make install
+./.make install install-doc
 ###
 (find %{buildroot}%{_bindir} -type f | grep -vE "archimport|svn|cvs|email|gitk|daemon|gui" | sed -e s@^%{buildroot}@@)                   > bin-man-doc-files
 (find %{buildroot}%{gitexecdir} -mindepth 1 | grep -vE "archimport|svn|cvs|email|gitk|daemon|gui" | sed -e s@^%{buildroot}@@)               >> bin-man-doc-files
@@ -198,63 +201,54 @@ cat %{name}.lang >>bin-man-doc-files
 
 
 rm -rf %{buildroot}/%{_datadir}/gitweb
+rm -rf %{buildroot}/Documentation/*.html
+rm -rf %{buildroot}/Documentation/*.txt
 
 %fdupes -s %{buildroot}
 
 
 %files
-%defattr(-,root,root)
 %doc README
 
 %files svn
-%defattr(-,root,root)
 %{gitexecdir}/*svn*
-%doc Documentation/*svn*.txt
+%{_mandir}/man1/*svn*.1*
 
 %files cvs
-%defattr(-,root,root)
-%doc Documentation/*git-cvs*.txt
 %{_bindir}/git-cvs*
 %{gitexecdir}/*cvs*
+%{_mandir}/man1/*cvs*.1*
 
 %files arch
-%defattr(-,root,root)
-%doc Documentation/git-archimport.txt
 %{gitexecdir}/git-archimport
+%{_mandir}/man1/git-archimport.1*
 
 %files email
-%defattr(-,root,root)
-%doc Documentation/*email*.txt
 %{gitexecdir}/*email*
+%{_mandir}/man1/*email*.1*
 
 %files daemon
-%defattr(-,root,root)
-%doc Documentation/*daemon*.txt
 %{gitexecdir}/*daemon*
+%{_mandir}/man1/*daemon*.1*
 
 %files -n gitk
-%defattr(-,root,root)
-%doc Documentation/*gitk*.txt
 %{_bindir}/gitk
-/usr/share/gitk
+%{_datadir}/gitk
+%{_mandir}/man1/*gitk*.1*
 
 %files gui
-%defattr(-,root,root)
-%doc Documentation/*gui*.txt
 %{gitexecdir}/git-gui*
-/usr/share/git-gui
+%{_datadir}/git-gui
+%{_mandir}/man1/*gui*.1*
 
 %files remote-helpers
-%defattr(-,root,root)
 %python_sitelib/*
 
 %files core -f bin-man-doc-files
-%defattr(-,root,root)
 %license COPYING
 %{_bindir}/git
 %{_datadir}/git-core/
 %dir %{gitexecdir}
-%doc Documentation/*.txt
 %{perl_vendorlib}/Git.pm
 %{perl_vendorlib}/Git/
 %{perl_vendorlib}/Git/*.pm