diff --git a/git-1.7.6.1.tar.bz2.sign b/git-1.7.6.1.tar.bz2.sign new file mode 100644 index 0000000..b7ffb45 --- /dev/null +++ b/git-1.7.6.1.tar.bz2.sign @@ -0,0 +1,8 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.11 (GNU/Linux) +Comment: See http://www.kernel.org/signature.html for info + +iD8DBQBOVZCyyGugalF9Dw4RAmGsAKCS1gD8soK84X5rSX0/nlcdTde90wCdEG8e +P1MrSqSH3yuGkFzFieprZSA= +=/XaV +-----END PGP SIGNATURE----- diff --git a/git.spec b/git.spec index cb5b64e..db94acd 100644 --- a/git.spec +++ b/git.spec @@ -1,23 +1,86 @@ # Pass --without docs to rpmbuild if you don't want the documentation + +# Leave git-* binaries in %{_bindir} on EL <= 5 %if 0%{?rhel} && 0%{?rhel} <= 5 %global gitcoredir %{_bindir} %else %global gitcoredir %{_libexecdir}/git-core %endif +# Build noarch subpackages and use libcurl-devel on Fedora and EL >= 6 +%if 0%{?fedora} || 0%{?rhel} >= 6 +%global noarch_sub 1 +%global libcurl_devel libcurl-devel +%else +%global noarch_sub 0 +%global libcurl_devel curl-devel +%endif + +# Build git-emacs, use perl(Error) and perl(Net::SMTP::SSL), require cvsps, and +# adjust git-core obsolete version on Fedora and EL >= 5. (We don't really +# support EL-4, but folks stuck using it have enough problems, no point making +# it harder on them.) +%if 0%{?fedora} || 0%{?rhel} >= 5 +%global emacs_support 1 +%global git_core_version 1.5.4.3 +%global perl_error 1 +%global perl_net_smtp_ssl 1 +%global require_cvsps 1 +%else +%global emacs_support 0 +%global git_core_version 1.5.4.7-4 +%global perl_error 0 +%global perl_net_smtp_ssl 0 +%global require_cvsps 0 +%endif + +# Patch emacs and tweak docbook spaces on EL-5 +%if 0%{?rhel} == 5 +%global emacs_old 1 +%global docbook_suppress_sp 1 +%else +%global emacs_old 0 +%global docbook_suppress_sp 0 +%endif + +# Enable ipv6 for git-daemon and use desktop --vendor option on EL <= 5 +%if 0%{?rhel} && 0%{?rhel} <= 5 +%global enable_ipv6 1 +%global use_desktop_vendor 1 +%else +%global enable_ipv6 1 +%global use_desktop_vendor 1 +%endif + +# Use asciidoc-7 on EL <= 4. Again, we don't support EL-4, but no need to make +# it more difficult to build a modern git there. +%if 0%{?rhel} && 0%{?rhel} <= 4 +%global asciidoc7 1 +%else +%global asciidoc7 0 +%endif + +# Only build git-arch for Fedora < 16, where tla is available +%if 0%{?fedora} && 0%{?fedora} < 16 +%global arch_support 1 +%else +%global arch_support 0 +%endif + Name: git -Version: 1.7.6 +Version: 1.7.6.1 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-init.el -Source2: git.xinetd.in -Source3: git.conf.httpd -Source4: git-gui.desktop -Source5: gitweb.conf.in +Source1: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.bz2.sign +Source2: git-init.el +Source3: git.xinetd.in +Source4: git.conf.httpd +Source5: git-gui.desktop +Source6: gitweb.conf.in Patch0: git-1.5-gitweb-home-link.patch # https://bugzilla.redhat.com/490602 Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch @@ -28,14 +91,10 @@ Patch3: git-1.7-el5-emacs-support.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils -%if 0%{?fedora} || 0%{?rhel} >= 5 +%if %{emacs_support} BuildRequires: emacs %endif -%if 0%{?fedora} || 0%{?rhel} >= 6 -BuildRequires: libcurl-devel -%else -BuildRequires: curl-devel -%endif +BuildRequires: %{libcurl_devel} BuildRequires: expat-devel BuildRequires: gettext BuildRequires: openssl-devel @@ -44,7 +103,7 @@ BuildRequires: zlib-devel >= 1.2 Requires: less Requires: openssh-clients -%if 0%{?fedora} || 0%{?rhel} >= 5 +%if %{perl_error} Requires: perl(Error) %endif Requires: perl-Git = %{version}-%{release} @@ -52,12 +111,11 @@ 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 +Obsoletes: git-core <= %{git_core_version} + +# Obsolete git-arch as needed +%if ! %{arch_support} +Obsoletes: git-arch < %{version}-%{release} %endif %description @@ -72,11 +130,11 @@ SCMs, install the git-all meta-package. %package all Summary: Meta-package to pull in all git tools Group: Development/Tools -%if 0%{?fedora} >= 10 || 0%{?rhel} >= 6 +%if %{noarch_sub} BuildArch: noarch %endif Requires: git = %{version}-%{release} -%if 0%{?fedora} +%if %{arch_support} Requires: git-arch = %{version}-%{release} %endif Requires: git-cvs = %{version}-%{release} @@ -85,16 +143,10 @@ Requires: git-gui = %{version}-%{release} Requires: git-svn = %{version}-%{release} Requires: gitk = %{version}-%{release} Requires: perl-Git = %{version}-%{release} -%if 0%{?fedora} || 0%{?rhel} >= 5 +%if %{emacs_support} Requires: emacs-git = %{version}-%{release} %endif -%if 0%{?fedora} || 0%{?rhel} >= 5 -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 +Obsoletes: git <= %{git_core_version} %description all Git is a fast, scalable, distributed revision control system with an @@ -113,7 +165,7 @@ The git dæmon for supporting git:// access to git repositories %package -n gitweb Summary: Simple web interface to git repositories Group: Development/Tools -%if 0%{?fedora} >= 10 || 0%{?rhel} >= 6 +%if %{noarch_sub} BuildArch: noarch %endif Requires: git = %{version}-%{release} @@ -125,7 +177,7 @@ Simple web interface to track changes in git repositories %package svn Summary: Git tools for importing Subversion repositories Group: Development/Tools -%if 0%{?fedora} >= 10 || 0%{?rhel} >= 6 +%if %{noarch_sub} BuildArch: noarch %endif Requires: git = %{version}-%{release}, subversion, perl(Term::ReadKey) @@ -135,18 +187,18 @@ Git tools for importing Subversion repositories. %package cvs Summary: Git tools for importing CVS repositories Group: Development/Tools -%if 0%{?fedora} >= 10 || 0%{?rhel} >= 6 +%if %{noarch_sub} BuildArch: noarch %endif Requires: git = %{version}-%{release}, cvs -%if 0%{?fedora} || 0%{?rhel} >= 5 +%if %{require_cvsps} Requires: cvsps Requires: perl-DBD-SQLite %endif %description cvs Git tools for importing CVS repositories. -%if 0%{?fedora} +%if %{arch_support} %package arch Summary: Git tools for importing Arch repositories Group: Development/Tools @@ -159,12 +211,12 @@ Git tools for importing Arch repositories. %package email Summary: Git tools for sending email Group: Development/Tools -%if 0%{?fedora} >= 10 || 0%{?rhel} >= 6 +%if %{noarch_sub} BuildArch: noarch %endif Requires: git = %{version}-%{release}, perl-Git = %{version}-%{release} Requires: perl(Authen::SASL) -%if 0%{?fedora} || 0%{?rhel} >= 5 +%if %{perl_net_smtp_ssl} Requires: perl(Net::SMTP::SSL) %endif %description email @@ -173,7 +225,7 @@ Git tools for sending email. %package gui Summary: Git GUI tool Group: Development/Tools -%if 0%{?fedora} >= 10 || 0%{?rhel} >= 6 +%if %{noarch_sub} BuildArch: noarch %endif Requires: git = %{version}-%{release}, tk >= 8.4 @@ -184,7 +236,7 @@ Git GUI tool. %package -n gitk Summary: Git revision tree visualiser Group: Development/Tools -%if 0%{?fedora} >= 10 || 0%{?rhel} >= 6 +%if %{noarch_sub} BuildArch: noarch %endif Requires: git = %{version}-%{release}, tk >= 8.4 @@ -194,11 +246,11 @@ Git revision tree visualiser. %package -n perl-Git Summary: Perl interface to Git Group: Development/Libraries -%if 0%{?fedora} >= 10 || 0%{?rhel} >= 6 +%if %{noarch_sub} BuildArch: noarch %endif Requires: git = %{version}-%{release} -%if 0%{?fedora} || 0%{?rhel} >= 5 +%if %{perl_error} BuildRequires: perl(Error), perl(ExtUtils::MakeMaker) Requires: perl(Error) %endif @@ -207,12 +259,12 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $versi %description -n perl-Git Perl interface to Git. -%if 0%{?fedora} || 0%{?rhel} >= 5 +%if %{emacs_support} %package -n emacs-git Summary: Git version control system support for Emacs Group: Applications/Editors Requires: git = %{version}-%{release} -%if 0%{?fedora} || 0%{?rhel} >= 6 +%if %{noarch_sub} BuildArch: noarch Requires: emacs(bin) >= %{_emacs_version} %else @@ -225,7 +277,7 @@ Requires: emacs-common %package -n emacs-git-el Summary: Elisp source files for git version control system support for Emacs Group: Applications/Editors -%if 0%{?fedora} || 0%{?rhel} >= 6 +%if %{noarch_sub} BuildArch: noarch %endif Requires: emacs-git = %{version}-%{release} @@ -239,7 +291,7 @@ Requires: emacs-git = %{version}-%{release} %patch0 -p1 %patch1 -p1 %patch2 -p1 -%if 0%{?rhel} == 5 +%if %{emacs_old} %patch3 -p1 %endif @@ -260,16 +312,16 @@ prefix = %{_prefix} gitwebdir = %{_var}/www/git EOF -%if 0%{?rhel} && 0%{?rhel} <= 5 +%if "%{gitcoredir}" == "%{_bindir}" echo gitexecdir = %{_bindir} >> config.mak %endif -%if 0%{?rhel} && 0%{?rhel} == 5 +%if %{docbook_suppress_sp} # This is needed for 1.69.1-1.71.0 echo DOCBOOK_SUPPRESS_SP = 1 >> config.mak %endif -%if 0%{?rhel} && 0%{?rhel} <= 4 +%if %{asciidoc7} echo ASCIIDOC7 = 1 >> config.mak %endif @@ -287,7 +339,7 @@ chmod +x %{__perl_requires} %build make %{?_smp_mflags} all %{!?_without_docs: doc} -%if 0%{?fedora} || 0%{?rhel} >= 5 +%if %{emacs_support} make -C contrib/emacs %endif @@ -298,8 +350,8 @@ sed -i '/^#!bash/,+1 d' contrib/completion/git-completion.bash rm -rf %{buildroot} make %{?_smp_mflags} INSTALLDIRS=vendor install %{!?_without_docs: install-doc} -%if 0%{?fedora} || 0%{?rhel} >= 5 -%if 0%{?rhel} == 5 +%if %{emacs_support} +%if %{emacs_old} %global _emacs_sitelispdir %{_datadir}/emacs/site-lisp %global _emacs_sitestartdir %{_emacs_sitelispdir}/site-start.d %endif @@ -310,20 +362,20 @@ for elc in %{buildroot}%{elispdir}/*.elc ; do install -pm 644 contrib/emacs/$(basename $elc .elc).el \ %{buildroot}%{elispdir} done -install -Dpm 644 %{SOURCE1} \ +install -Dpm 644 %{SOURCE2} \ %{buildroot}%{_emacs_sitestartdir}/git-init.el %endif mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d -install -pm 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/httpd/conf.d/git.conf +install -pm 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/httpd/conf.d/git.conf sed "s|@PROJECTROOT@|%{_var}/lib/git|g" \ - %{SOURCE5} > %{buildroot}%{_sysconfdir}/gitweb.conf + %{SOURCE6} > %{buildroot}%{_sysconfdir}/gitweb.conf find %{buildroot} -type f -name .packlist -exec rm -f {} ';' find %{buildroot} -type f -name '*.bs' -empty -exec rm -f {} ';' find %{buildroot} -type f -name perllocal.pod -exec rm -f {} ';' -%if ! 0%{?fedora} +%if ! %{arch_support} find %{buildroot} Documentation -type f -name 'git-archimport*' -exec rm -f {} ';' %endif @@ -343,10 +395,10 @@ enable_ipv6=" # xinetd does not enable IPv6 by default perl -p \ -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 mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d install -pm 644 contrib/completion/git-completion.bash %{buildroot}%{_sysconfdir}/bash_completion.d/git @@ -361,10 +413,10 @@ popd > /dev/null # install git-gui .desktop file desktop-file-install \ -%if 0%{?rhel} && 0%{?rhel} <= 5 +%if %{use_desktop_vendor} --vendor fedora \ %endif - --dir=%{buildroot}%{_datadir}/applications %{SOURCE4} + --dir=%{buildroot}%{_datadir}/applications %{SOURCE5} # quiet some rpmlint complaints chmod -R g-w %{buildroot} @@ -403,7 +455,7 @@ rm -rf %{buildroot} %{!?_without_docs: %{_mandir}/man1/*cvs*.1*} %{!?_without_docs: %doc Documentation/*git-cvs*.html } -%if 0%{?fedora} +%if %{arch_support} %files arch %defattr(-,root,root) %doc Documentation/git-archimport.txt @@ -442,7 +494,7 @@ rm -rf %{buildroot} %defattr(-,root,root) %{!?_without_docs: %{_mandir}/man3/*Git*.3pm*} -%if 0%{?fedora} || 0%{?rhel} >= 5 +%if %{emacs_support} %files -n emacs-git %defattr(-,root,root) %doc contrib/emacs/README @@ -476,9 +528,30 @@ rm -rf %{buildroot} # No files for you! %changelog +* Fri Aug 26 2011 Todd Zullinger - 1.7.6.1-1 +- Update to 1.7.6.1 +- Include gpg signature for tarball in SRPM + +* Fri Aug 05 2011 Todd Zullinger - 1.7.6-5 +- Fix git push --quiet, thanks to Clemens Buchacher (#725593) +- Obsolete git-arch as needed + +* Tue Jul 26 2011 Todd Zullinger - 1.7.6-4 +- Drop git-arch on fedora >= 16, the tla package has been retired +- Rework most spec file dist conditionals to make future changes easier + +* Thu Jul 21 2011 Petr Sabata - 1.7.6-3 +- Perl mass rebuild + +* Wed Jul 20 2011 Petr Sabata - 1.7.6-2 +- Perl mass rebuild + * Wed Jun 29 2011 Adam Tkac - 1.7.6-1 - update to 1.7.6 +* Mon Jun 20 2011 Marcela Mašláňová - 1.7.5.4-2 +- Perl mass rebuild + * Thu Jun 09 2011 Adam Tkac - 1.7.5.4-1 - update to 1.7.5.4 diff --git a/sources b/sources index 9c931b7..488926d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9e0a438eb71e89eedb61f89470ed32a0 git-1.7.6.tar.bz2 +d1e00772cc9dc6c571999feb9e8771ab git-1.7.6.1.tar.bz2