Skip to content

Commit 4260090

Browse files
v-smalavathumfrw
andauthored
deltarpm: Update Version from 3.6.2 -> 3.6.5 (#10922)
Co-authored-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
1 parent 2eed56f commit 4260090

3 files changed

Lines changed: 95 additions & 14 deletions

File tree

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"Signatures": {
3-
"deltarpm-3.6.2.tar.gz": "73de6f7b737b7834cf5e08ccb66063e5c7883b0b84a9902a9162115a2ca77f09"
3+
"deltarpm-3.6.5.tar.gz": "f3fba9b96c55be21696466bbfc3b2a623a4fb35646ff9a135f5c29406b412f22"
44
}
55
}

SPECS-EXTENDED/deltarpm/deltarpm.spec

Lines changed: 92 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,20 @@
11
Vendor: Microsoft Corporation
22
Distribution: Azure Linux
3+
## START: Set by rpmautospec
4+
## (rpmautospec version 0.7.2)
5+
## RPMAUTOSPEC: autorelease, autochangelog
6+
%define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
7+
release_number = 1;
8+
base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
9+
print(release_number + base_release_number - 1);
10+
}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
11+
## END: Set by rpmautospec
12+
313
Name: deltarpm
414
Summary: Create deltas between rpms
5-
Version: 3.6.2
6-
Release: 7%{?dist}
7-
License: BSD
15+
Version: 3.6.5
16+
Release: 2%{?dist}
17+
License: BSD-3-Clause
818
URL: https://github.com/rpm-software-management/deltarpm
919
Source: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
1020
BuildRequires: gcc
@@ -43,6 +53,7 @@ a difference between an old and a new iso containing rpms.
4353
Summary: Python bindings for deltarpm
4454
%{?python_provide:%python_provide python3-%{name}}
4555
BuildRequires: python3-devel
56+
BuildRequires: make
4657
Requires: %{name}%{_isa} = %{version}-%{release}
4758

4859
%description -n python3-%{name}
@@ -54,17 +65,19 @@ Python 3 version.
5465
%autosetup -p1
5566

5667
%build
57-
%{__make} %{?_smp_mflags} CFLAGS="%{build_cflags} -DWITH_ZSTD=1" LDFLAGS="%{build_ldflags}" \
68+
%set_build_flags
69+
%make_build CFLAGS="${CFLAGS} -DWITH_ZSTD=1" \
5870
bindir=%{_bindir} libdir=%{_libdir} mandir=%{_mandir} prefix=%{_prefix} \
5971
zlibbundled='' zlibldflags='-lz' zlibcppflags=''
6072

61-
%{__make} %{?_smp_mflags} CFLAGS="%{build_cflags} -DWITH_ZSTD=1" LDFLAGS="%{build_ldflags}" \
73+
%make_build CFLAGS="${CFLAGS} -DWITH_ZSTD=1" \
6274
bindir=%{_bindir} libdir=%{_libdir} mandir=%{_mandir} prefix=%{_prefix} \
6375
zlibbundled='' zlibldflags='-lz' zlibcppflags='' \
6476
python
6577

6678
%install
67-
%makeinstall pylibprefix=%{buildroot}
79+
# cannot use %%make_install here, as then prefix is not passed into the Makefile
80+
%make_build pylibprefix=%{buildroot} mandir=%{buildroot}%{_mandir} prefix=%{buildroot}%{_prefix} install
6881

6982
%files
7083
%license LICENSE.BSD
@@ -95,12 +108,78 @@ Python 3 version.
95108
%{python3_sitearch}/__pycache__/%{name}.*
96109

97110
%changelog
98-
* Tue Jun 01 2021 Thomas Crain <thcrain@microsoft.com> - 3.6.2-7
99-
- Remove unneeded deletion of Python 2 sitelib in buildroot
111+
* Mon Nov 04 2024 Sreenivasulu Malavathula <v-smalavathu@microsoft.com> - 3.6.5-2
112+
- Initial Azure Linux import from Fedora 41 (license: MIT)
113+
- License verified
114+
115+
* Mon Sep 16 2024 Dan Čermák <dan.cermak@cgc-instruments.com> - 3.6.5-1
116+
- New upstream release 3.6.5, fixes rhbz#2312195
117+
118+
* Mon Aug 19 2024 Dan Čermák <dan.cermak@cgc-instruments.com> - 3.6.4-1
119+
- New upstream release 3.6.4, fixes rhbz#2303707
120+
121+
* Mon Aug 19 2024 Dan Čermák <dan.cermak@cgc-instruments.com> - 3.6.3-16
122+
- Switch License identifier to SPDX
123+
124+
* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.3-15
125+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
126+
127+
* Fri Jun 07 2024 Python Maint <python-maint@redhat.com> - 3.6.3-14
128+
- Rebuilt for Python 3.13
129+
130+
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.3-13
131+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
132+
133+
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.3-12
134+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
135+
136+
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.3-11
137+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
138+
139+
* Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 3.6.3-10
140+
- Rebuilt for Python 3.12
141+
142+
* Thu May 25 2023 Adam Williamson <awilliam@redhat.com> - 3.6.3-9
143+
- Rebuild for rpm 4.19
144+
145+
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.3-8
146+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
100147

101-
* Fri Mar 05 2021 Henry Li <lihl@microsoft.com> - 3.6.2-6
102-
- Initial CBL-Mariner import from Fedora 32 (license: MIT).
103-
- Remove python2 instances
148+
* Tue Dec 20 2022 Dan Čermák <dan.cermak@cgc-instruments.com> - 3.6.3-7
149+
- Fix build failure due to %%%%make_install usage
150+
151+
* Tue Dec 20 2022 Dan Čermák <dan.cermak@cgc-instruments.com> - 3.6.3-6
152+
- Switch from %%makeinstall to %%make_install
153+
154+
* Tue Dec 20 2022 Dan Čermák <dan.cermak@cgc-instruments.com> - 3.6.3-5
155+
- Remove distutils from Makefile, fixes rhbz#2155020
156+
157+
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.3-4
158+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
159+
160+
* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 3.6.3-3
161+
- Rebuilt for Python 3.11
162+
163+
* Tue Mar 15 2022 Dan Čermák <dan.cermak@cgc-instruments.com> - 3.6.3-1
164+
- New upstream release 3.6.3
165+
166+
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.2-11
167+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
168+
169+
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.2-10
170+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
171+
172+
* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 3.6.2-9
173+
- Rebuilt for Python 3.10
174+
175+
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.2-8
176+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
177+
178+
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.2-7
179+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
180+
181+
* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 3.6.2-6
182+
- Rebuilt for Python 3.9
104183

105184
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.2-5
106185
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
@@ -402,3 +481,5 @@ Python 3 version.
402481

403482
* Sat Dec 03 2005 Dries Verachtert <dries@ulyssis.org> - 3.3-1 - 3768/dries
404483
- Initial package.
484+
485+
## END: Generated by rpmautospec

cgmanifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2538,8 +2538,8 @@
25382538
"type": "other",
25392539
"other": {
25402540
"name": "deltarpm",
2541-
"version": "3.6.2",
2542-
"downloadUrl": "https://github.com/rpm-software-management/deltarpm/archive/3.6.2/deltarpm-3.6.2.tar.gz"
2541+
"version": "3.6.5",
2542+
"downloadUrl": "https://github.com/rpm-software-management/deltarpm/archive/3.6.5/deltarpm-3.6.5.tar.gz"
25432543
}
25442544
}
25452545
},

0 commit comments

Comments
 (0)