← Back to branch summary

~ubuntu-branches/ubuntu/intrepid/git-core/intrepid-updates

« back to all changes in this revision

Viewing changes to git.spec

  • Committer: Package Import Robot
  • Author(s): Gerrit Pape
  • Date: 2007-05-01 08:59:06 UTC
  • mfrom: (1.1.15)
  • Revision ID: package-import@ubuntu.com-20070501085906-n1e5qzoc00wvlzt3
Tags: 1:1.5.1.3-1
http://bugs.debian.org/420671
http://bugs.debian.org/420112
* new upstream point release.
  * git-add tried to optimize by finding common leading directories
    across its arguments but botched, causing very confused behaviour
    (closes: #420671).
  * Documentation/git-reset.txt: suggest git commit --amend in example
    (closes: #420112).
  * unofficial rpm.spec file shipped with git was letting ETC_GITCONFIG
    set to /usr/etc/gitconfig.  Tweak the official Makefile to make it
    harder for distro people to make the same mistake, by setting the
    variable to /etc/gitconfig if prefix is set to /usr (closes:
    #420675).
* debian/changelog.upstream: upstream changes taken from mailing list
  announcement.

Show diffs side-by-side

added added

removed removed

Lines of Context:
git.spec
1
1
# Pass --without docs to rpmbuild if you don't want the documentation
2
2
Name:           git
3
 
Version:        1.5.1.2
 
3
Version:        1.5.1.3
4
4
Release:        1%{?dist}
5
5
Summary:        Git core and tools
6
6
License:        GPL
86
86
 
87
87
%build
88
88
make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease \
 
89
     ETC_GITCONFIG=/etc/gitconfig \
89
90
     prefix=%{_prefix} all %{!?_without_docs: doc}
90
91
 
91
92
%install
92
93
rm -rf $RPM_BUILD_ROOT
93
94
make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" DESTDIR=$RPM_BUILD_ROOT \
94
95
     WITH_OWN_SUBPROCESS_PY=YesPlease \
 
96
     ETC_GITCONFIG=/etc/gitconfig \
95
97
     prefix=%{_prefix} mandir=%{_mandir} INSTALLDIRS=vendor \
96
98
     install %{!?_without_docs: install-doc}
97
99
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'