Skip to content

Commit 0080a39

Browse files
authored
git: fix git-subtree subpackage (microsoft#13954)
Signed-off-by: Muhammad Falak R Wani <[email protected]>
1 parent a12caeb commit 0080a39

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

SPECS/git/git.spec

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
%bcond daemon 1
32
%bcond subtree 1
43
%bcond svn 0
@@ -7,7 +6,7 @@
76
Summary: Fast distributed version control system
87
Name: git
98
Version: 2.45.4
10-
Release: 2%{?dist}
9+
Release: 3%{?dist}
1110
License: GPLv2
1211
Vendor: Microsoft Corporation
1312
Distribution: Azure Linux
@@ -120,11 +119,13 @@ make configure
120119
--libexec=%{_libexecdir} \
121120
--with-gitconfig=%{_sysconfdir}/gitconfig
122121
make %{?_smp_mflags} CFLAGS="%{optflags}" CXXFLAGS="%{optflags}"
122+
%make_build -C contrib/subtree/ all
123123

124124
%install
125125
%make_install
126126
install -vdm 755 %{buildroot}%{_datadir}/bash-completion/completions
127127
install -m 0644 contrib/completion/git-completion.bash %{buildroot}%{_datadir}/bash-completion/completions/git
128+
%make_install -C contrib/subtree
128129
%find_lang %{name}
129130
%{_fixperms} %{buildroot}/*
130131

@@ -166,7 +167,7 @@ fi
166167

167168
%if %{with subtree}
168169
%files subtree
169-
%{_libexecdir}/git-core/git-merge-subtree
170+
%{_libexecdir}/git-core/git-subtree
170171
%endif
171172

172173
%if %{with svn}
@@ -175,6 +176,9 @@ fi
175176
%endif
176177

177178
%changelog
179+
* Wed Jul 23 2025 Muhammad Falak <[email protected]> - 2.45.4-3
180+
- Fix subtree subpackage
181+
178182
* Fri Jul 18 2025 Archana Shettigar <[email protected]> - 2.45.4-2
179183
- Fix ptest with new git config syntax in CVE-2025-48384
180184

0 commit comments

Comments
 (0)