-
Notifications
You must be signed in to change notification settings - Fork 562
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
neon: remove the unused fedora macros
- Loading branch information
1 parent
09ff9eb
commit 2edabcd
Showing
2 changed files
with
65 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,62 @@ | ||
--- neon-0.32.2/neon-config.in.multilib | ||
+++ neon-0.32.2/neon-config.in | ||
@@ -5,7 +5,11 @@ | ||
prefix=@prefix@ | ||
exec_prefix=@exec_prefix@ | ||
includedir=@includedir@ | ||
-libdir=@libdir@ | ||
+ | ||
+libdir=`pkg-config --variable=libdir neon` | ||
+CFLAGS=`pkg-config --cflags neon` | ||
+LIBS=`pkg-config --libs neon` | ||
+has_lfs=`pkg-config --variable=has_lfs neon` | ||
|
||
usage() | ||
{ | ||
@@ -23,7 +27,7 @@ | ||
--support FEATURE exit with success if feature is supported | ||
|
||
Known features: | ||
- dav [@NE_FLAG_DAV@], ssl [@NE_FLAG_SSL@], zlib [@NE_FLAG_ZLIB@], ipv6 [@NE_FLAG_IPV6@], lfs [@NE_FLAG_LFS@], | ||
+ dav [@NE_FLAG_DAV@], ssl [@NE_FLAG_SSL@], zlib [@NE_FLAG_ZLIB@], ipv6 [@NE_FLAG_IPV6@], lfs [${has_lfs}], | ||
i18n [@NE_FLAG_I18N@], ts_ssl [@NE_FLAG_TS_SSL@] | ||
|
||
EOF | ||
@@ -69,16 +73,11 @@ | ||
;; | ||
|
||
--cflags) | ||
- echo -I${includedir}/neon @NEON_CFLAGS@ | ||
+ echo ${CFLAGS} | ||
;; | ||
|
||
--libs) | ||
- LIBS="-lneon @NEON_LIBS@" | ||
- # Don't add standard library paths | ||
- if test "$prefix" != "/usr"; then | ||
- LIBS="-L${libdir} ${LIBS}" | ||
- fi | ||
- echo @user_LDFLAGS@ ${LIBS} | ||
+ echo ${LIBS} | ||
;; | ||
|
||
--la-file) | ||
@@ -93,7 +92,7 @@ | ||
zlib|ZLIB) support @NE_FLAG_ZLIB@ ;; | ||
ipv6|IPV6) support @NE_FLAG_IPV6@ ;; | ||
dav|DAV) support @NE_FLAG_DAV@ ;; | ||
- lfs|LFS) support @NE_FLAG_LFS@ ;; | ||
+ lfs|LFS) support ${has_lfs} ;; | ||
i18n|I18N) support @NE_FLAG_I18N@ ;; | ||
ts_ssl|TS_SSL) support @NE_FLAG_TS_SSL@ ;; | ||
*) support no ;; | ||
--- neon-0.32.2/neon.pc.in.multilib | ||
+++ neon-0.32.2/neon.pc.in | ||
@@ -2,6 +2,7 @@ | ||
exec_prefix=@exec_prefix@ | ||
libdir=@libdir@ | ||
includedir=@includedir@ | ||
+has_lfs=@NE_FLAG_LFS@ | ||
|
||
Name: neon | ||
Description: HTTP/WebDAV client library |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,16 +2,10 @@ Vendor: Microsoft Corporation | |
Distribution: Azure Linux | ||
|
||
%bcond_without tests | ||
%if 0%{?fedora} | ||
%bcond_without pkcs11 | ||
%else | ||
|
||
%bcond_with pkcs11 | ||
%endif | ||
%if 0%{?fedora} | ||
%bcond_without libproxy | ||
%else | ||
|
||
%bcond_with libproxy | ||
%endif | ||
|
||
# Disable automatic .la file removal | ||
%global __brp_remove_la_files %nil | ||
|
@@ -112,7 +106,7 @@ make %{?_smp_mflags} check | |
|
||
%changelog | ||
* Tue Dec 17 2024 Durga Jagadeesh Palli <[email protected]> - 0.33.0-2 | ||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild | ||
- Initial Azure Linux import from Fedora 41 (license: MIT) | ||
- License verified | ||
|
||
* Fri Oct 15 2021 Pawel Winogrodzki <[email protected]> - 0.31.2-2 | ||
|