change hard-coded perl path to variable

[platform/upstream/git.git] / packaging / git.spec

diff --git a/packaging/git.spec b/packaging/git.spec
index 3fb3168..d068189 100644 (file)
--- a/packaging/git.spec
+++ b/packaging/git.spec
@@ -1,14 +1,15 @@
 %define gitexecdir %{_libexecdir}/git
-%define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services
 
 Name:           git
-Version:        1.8.0
+Version:        2.0.1
 Release:        0
 License:        GPL-2.0
 Summary:        Fast, scalable, distributed revision control system
 Url:            http://git-scm.com
-Group:          Development/Tools/Version Control
-Source:         %{name}-%{version}.tar.bz2
+Group:          Platform Development/Utilities
+Source:         %{name}-%{version}.tar.gz
+Source1001:    git.manifest
+BuildRequires:  asciidoc
 BuildRequires:  curl
 BuildRequires:  expat-devel
 BuildRequires:  fdupes
@@ -17,6 +18,7 @@ BuildRequires:  libcurl-devel
 BuildRequires:  libopenssl-devel
 BuildRequires:  perl-Error
 BuildRequires:  python
+BuildRequires:  xmlto
 Requires:       git-core = %{version}
 
 %description
@@ -32,11 +34,11 @@ CVS, and GNU arch.
 
 %package core
 Summary:        Core git tools
-Group:          Development/Tools/Version Control
+Group:          Platform Development/Utilities
 Requires:       less
 Requires:       openssh
 Requires:       perl-Error
-Requires:       perl-base = %{perl_version}
+Requires:       perl = %{perl_version}
 Requires:       rsync
 
 %description core
@@ -48,7 +50,7 @@ These are the core tools with minimal dependencies.
 
 %package svn
 Summary:        Git tools for importing Subversion repositories
-Group:          Development/Tools/Version Control
+Group:          Platform Development/Utilities
 Requires:       git-core = %{version}
 Requires:       subversion
 Requires:       subversion-perl
@@ -59,7 +61,7 @@ system.
 
 %package cvs
 Summary:        Git tools for importing CVS repositories
-Group:          Development/Tools/Version Control
+Group:          Platform Development/Utilities
 Requires:       cvs
 Requires:       cvsps
 Requires:       git-core = %{version}
@@ -70,7 +72,7 @@ Tools for importing CVS repositories to the Git version control system.
 
 %package arch
 Summary:        Git tools for importing Arch repositories
-Group:          Development/Tools/Version Control
+Group:          Platform Development/Utilities
 Requires:       git-core = %{version}
 # Requires:       tla
 
@@ -80,18 +82,18 @@ system.
 
 %package email
 Summary:        Git tools for sending email
-Group:          Development/Tools/Version Control
+Group:          Platform Development/Utilities
 Requires:       git-core = %{version}
 # For sending mails over secure SMTP:
 Recommends:     perl-Authen-SASL
-Recommends:     perl-Net-SMTP-SSL,
+Recommends:     perl-Net-SMTP-SSL
 
 %description email
 Email interface for the GIT version control system.
 
 %package daemon
 Summary:        Simple Server for Git Repositories
-Group:          Development/Tools/Version Control
+Group:          Platform Development/Utilities
 Requires(pre):  /usr/sbin/useradd
 Requires:       git-core = %{version}
 
@@ -101,7 +103,7 @@ read only access to repositories in /srv/git/ that contain the
 'git-daemon-export-ok' file.
 %package -n gitk
 Summary:        Git revision tree visualiser
-Group:          Development/Tools/Version Control
+Group:          Platform Development/Utilities
 Requires:       git-core = %{version}
 Requires:       tk >= 8.4
 Supplements:    packageand(git-core:tk)
@@ -116,7 +118,7 @@ found in the package git-gui.
 
 %package gui
 Summary:        Grapical tool for common git operations
-Group:          Development/Tools/Version Control
+Group:          Platform Development/Utilities
 Requires:       git-core = %{version}
 Requires:       tk >= 8.4
 Supplements:    packageand(git-core:tk)
@@ -133,7 +135,7 @@ menu actions to start a gitk session from within git-gui.
 
 %package web
 Summary:        Git Web Interface
-Group:          Development/Tools/Version Control
+Group:          Platform Development/Utilities
 Requires:       git-core = %{version}
 Supplements:    packageand(git-core:apache2)
 
@@ -143,17 +145,11 @@ CGI script that allows browsing git repositories via web interface.
 The apache2 configuration contained in this package installs a virtual
 directory /git/ that calls the cgi script.
 
-%package remote-helpers
-Summary:        Python package for remote helper scripts
-Group:          Development/Tools/Version Control
-Requires:       git-core = %{version}
-Requires:       python
-
-%description remote-helpers
-This package contains the building blocks for remote helpers written in Python.
 
 %prep
 %setup -q
+cp %{SOURCE1001} .
+
 
 %build
 cat > .make <<'EOF'
@@ -173,21 +169,24 @@ 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
+(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
 (find %{buildroot}%{_mandir} %{buildroot}/Documentation -type f | grep -vE "archimport|svn|git-cvs|email|gitk|daemon|gui" | sed -e s@^%{buildroot}@@ -e 's/$/*/' ) >> bin-man-doc-files
 ( pushd perl
   perl Makefile.PL
   make -f perl.mak DESTDIR=%{buildroot}  install_vendor
 )
-rm -rf %{buildroot}/usr/lib/perl5/site_perl
+rm -rf %{buildroot}%{perl_sitelib}
+
 %perl_process_packlist
 find %{buildroot}/%{_mandir} -type f -print0 | xargs -0 chmod 644
 install -m 644 -D contrib/completion/git-completion.bash %{buildroot}%{_sysconfdir}/bash_completion.d/git.sh
@@ -197,66 +196,62 @@ 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}
+%fdupes -s %{buildroot}/%{_prefix}
 
 
 %files
-%defattr(-,root,root)
+%manifest %{name}.manifest
 %doc README
 
 %files svn
-%defattr(-,root,root)
+%manifest %{name}.manifest
 %{gitexecdir}/*svn*
-%doc Documentation/*svn*.txt
+%{_mandir}/man1/*svn*.1*
 
 %files cvs
-%defattr(-,root,root)
-%doc Documentation/*git-cvs*.txt
+%manifest %{name}.manifest
 %{_bindir}/git-cvs*
 %{gitexecdir}/*cvs*
+%{_mandir}/man1/*cvs*.1*
 
 %files arch
-%defattr(-,root,root)
-%doc Documentation/git-archimport.txt
+%manifest %{name}.manifest
 %{gitexecdir}/git-archimport
+%{_mandir}/man1/git-archimport.1*
 
 %files email
-%defattr(-,root,root)
-%doc Documentation/*email*.txt
+%manifest %{name}.manifest
 %{gitexecdir}/*email*
+%{_mandir}/man1/*email*.1*
 
 %files daemon
-%defattr(-,root,root)
-%doc Documentation/*daemon*.txt
+%manifest %{name}.manifest
 %{gitexecdir}/*daemon*
+%{_mandir}/man1/*daemon*.1*
 
 %files -n gitk
-%defattr(-,root,root)
-%doc Documentation/*gitk*.txt
+%manifest %{name}.manifest
 %{_bindir}/gitk
-/usr/share/gitk
+%{_datadir}/gitk
+%{_mandir}/man1/*gitk*.1*
 
 %files gui
-%defattr(-,root,root)
-%doc Documentation/*gui*.txt
+%manifest %{name}.manifest
 %{gitexecdir}/git-gui*
-/usr/share/git-gui
-
-%files remote-helpers
-%defattr(-,root,root)
-%python_sitelib/*
+%{_datadir}/git-gui
+%{_mandir}/man1/*gui*.1*
 
 %files core -f bin-man-doc-files
-%defattr(-,root,root)
+%manifest %{name}.manifest
+%license COPYING
 %{_bindir}/git
 %{_datadir}/git-core/
 %dir %{gitexecdir}
-%doc README COPYING Documentation/*.txt
 %{perl_vendorlib}/Git.pm
 %{perl_vendorlib}/Git/
 %{perl_vendorlib}/Git/*.pm
 %{perl_vendorarch}/auto/Git/
-%{_sysconfdir}/bash_completion.d/git.sh
-
-%changelog
+%attr(0644, root, root) %config %{_sysconfdir}/bash_completion.d/git.sh