rpms / git

Clone
Source Code
GIT

#14 update to 2.33.0
Merged 2 years ago by tmz. Opened 2 years ago by opohorel.
rpms/ opohorel/git 2.33.0  into  rawhide

file modified
+9 -18 
@@ -79,8 +79,8 @@ 
 

  #global rcrev   .rc0
 

  

  Name:           git
 

- Version:        2.32.0
 

- Release:        1%{?rcrev}%{?dist}.2
 

+ Version:        2.33.0
 

+ Release:        1%{?rcrev}%{?dist}
 

  Summary:        Fast Version Control System
 

  License:        GPLv2
 

  URL:            https://git-scm.com/
 
@@ -588,25 +588,17 @@ 
 

  # Fix shebang in a few places to silence rpmlint complaints
 

  %if %{with python2}
 

  sed -i -e '1s@#! */usr/bin/env python$@#!%{__python2}@' \
 

-     contrib/fast-import/import-zips.py \
 

-     contrib/hooks/multimail/git_multimail.py \
 

-     contrib/hooks/multimail/migrate-mailhook-config \
 

-     contrib/hooks/multimail/post-receive.example
 

+     contrib/fast-import/import-zips.py
 

  %else
 

  # Remove contrib/fast-import/import-zips.py which requires python2.
 

  rm -rf contrib/fast-import/import-zips.py
 

  %endif
 

  # endif with python2
 

  

- # The multimail hook is installed with git.  Use python3 to avoid an
 

- # unnecessary python2 dependency, if possible.  Also fix contrib/hg-to-git
 

- # while here.
 

+ # Use python3 to avoid an unnecessary python2 dependency, if possible.
 

  %if %{with python3}
 

  sed -i -e '1s@#!\( */usr/bin/env python\|%{__python2}\)$@#!%{__python3}@' \
 

-     contrib/hg-to-git/hg-to-git.py \
 

-     contrib/hooks/multimail/git_multimail.py \
 

-     contrib/hooks/multimail/migrate-mailhook-config \
 

-     contrib/hooks/multimail/post-receive.example
 

+     contrib/hg-to-git/hg-to-git.py
 

  %endif
 

  # endif with python3
 

  
@@ -705,9 +697,6 @@ 
 

  install -pm 644 contrib/completion/git-completion.tcsh \
 

      %{buildroot}%{_datadir}/git-core/contrib/completion/
 

  

- # Drop .py extension from git_multimail to avoid byte-compiling
 

- mv contrib/hooks/multimail/git_multimail{.py,}
 

- 

  # Move contrib/hooks out of %%docdir
 

  mkdir -p %{buildroot}%{_datadir}/git-core/contrib
 

  mv contrib/hooks %{buildroot}%{_datadir}/git-core/contrib
 
@@ -869,7 +858,6 @@ 
 

  %endif
 

  # endif with emacs
 

  %{_datadir}/git-core/contrib/diff-highlight
 

- %{_datadir}/git-core/contrib/hooks/multimail
 

  %{_datadir}/git-core/contrib/hooks/update-paranoid
 

  %{_datadir}/git-core/contrib/hooks/setgitperms.perl
 

  %{_datadir}/git-core/templates/hooks/fsmonitor-watchman.sample
 
@@ -886,7 +874,6 @@ 
 

  %license COPYING
 

  # exclude is best way here because of troubles with symlinks inside git-core/
 

  %exclude %{_datadir}/git-core/contrib/diff-highlight
 

- %exclude %{_datadir}/git-core/contrib/hooks/multimail
 

  %exclude %{_datadir}/git-core/contrib/hooks/update-paranoid
 

  %exclude %{_datadir}/git-core/contrib/hooks/setgitperms.perl
 

  %exclude %{_datadir}/git-core/templates/hooks/fsmonitor-watchman.sample
 
@@ -997,6 +984,10 @@ 
 

  %{?with_docs:%{_pkgdocdir}/git-svn.html}
 

  

  %changelog
 

+ * Mon Sep 27 2021 Ondřej Pohořelský <opohorel@redhat.com> - 2.33.0-1
 

+ - update to 2.33.0
 

+ - contrib/hooks/multimail is no longer distributed with git
 

+ 

  * Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 2.32.0-1.2
 

  - Rebuilt with OpenSSL 3.0.0

file modified
+2 -2 
@@ -1,2 +1,2 @@ 
 

- SHA512 (git-2.32.0.tar.xz) = 1ab3e7022ccee411d14a7da5c37d6259ef5c0f85ebed8f49698e25c65cbc7a46f8096919fcb6568360bfe284dd7475b596eee1a167db966096255a405853837c
 

- SHA512 (git-2.32.0.tar.sign) = 0f21129c6993a2b1742152829a33064205fb148bd3e26fd3a5f996c31ff920c9f0f22e259d2159eef24b75ac3a592c3152277e5046506e1aabc765bc25f583b9
 

+ SHA512 (git-2.33.0.tar.xz) = 1abbcdf9ff640c95934b6a78341baa76ac3a5838c4751f513f334fdf5a3760c730e309f05ad16ffec115896e3e0c750c116683f6a787d92757ee9d916a346bfd
 

+ SHA512 (git-2.33.0.tar.sign) = 5d6788588a1cb87874ac09d4b0a30b0280d00872617aff2dbae3d1f25eda35095d00b0451c03f262da6c991c46c228f4dcdf02456805b497ffd8ba5bddd942fe

drop git-multimail

Git stopped shipping git-multimail. It is now developed as an independent project.
https://github.com/git-multimail/git-multimail

Build succeeded.

@tmz could you please take a look and approve/disapprove this PR?

Hi @opohorel, sorry for my delayed response.

This is pretty close to a change I had queued up for 2.33.0 but had not pushed. There are a few minor things which might be worth fixing before we merge. I'll comment on them in the diff view.

The trailing \ should be removed from line 15 which remains after the others are removed. It builds now, but only because there's a line following which begins with a comment. That's waiting to bit someone who adds a non-commented line after line 15.

Same as the comment for line 15 regarding the trailing /.

Perhaps make this comment "# Use python3 to avoid an unnecessary python2 dependency, if possible." to ensure the comment explains the reason we're changing hg-to-git?

Perhaps the most minor (as I'm not sure how many people read the changelog or git commit messages in great detail), but maybe this could say "contrib/hooks/multimail is no longer distributed with git" instead, to indicate that we're not dropping it for our own reasons but because upstream doesn't ship it anymore?

In the commit I have locally, I added to this in the commit message:

    The multimail hook was removed from the git contrib tree.  From the
    upstream commit f74d11471f (multimail: stop shipping a copy,
    2021-06-10):

        The multimail project is developed independently and has its own project
        page. Traditionally, we shipped a copy in contrib/.

        However, such a copy is prone to become stale, and users are much better
        served to be directed to the actual project instead.

But that's very minor and maybe no one will read it down the road. :)

The trailing .1 should be removed from the release tag. It's not needed, nor is it in your changelog entry. The previous .2 is only there because of the OpenSSL 3.0 rebuild which likely used rpmdev-bumpspec to increase the release tag.

rebased onto d6916bb
2 years ago

rebased onto f291bcf
2 years ago

Thank you for your feedback! Great catch with the trailing \, I totally missed that.
I've rebased this PR with fixes, please take a look if anything is missing.

Looks great to me. Thanks for taking care of this!

I think it's suitable for rawhide and f35. If you're able to push it out to rawhide or rawhide and f35, that would be excellent. I've been using it locally since it was released without any issues -- though I haven't been as active in that time or I wouldn't have neglected to push it out before now. :)

The removal of git-multimail might make it slightly less desirable for f34 -- but it is only in contrib/ so we might be fine pushing it to f34 at some point too, maybe with a little longer time in updates-testing and a note about the removal of that hook?

Pull-Request has been merged by tmz
2 years ago

Build succeeded.

I've pushed it into F35.

The removal of git-multimail might make it slightly less desirable for f34 -- but it is only in contrib/ so we might be fine pushing it to f34 at some point too, maybe with a little longer time in updates-testing and a note about the removal of that hook?

I think the git-multimail removal is not a big deal. I would personally give it more time and if everything is ok, push it to F34 too.

Sounds good to me. You may need to disable push by autokarma for F34 to ensure it doesn't get a few quick votes and is pushed to stable without any time for most users to test. I've had that happen before. It's very nice that folks test git, but it can also be a bit too quick when it gets 3 positive karma points before it's even reached the testing repo. :)

Thanks also for checking on the devel list for potential users affected by that removal!
Metadata
None
No Tags
Changes Summary 2
+9 -18
file changed
git.spec
+2 -2
file changed
sources
Powered by Pagure 5.14.1
Documentation • File an Issue • About this Instance • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.