Skip to content

Commit 2eed56f

Browse files
durgajagadeeshdurgajagadeesh
authored
neon: update to 0.33.0 (#11484)
1 parent 4799824 commit 2eed56f

4 files changed

Lines changed: 131 additions & 29 deletions

File tree

SPECS-EXTENDED/neon/neon-0.27.0-multilib.patch renamed to SPECS-EXTENDED/neon/neon-0.32.2-multilib.patch

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
--- neon-0.27.0/neon-config.in.multilib
2-
+++ neon-0.27.0/neon-config.in
1+
--- neon-0.32.2/neon-config.in.multilib
2+
+++ neon-0.32.2/neon-config.in
33
@@ -5,7 +5,11 @@
44
prefix=@prefix@
55
exec_prefix=@exec_prefix@
@@ -22,7 +22,7 @@
2222
i18n [@NE_FLAG_I18N@], ts_ssl [@NE_FLAG_TS_SSL@]
2323

2424
EOF
25-
@@ -69,11 +73,10 @@
25+
@@ -69,16 +73,11 @@
2626
;;
2727

2828
--cflags)
@@ -32,10 +32,16 @@
3232

3333
--libs)
3434
- LIBS="-lneon @NEON_LIBS@"
35-
# Don't add standard library paths
36-
if test "$prefix" != "/usr"; then
37-
LIBS="-L${libdir} ${LIBS}"
38-
@@ -93,7 +96,7 @@
35+
- # Don't add standard library paths
36+
- if test "$prefix" != "/usr"; then
37+
- LIBS="-L${libdir} ${LIBS}"
38+
- fi
39+
- echo @user_LDFLAGS@ ${LIBS}
40+
+ echo ${LIBS}
41+
;;
42+
43+
--la-file)
44+
@@ -93,7 +92,7 @@
3945
zlib|ZLIB) support @NE_FLAG_ZLIB@ ;;
4046
ipv6|IPV6) support @NE_FLAG_IPV6@ ;;
4147
dav|DAV) support @NE_FLAG_DAV@ ;;
@@ -44,8 +50,8 @@
4450
i18n|I18N) support @NE_FLAG_I18N@ ;;
4551
ts_ssl|TS_SSL) support @NE_FLAG_TS_SSL@ ;;
4652
*) support no ;;
47-
--- neon-0.27.0/neon.pc.in.multilib
48-
+++ neon-0.27.0/neon.pc.in
53+
--- neon-0.32.2/neon.pc.in.multilib
54+
+++ neon-0.32.2/neon.pc.in
4955
@@ -2,6 +2,7 @@
5056
exec_prefix=@exec_prefix@
5157
libdir=@libdir@

‎SPECS-EXTENDED/neon/neon.signatures.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"Signatures": {
3-
"neon-0.31.2.tar.gz": "cf1ee3ac27a215814a9c80803fcee4f0ede8466ebead40267a9bd115e16a8678"
3+
"neon-0.33.0.tar.gz": "659a5cc9cea05e6e7864094f1e13a77abbbdbab452f04d751a8c16a9447cf4b8"
44
}
55
}

‎SPECS-EXTENDED/neon/neon.spec‎

Lines changed: 113 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,39 @@
11
Vendor: Microsoft Corporation
22
Distribution: Azure Linux
3+
34
%bcond_without tests
45

6+
%bcond_with pkcs11
7+
8+
%bcond_with libproxy
9+
10+
# Disable automatic .la file removal
11+
%global __brp_remove_la_files %nil
12+
513
Summary: An HTTP and WebDAV client library
614
Name: neon
7-
Version: 0.31.2
8-
Release: 2%{?dist}
9-
License: LGPLv2+
15+
Version: 0.33.0
16+
Release: 3%{?dist}
17+
License: LGPL-2.0-or-later
1018
URL: https://notroj.github.io/neon/
1119
Source0: https://notroj.github.io/neon/neon-%{version}.tar.gz
12-
Patch0: neon-0.27.0-multilib.patch
13-
BuildRequires: gcc-c++
14-
BuildRequires: expat-devel, openssl-devel, zlib-devel, krb5-devel, libproxy-devel
15-
BuildRequires: pkgconfig, pakchois-devel
16-
Requires: ca-certificates
20+
Patch0: neon-0.32.2-multilib.patch
21+
BuildRequires: expat-devel
22+
BuildRequires: openssl-devel
23+
BuildRequires: zlib-devel
24+
BuildRequires: krb5-devel
25+
26+
BuildRequires: pkgconfig
27+
BuildRequires: make
28+
BuildRequires: gcc
29+
BuildRequires: xmlto
30+
31+
%if %{with pkcs11}
32+
BuildRequires: pakchois-devel
33+
%endif
34+
%if %{with libproxy}
35+
BuildRequires: libproxy-devel
36+
%endif
1737
%if %{with tests}
1838
# SSL tests require openssl binary, PKCS#11 testing need certutil
1939
BuildRequires: /usr/bin/perl, /usr/bin/openssl, /usr/bin/certutil
@@ -31,29 +51,31 @@ Summary: Development libraries and C header files for the neon library
3151
Requires: neon = %{version}-%{release}, openssl-devel, zlib-devel, expat-devel
3252
Requires: pkgconfig
3353
# Documentation is GPLv2+
34-
License: LGPLv2+ and GPLv2+
54+
License: LGPL-2.0-or-later AND GPL-2.0-or-later
3555

3656
%description devel
3757
The development library for the C language HTTP and WebDAV client library.
3858

3959
%prep
40-
%setup -q
41-
%patch 0 -p1 -b .multilib
60+
%autosetup -p1
4261

4362
# prevent installation of HTML docs
44-
sed -ibak '/^install-docs/s/install-html//' Makefile.in
63+
sed -i '/^install-docs/s/install-html//' Makefile.in
4564

4665
%build
47-
export CC="%{__cc} -pthread"
4866
%configure --with-expat --enable-shared --disable-static \
4967
--enable-warnings \
5068
--with-ssl=openssl --enable-threadsafe-ssl=posix \
69+
%if %{with libproxy}
5170
--with-libproxy
52-
make %{?_smp_mflags}
71+
%else
72+
--without-libproxy
73+
%endif
74+
%make_build
5375

5476
%install
5577
rm -rf $RPM_BUILD_ROOT
56-
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
78+
%make_install
5779

5880
sed -ri "/^dependency_libs/{s,-l[^ ']*,,g}" \
5981
$RPM_BUILD_ROOT%{_libdir}/libneon.la
@@ -82,8 +104,82 @@ make %{?_smp_mflags} check
82104
%{_libdir}/*.so
83105

84106
%changelog
85-
* Fri Oct 15 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 0.31.2-2
86-
- Initial CBL-Mariner import from Fedora 32 (license: MIT).
107+
* Tue Dec 17 2024 Durga Jagadeesh Palli <v-dpalli@microsoft.com> - 0.33.0-3
108+
- Initial Azure Linux import from Fedora 41 (license: MIT)
109+
- License verified
110+
111+
* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.33.0-2
112+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
113+
114+
* Tue Jan 30 2024 Joe Orton <jorton@redhat.com> - 0.33.0-1
115+
- update to 0.33.0
116+
117+
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.32.5-5
118+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
119+
120+
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.32.5-4
121+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
122+
123+
* Fri Sep 29 2023 Joe Orton <jorton@redhat.com> - 0.32.5-3
124+
- migrated to SPDX license
125+
126+
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.32.5-2
127+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
128+
129+
* Mon Jan 23 2023 Joe Orton <jorton@redhat.com> - 0.32.5-1
130+
- update to 0.32.5
131+
132+
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.32.3-2
133+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
134+
135+
* Mon Sep 5 2022 Joe Orton <jorton@redhat.com> - 0.32.3-1
136+
- update to 0.32.3
137+
138+
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.32.2-5
139+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
140+
141+
* Thu Jan 27 2022 Timm Bäder <tbaeder@redhat.com> - 0.32.2-4
142+
- Disable automatic .la file removal
143+
- https://fedoraproject.org/wiki/Changes/RemoveLaFiles
144+
145+
* Thu Jan 27 2022 Joe Orton <jorton@redhat.com> - 0.32.2-3
146+
- strip LIBS exported by neon-config to the minimum
147+
148+
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.32.2-2
149+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
150+
151+
* Thu Jan 13 2022 Joe Orton <jorton@redhat.com> - 0.32.2-1
152+
- update to 0.32.2
153+
154+
* Tue Sep 21 2021 Joe Orton <jorton@redhat.com> - 0.32.1-1
155+
- update to 0.32.1
156+
- add bcond for libproxy support
157+
158+
* Mon Sep 20 2021 Joe Orton <jorton@redhat.com> - 0.32.0-1
159+
- update to 0.32.0
160+
161+
* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 0.31.2-8
162+
- Rebuilt with OpenSSL 3.0.0
163+
164+
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.31.2-7
165+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
166+
167+
* Thu Feb 4 2021 Joe Orton <jorton@redhat.com> - 0.31.2-6
168+
- add bcond for PKCS#11 support
169+
- use make macros
170+
171+
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.31.2-5
172+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
173+
174+
* Wed Aug 26 2020 Joe Orton <jorton@redhat.com> - 0.31.2-4
175+
- fix tests with current OpenSSL (#1863681)
176+
177+
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.31.2-3
178+
- Second attempt - Rebuilt for
179+
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
180+
181+
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.31.2-2
182+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
87183

88184
* Wed Jun 24 2020 Joe Orton <jorton@redhat.com> - 0.31.2-1
89185
- update to 0.31.2

‎cgmanifest.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13992,8 +13992,8 @@
1399213992
"type": "other",
1399313993
"other": {
1399413994
"name": "neon",
13995-
"version": "0.31.2",
13996-
"downloadUrl": "https://notroj.github.io/neon/neon-0.31.2.tar.gz"
13995+
"version": "0.33.0",
13996+
"downloadUrl": "https://notroj.github.io/neon/neon-0.33.0.tar.gz"
1399713997
}
1399813998
}
1399913999
},

0 commit comments

Comments
 (0)