Changeset 457 for spec/trunk/SPECS/git.spec

Timestamp:

Sep 10, 2014, 3:58:54 PM (11 years ago)

Author:

dmik

Message:

spec: git: Release 2.0.0-1.

File:

• spec/trunk/SPECS/git.spec (modified) (15 diffs)

spec/trunk/SPECS/git.spec

@@ +1 @@
+# Note: this .spec is borrowed from git-2.1.0-1.fc22.src.rpm
+
+# Pass --without docs to rpmbuild if you don't want the documentation (force it for now)
 %define _without_docs 1
 
-# Pass --without docs to rpmbuild if you don't want the documentation
-%if 0%{?rhel} && 0%{?rhel} <= 5
-%global gitcoredir %{_bindir}
-%else
-%global gitcoredir %{_libexecdir}/git-core
-%endif
+%global gitcoredir          %{_libexecdir}/git-core
+%global libcurl_devel       libcurl-devel
+%global docbook_suppress_sp 0
+%global enable_ipv6         0
+
+%global use_systemd         0
 
 Name:           git
-Version:        1.7.6.1
-Release:        7%{?dist}
+Version:        2.0.0
+Release:        1%{?dist}
 Summary:        Fast Version Control System
 License:        GPLv2
 Group:          Development/Tools
 URL:            http://git-scm.com/
-
-Source0:        http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.bz2
-Source1:        git-os2.zip
-
-Patch0:         git-os2.diff
+#Source0:        http://www.kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz
+
+%define svn_url     http://svn.netlabs.org/repos/ports/git/branches/2.0
+%define svn_rev     864
+
+Source: %{name}-%{version}-r%{svn_rev}.zip
+
+BuildRequires: gcc make subversion zip
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-#BuildRequires:  desktop-file-utils
-%if 0%{?fedora}
-BuildRequires:  emacs >= 22.2
+%if ! 0%{?_without_docs}
+BuildRequires:  asciidoc >= 8.4.1
+BuildRequires:  xmlto
+%endif
+#BuildRequires:  emacs
+BuildRequires:  expat-devel
+BuildRequires:  gettext
 BuildRequires:  libcurl-devel
-%else
-BuildRequires:  curl-devel
-%endif
-#BuildRequires:  expat-devel
-BuildRequires:  gettext
+#BuildRequires:  pcre-devel
 BuildRequires:  openssl-devel
 BuildRequires:  zlib-devel >= 1.2
-#%{!?_without_docs:BuildRequires: asciidoc > 6.0.3, xmlto}
 
 #Requires:       less
 #Requires:       openssh-clients
-%if 0%{?fedora} || 0%{?rhel} >= 5
-Requires:       perl(Error)
-%endif
-#Requires:       perl-Git = %{version}-%{release}
+#Requires:       perl(Error)
+#Requires:       perl(Term::ReadKey)
+Requires:       perl-Git = %{version}-%{release}
 #Requires:       rsync
 Requires:       zlib >= 1.2
 
 Provides:       git-core = %{version}-%{release}
-%if 0%{?fedora} || 0%{?rhel} >= 5
-Obsoletes:      git-core <= 1.5.4.3
-%else
-# EL-4 has 1.5.4.7-3.el4.  We don't support this, but no point making it more
-# difficult than it needs to be (folks stuck on EL-4 have it bad enough ;).
-Obsoletes:      git-core <= 1.5.4.7-4
-%endif
+
+# Obsolete git-arch
+Obsoletes:      git-arch < %{version}-%{release}
 
 %description
@@ -66 +66 @@
 Summary:        Meta-package to pull in all git tools
 Group:          Development/Tools
-%if 0%{?fedora} >= 10
-BuildArch:      noarch
-%endif
-Requires:       git = %{version}-%{release}
-Requires:       git-svn = %{version}-%{release}
+BuildArch:      noarch
+Requires:       git = %{version}-%{release}
 Requires:       git-cvs = %{version}-%{release}
 Requires:       git-email = %{version}-%{release}
-Requires:       gitk = %{version}-%{release}
-Requires:       git-gui = %{version}-%{release}
+#Requires:       git-gui = %{version}-%{release}
+Requires:       git-svn = %{version}-%{release}
+Requires:       git-p4 = %{version}-%{release}
+#Requires:       gitk = %{version}-%{release}
 Requires:       perl-Git = %{version}-%{release}
-%if 0%{?fedora}
-Requires:       emacs-git = %{version}-%{release}
-Requires:       git-arch = %{version}-%{release}
-%endif
-%if 0%{?fedora} || 0%{?rhel} >= 5
+#Requires:       emacs-git = %{version}-%{release}
 Obsoletes:      git <= 1.5.4.3
-%else
-# EL-4 has 1.5.4.7-3.el4.  We don't support this, but no point making it more
-# difficult than it needs to be (folks stuck on EL-4 have it bad enough ;).
-Obsoletes:      git <= 1.5.4.7-4
-%endif
 
 %description all
@@ -95 +85 @@
 This is a dummy package which brings in all subpackages.
 
+%package bzr
+Summary:        Git tools for working with bzr repositories
+Group:          Development/Tools
+BuildArch:      noarch
+Requires:       git = %{version}-%{release}
+Requires:       bzr
+
+%description bzr
+%{summary}.
+
 %package daemon
 Summary:        Git protocol dÊmon
 Group:          Development/Tools
 Requires:       git = %{version}-%{release}
+#%if %{use_systemd}
+#Requires:      systemd
+#Requires(post): systemd
+#Requires(preun): systemd
+#Requires(postun): systemd
+#%else
 #Requires:       xinetd
+#%endif
 %description daemon
 The git dÊmon for supporting git:// access to git repositories
 
+%if 0
 %package -n gitweb
 Summary:        Simple web interface to git repositories
 Group:          Development/Tools
-%if 0%{?fedora} >= 10
-BuildArch:      noarch
-%endif
+BuildArch:      noarch
 Requires:       git = %{version}-%{release}
 
 %description -n gitweb
 Simple web interface to track changes in git repositories
-
+%endif
+
+%package hg
+Summary:        Git tools for working with mercurial repositories
+Group:          Development/Tools
+BuildArch:      noarch
+Requires:       git = %{version}-%{release}
+Requires:       mercurial >= 1.8
+
+%description hg
+%{summary}.
+
+%package p4
+Summary:        Git tools for working with Perforce depots
+Group:          Development/Tools
+BuildArch:      noarch
+BuildRequires:  python
+Requires:       git = %{version}-%{release}
+%description p4
+%{summary}.
 
 %package svn
 Summary:        Git tools for importing Subversion repositories
 Group:          Development/Tools
-%if 0%{?fedora} >= 10
-BuildArch:      noarch
-%endif
-Requires:       git = %{version}-%{release}, subversion, perl(Term::ReadKey)
+Requires:       git = %{version}-%{release}, subversion, subversion-perl
+#Requires:       perl(Term::ReadKey)
 %description svn
 Git tools for importing Subversion repositories.
@@ -128 +151 @@
 Summary:        Git tools for importing CVS repositories
 Group:          Development/Tools
-%if 0%{?fedora} >= 10
-BuildArch:      noarch
-%endif
+BuildArch:      noarch
 Requires:       git = %{version}-%{release}, cvs
-%if 0%{?fedora} || 0%{?rhel} >= 5
 Requires:       cvsps
-%endif
+Requires:       perl-DBD-SQLite
 %description cvs
 Git tools for importing CVS repositories.
 
-%if 0%{?fedora}
-%package arch
-Summary:        Git tools for importing Arch repositories
-Group:          Development/Tools
-%if 0%{?fedora} >= 10
-BuildArch:      noarch
-%endif
-Requires:       git = %{version}-%{release}, tla
-%description arch
-Git tools for importing Arch repositories.
-%endif
-
 %package email
 Summary:        Git tools for sending email
 Group:          Development/Tools
-%if 0%{?fedora} >= 10
-BuildArch:      noarch
-%endif
+BuildArch:      noarch
 Requires:       git = %{version}-%{release}, perl-Git = %{version}-%{release}
 Requires:       perl(Authen::SASL)
-%if 0%{?fedora} || 0%{?rhel} >= 5
 Requires:       perl(Net::SMTP::SSL)
-%endif
 %description email
 Git tools for sending email.
 
+%if 0
+
 %package gui
 Summary:        Git GUI tool
 Group:          Development/Tools
-%if 0%{?fedora} >= 10
-BuildArch:      noarch
-%endif
+BuildArch:      noarch
 Requires:       git = %{version}-%{release}, tk >= 8.4
 Requires:       gitk = %{version}-%{release}
@@ -178 +182 @@
 Summary:        Git revision tree visualiser
 Group:          Development/Tools
-%if 0%{?fedora} >= 10
-BuildArch:      noarch
-%endif
+BuildArch:      noarch
 Requires:       git = %{version}-%{release}, tk >= 8.4
 %description -n gitk
 Git revision tree visualiser.
 
+%endif
+
 %package -n perl-Git
 Summary:        Perl interface to Git
 Group:          Development/Libraries
-%if 0%{?fedora} >= 10
-BuildArch:      noarch
-%endif
-Requires:       git = %{version}-%{release}
-%if 0%{?fedora} || 0%{?rhel} >= 5
-BuildRequires:  perl(Error), perl(ExtUtils::MakeMaker)
-Requires:       perl(Error)
-%endif
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+BuildArch:      noarch
+Requires:       git = %{version}-%{release}
+#BuildRequires:  perl(Error)
+BuildRequires:  perl(ExtUtils::MakeMaker)
+#Requires:       perl(Error)
+#Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description -n perl-Git
 Perl interface to Git.
 
-%if 0%{?fedora}
+%package -n perl-Git-SVN
+Summary:        Perl interface to Git::SVN
+Group:          Development/Libraries
+BuildArch:      noarch
+Requires:       git = %{version}-%{release}
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+
+%description -n perl-Git-SVN
+Perl interface to Git.
+
+%if 0
+
 %package -n emacs-git
 Summary:        Git version control system support for Emacs
 Group:          Applications/Editors
-%if 0%{?fedora} >= 10
-BuildArch:      noarch
-%endif
-Requires:       git = %{version}-%{release}, emacs-common >= 22.2
+Requires:       git = %{version}-%{release}
+BuildArch:      noarch
+Requires:       emacs(bin) >= %{_emacs_version}
 
 %description -n emacs-git
 %{summary}.
-%endif
+
+%package -n emacs-git-el
+Summary:        Elisp source files for git version control system support for Emacs
+Group:          Applications/Editors
+BuildArch:      noarch
+Requires:       emacs-git = %{version}-%{release}
+
+%description -n emacs-git-el
+%{summary}.
+
+%endif
+
 
 %prep
-%setup -q -a 1
-%patch0 -p1
+%if %(sh -c 'if test -f "%{_sourcedir}/%{name}-%{version}-r%{svn_rev}.zip" ; then echo 1 ; else echo 0 ; fi')
+%setup -q
+%else
+%setup -n "%{name}-%{version}" -Tc
+svn export -r %{svn_rev} %{svn_url} . --force
+rm -f "%{_sourcedir}/%{name}-%{version}-r%{svn_rev}.zip"
+(cd .. && zip -SrX9 "%{_sourcedir}/%{name}-%{version}-r%{svn_rev}.zip" "%{name}-%{version}")
+%endif
 
 # Use these same options for every invocation of 'make'.
@@ -223 +251 @@
 V = 1
 CFLAGS = %{optflags}
-BLK_SHA1 = 1
-NEEDS_CRYPTO_WITH_SSL = 1
-NO_PYTHON = 1
+#BLK_SHA1 = 1
+#NEEDS_CRYPTO_WITH_SSL = 1
+#USE_LIBPCRE = 1
 ETC_GITCONFIG = %{_sysconfdir}/gitconfig
 DESTDIR = %{buildroot}
 INSTALL = install -p
 GITWEB_PROJECTROOT = %{_var}/lib/git
-htmldir = %{_docdir}/%{name}-%{version}
+GNU_ROFF = 1
+htmldir = %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}
 prefix = %{_prefix}
+gitwebdir = %{_var}/www/git
 EOF
 
-%if 0%{?fedora}
-cat << \EOF >> config.mak
-ASCIIDOC8 = 1
-ASCIIDOC_NO_ROFF = 1
-EOF
-%endif
-
-%if 0%{?rhel} && 0%{?rhel} <= 5
+%if "%{gitcoredir}" == "%{_bindir}"
 echo gitexecdir = %{_bindir} >> config.mak
 %endif
 
-# Filter bogus perl requires
-# packed-refs comes from a comment in contrib/hooks/update-paranoid
-cat << \EOF > %{name}-req
-#!/bin/sh
-%{__perl_requires} $* |\
-sed -e '/perl(packed-refs)/d'
-EOF
-
-%global __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req
-chmod +x %{__perl_requires}
+%if %{docbook_suppress_sp}
+# This is needed for 1.69.1-1.71.0
+echo DOCBOOK_SUPPRESS_SP = 1 >> config.mak
+%endif
 
 %build
-export MAKESHELL=/@unixroot/usr/bin/sh
-export CONFIG_SHELL=/@unixroot/usr/bin/sh
-export LDFLAGS="-Zbin-files -Zhigh-mem -Zomf -Zexe -Zargs-wild -Zargs-resp"
-export LIBS="-lurpo"
-%configure \
-        --without-tcltk \
-        "--cache-file=%{_topdir}/cache/%{name}-%{_target_cpu}.cache"
-
-make %{?_smp_mflags} all %{!?_without_docs: doc}
-
-%if 0%{?fedora}
+make %{?_smp_mflags} all
+%if ! 0%{?_without_docs}
+make doc
+%endif
+
+%if 0
 make -C contrib/emacs
 %endif
+
+make -C contrib/subtree/
 
 # Remove shebang from bash-completion script
@@ -275 +289 @@
 
 %install
-export MAKESHELL=/@unixroot/usr/bin/sh
 rm -rf %{buildroot}
-make %{?_smp_mflags} INSTALLDIRS=vendor install %{!?_without_docs: install-doc}
-
-%if 0%{?fedora}
+make INSTALLDIRS=vendor install
+%if ! 0%{?_without_docs}
+make INSTALLDIRS=vendor install-doc
+%endif
+
+%if 0
+
+%global elispdir %{_emacs_sitelispdir}/git
 make -C contrib/emacs install \
-    emacsdir=%{buildroot}%{_datadir}/emacs/site-lisp
-for elc in %{buildroot}%{_datadir}/emacs/site-lisp/*.elc ; do
+    emacsdir=%{buildroot}%{elispdir}
+for elc in %{buildroot}%{elispdir}/*.elc ; do
     install -pm 644 contrib/emacs/$(basename $elc .elc).el \
-    %{buildroot}%{_datadir}/emacs/site-lisp
+    %{buildroot}%{elispdir}
 done
-install -Dpm 644 %{SOURCE1} \
-    %{buildroot}%{_datadir}/emacs/site-lisp/site-start.d/git-init.el
-%endif
-
-mkdir -p %{buildroot}%{_var}/www/git
-#install -pm 644 gitweb/*.css %{buildroot}%{_var}/www/git
-#install -pm 644 gitweb/*.js %{buildroot}%{_var}/www/git
-#install -pm 644 gitweb/*.png %{buildroot}%{_var}/www/git
-#install -pm 755 gitweb/gitweb.cgi %{buildroot}%{_var}/www/git
-#mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d
-#install -pm 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/httpd/conf.d/git.conf
-#sed "s|@PROJECTROOT@|%{_var}/lib/git|g" \
-#    %{SOURCE5} > %{buildroot}%{_sysconfdir}/gitweb.conf
+install -Dpm 644 %{SOURCE2} \
+    %{buildroot}%{_emacs_sitestartdir}/git-init.el
+
+%endif
+
+make -C contrib/subtree install
+%if ! 0%{?_without_docs}
+make -C contrib/subtree install-doc
+%endif
+
+%if 0
+mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d
+install -pm 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/httpd/conf.d/git.conf
+sed "s|@PROJECTROOT@|%{_var}/lib/git|g" \
+    %{SOURCE6} > %{buildroot}%{_sysconfdir}/gitweb.conf
+%else
+rm -rf %{buildroot}%{_var}/www/git/
+%endif
 
 find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
@@ -304 +327 @@
 find %{buildroot} -type f -name perllocal.pod -exec rm -f {} ';'
 
-%if ! 0%{?fedora}
+# git-archimport is not supported
 find %{buildroot} Documentation -type f -name 'git-archimport*' -exec rm -f {} ';'
-%endif
-
-(find %{buildroot}%{_bindir} -type f | grep -vE "archimport|svn|cvs|email|gitk|git-gui|git-citool|git-daemon" | sed -e s@^%{buildroot}@@) > bin-man-doc-files
-(find %{buildroot}%{_libexecdir} -type f | grep -vE "archimport|svn|cvs|email|gitk|git-gui|git-citool|git-daemon" | sed -e s@^%{buildroot}@@) >> bin-man-doc-files
-#(find %{buildroot}%{perl_vendorlib} -type f | sed -e s@^%{buildroot}@@) >> perl-files
+
+exclude_re="archimport|email|git-citool|git-cvs|git-daemon|git-gui|git-remote-bzr|git-remote-hg|gitk|p4|svn"
+(find %{buildroot}%{_bindir} %{buildroot}%{_libexecdir} -type f | grep -vE "$exclude_re" | sed -e s@^%{buildroot}@@) > bin-man-doc-files
+(find %{buildroot}%{_bindir} %{buildroot}%{_libexecdir} -mindepth 1 -type d | grep -vE "$exclude_re" | sed -e 's@^%{buildroot}@%dir @') >> bin-man-doc-files
+(find %{buildroot}%{perl_vendorlib} -type f | sed -e s@^%{buildroot}@@) > perl-git-files
+(find %{buildroot}%{perl_vendorlib} -mindepth 1 -type d | sed -e 's@^%{buildroot}@%dir @') >> perl-git-files
+# Split out Git::SVN files
+grep Git/SVN perl-git-files > perl-git-svn-files
+sed -i "/Git\/SVN/ d" perl-git-files
 %if %{!?_without_docs:1}0
-(find %{buildroot}%{_mandir} -type f | grep -vE "archimport|svn|git-cvs|email|gitk|git-gui|git-citool|git-daemon" | sed -e s@^%{buildroot}@@ -e 's/$/*/' ) >> bin-man-doc-files
+(find %{buildroot}%{_mandir} -type f | grep -vE "$exclude_re|Git" | sed -e s@^%{buildroot}@@ -e 's/$/*/' ) >> bin-man-doc-files
 %else
 rm -rf %{buildroot}%{_mandir}
@@ -318 +345 @@
 
 mkdir -p %{buildroot}%{_var}/lib/git
+%if 0
+%if %{use_systemd}
+mkdir -p %{buildroot}%{_unitdir}
+cp -a %{SOURCE12} %{SOURCE13} %{buildroot}%{_unitdir}
+%else
 mkdir -p %{buildroot}%{_sysconfdir}/xinetd.d
 # On EL <= 5, xinetd does not enable IPv6 by default
@@ -325 +357 @@
     -e "s|\@GITCOREDIR\@|%{gitcoredir}|g;" \
     -e "s|\@BASE_PATH\@|%{_var}/lib/git|g;" \
-%if 0%{?rhel} && 0%{?rhel} <= 5
+%if %{enable_ipv6}
     -e "s|^}|$enable_ipv6\n$&|;" \
 %endif
-    %{SOURCE2} > %{buildroot}%{_sysconfdir}/xinetd.d/git
-
+    %{SOURCE3} > %{buildroot}%{_sysconfdir}/xinetd.d/git
+%endif
+%endif
+
+# Install bzr and hg remote helpers from contrib
+install -pm 755 contrib/remote-helpers/git-remote-* %{buildroot}%{gitcoredir}
+
+# Setup bash completion
 mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d
 install -pm 644 contrib/completion/git-completion.bash %{buildroot}%{_sysconfdir}/bash_completion.d/git
 
+# Install tcsh completion
+mkdir -p %{buildroot}%{_datadir}/git-core/contrib/completion
+install -pm 644 contrib/completion/git-completion.tcsh \
+    %{buildroot}%{_datadir}/git-core/contrib/completion/
+
 # Move contrib/hooks out of %%docdir and make them executable
-#mkdir -p %{buildroot}%{_datadir}/git-core/contrib
-#mv contrib/hooks %{buildroot}%{_datadir}/git-core/contrib
-#chmod +x %{buildroot}%{_datadir}/git-core/contrib/hooks/*
-#pushd contrib > /dev/null
-#ln -s ../../../git-core/contrib/hooks
-#popd > /dev/null
-
-# install git-gui .desktop file
-#desktop-file-install \
-#%if 0%{?rhel} && 0%{?rhel} <= 5
-#    --vendor fedora \
-#%endif
-#    --dir=%{buildroot}%{_datadir}/applications %{SOURCE4}
+mkdir -p %{buildroot}%{_datadir}/git-core/contrib
+mv contrib/hooks %{buildroot}%{_datadir}/git-core/contrib
+chmod +x %{buildroot}%{_datadir}/git-core/contrib/hooks/*
+ln -s ../../../git-core/contrib/hooks contrib/
+
+# Install git-prompt.sh
+mkdir -p %{buildroot}%{_datadir}/git-core/contrib/completion
+install -pm 644 contrib/completion/git-prompt.sh \
+    %{buildroot}%{_datadir}/git-core/contrib/completion/
+
+# find translations
+%if 0
+%find_lang %{name} %{name}.lang
+cat %{name}.lang >> bin-man-doc-files
+%else
+find %{buildroot}%{_datadir}/locale/* -type f | sed -e s@^%{buildroot}@@ >> bin-man-doc-files
+%endif
 
 # quiet some rpmlint complaints
 chmod -R g-w %{buildroot}
 find %{buildroot} -name git-mergetool--lib | xargs chmod a-x
-rm -f {Documentation/technical,contrib/emacs}/.gitignore
+rm -f {Documentation/technical,contrib/emacs,contrib/credential/gnome-keyring}/.gitignore
 chmod a-x Documentation/technical/api-index.sh
 find contrib -type f | xargs chmod -x
@@ -359 +406 @@
 rm -rf %{buildroot}
 
+%if %{use_systemd}
+%post daemon
+%systemd_post git.service
+
+%preun daemon
+%systemd_preun git.service
+
+%postun daemon
+%systemd_postun_with_restart git.service
+%endif
 
 %files -f bin-man-doc-files
 %defattr(-,root,root)
 %{_datadir}/git-core/
-%dir %{gitcoredir}
-%doc README COPYING Documentation/*.txt contrib/
+%doc README COPYING Documentation/*.txt Documentation/RelNotes contrib/
 %{!?_without_docs: %doc Documentation/*.html Documentation/docbook-xsl.css}
 %{!?_without_docs: %doc Documentation/howto Documentation/technical}
 %{_sysconfdir}/bash_completion.d
 
+%files bzr
+%defattr(-,root,root)
+%{gitcoredir}/git-remote-bzr
+
+%files hg
+%defattr(-,root,root)
+%{gitcoredir}/git-remote-hg
+
+%files p4
+%defattr(-,root,root)
+%{gitcoredir}/*p4*
+%{gitcoredir}/mergetools/p4merge
+%doc Documentation/*p4*.txt
+%{!?_without_docs: %{_mandir}/man1/*p4*.1*}
+%{!?_without_docs: %doc Documentation/*p4*.html }
 
 %files svn
 %defattr(-,root,root)
 %{gitcoredir}/*svn*
-#%doc Documentation/*svn*.txt
+%doc Documentation/*svn*.txt
 %{!?_without_docs: %{_mandir}/man1/*svn*.1*}
 %{!?_without_docs: %doc Documentation/*svn*.html }
@@ -379 +450 @@
 %files cvs
 %defattr(-,root,root)
-#%doc Documentation/*git-cvs*.txt
+%doc Documentation/*git-cvs*.txt
 %{_bindir}/git-cvsserver
 %{gitcoredir}/*cvs*
@@ -385 +456 @@
 %{!?_without_docs: %doc Documentation/*git-cvs*.html }
 
-%if 0%{?fedora}
-%files arch
-%defattr(-,root,root)
-%doc Documentation/git-archimport.txt
-%{gitcoredir}/git-archimport
-%{!?_without_docs: %{_mandir}/man1/git-archimport.1*}
-%{!?_without_docs: %doc Documentation/git-archimport.html }
-%endif
-
 %files email
 %defattr(-,root,root)
-#%doc Documentation/*email*.txt
+%doc Documentation/*email*.txt
 %{gitcoredir}/*email*
 %{!?_without_docs: %{_mandir}/man1/*email*.1*}
 %{!?_without_docs: %doc Documentation/*email*.html }
 
+%if 0
+
 %files gui
 %defattr(-,root,root)
-#%{gitcoredir}/git-gui*
-#%{gitcoredir}/git-citool
-#%{_datadir}/applications/*git-gui.desktop
-#%{_datadir}/git-gui/
-#%{!?_without_docs: %{_mandir}/man1/git-gui.1*}
-#%{!?_without_docs: %doc Documentation/git-gui.html}
-#%{!?_without_docs: %{_mandir}/man1/git-citool.1*}
-#%{!?_without_docs: %doc Documentation/git-citool.html}
+%{gitcoredir}/git-gui*
+%{gitcoredir}/git-citool
+%{_datadir}/applications/*git-gui.desktop
+%{_datadir}/git-gui/
+%{!?_without_docs: %{_mandir}/man1/git-gui.1*}
+%{!?_without_docs: %doc Documentation/git-gui.html}
+%{!?_without_docs: %{_mandir}/man1/git-citool.1*}
+%{!?_without_docs: %doc Documentation/git-citool.html}
 
 %files -n gitk
 %defattr(-,root,root)
-#%doc Documentation/*gitk*.txt
-#%{_bindir}/*gitk*
-#%{_datadir}/gitk
-#%{!?_without_docs: %{_mandir}/man1/*gitk*.1*}
-#%{!?_without_docs: %doc Documentation/*gitk*.html }
-
-%files -n perl-Git
-# -f perl-files
-%defattr(-,root,root)
-%if 0%{?fedora}
+%doc Documentation/*gitk*.txt
+%{_bindir}/*gitk*
+%{_datadir}/gitk
+%{!?_without_docs: %{_mandir}/man1/*gitk*.1*}
+%{!?_without_docs: %doc Documentation/*gitk*.html }
+
+%endif
+
+%files -n perl-Git -f perl-git-files
+%defattr(-,root,root)
+%{!?_without_docs: %exclude %{_mandir}/man3/*Git*SVN*.3pm*}
+%{!?_without_docs: %{_mandir}/man3/*Git*.3pm*}
+
+%files -n perl-Git-SVN -f perl-git-svn-files
+%defattr(-,root,root)
+%{!?_without_docs: %{_mandir}/man3/*Git*SVN*.3pm*}
+
+%if 0
+
 %files -n emacs-git
 %defattr(-,root,root)
 %doc contrib/emacs/README
-%{_datadir}/emacs/site-lisp/*git*.el*
-%{_datadir}/emacs/site-lisp/site-start.d/git-init.el
+%dir %{elispdir}
+%{elispdir}/*.elc
+%{_emacs_sitestartdir}/git-init.el
+
+%files -n emacs-git-el
+%defattr(-,root,root)
+%{elispdir}/*.el
+
 %endif
 
@@ -434 +513 @@
 %defattr(-,root,root)
 %doc Documentation/*daemon*.txt
+%if %{use_systemd}
+%{_unitdir}/git.socket
+%{_unitdir}/git.service
+%else
+%if 0
 %config(noreplace)%{_sysconfdir}/xinetd.d/git
-%{gitcoredir}/git-daemon.exe
+%endif
+%endif
+%{gitcoredir}/git-daemon*
 %{_var}/lib/git
 %{!?_without_docs: %{_mandir}/man1/*daemon*.1*}
 %{!?_without_docs: %doc Documentation/*daemon*.html}
 
+%if 0
 %files -n gitweb
 %defattr(-,root,root)
-#%doc gitweb/INSTALL gitweb/README
-#%config(noreplace)%{_sysconfdir}/gitweb.conf
-#%config(noreplace)%{_sysconfdir}/httpd/conf.d/git.conf
+%doc gitweb/INSTALL gitweb/README
+%config(noreplace)%{_sysconfdir}/gitweb.conf
+%config(noreplace)%{_sysconfdir}/httpd/conf.d/git.conf
 %{_var}/www/git/
-
+%endif
 
 %files all
@@ -452 +539 @@
 
 %changelog
+* Wed Sep 10 2014 Dmitriy Kuminov <coding@dmik.org> 2.0.0-1
+- Update git to version 2.0.0.
+- Fix cloning and pushing over HTTP(S).
+- Remove many old unneeded patches to have less OS/2-dependent code.
+
 * Sat Dec 17 2011 yd
 - rebuild due to gcc 4.4.6 bug.