Skip to content

Commit 179fe57

Browse files
committed
Fixed issue caused by unpackaged file in libcurl
Starting with curl 8.14.0, wcurl comes bundled in the regular curl release tarballs. Building and installing curl then also installs wcurl and its man page. See https://curl.se/wcurl/. ``` 10:52:25 error: Installed (but unpackaged) file(s) found: 10:52:25 /var/cfengine/bin/wcurl ``` Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech> (cherry picked from commit 7432a53)
1 parent 00f5e76 commit 179fe57

File tree

5 files changed

+5
-12
lines changed

5 files changed

+5
-12
lines changed

deps-packaging/libcurl-hub/cfbuild-libcurl-hub.spec

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ CFEngine Build Automation -- libcurl
8383

8484
%dir %prefix/bin
8585
%prefix/bin/curl
86+
%prefix/bin/wcurl
8687

8788
%dir %prefix/lib
8889
%prefix/lib/*.so*
@@ -100,9 +101,3 @@ CFEngine Build Automation -- libcurl
100101
%prefix/lib/pkgconfig
101102

102103
%changelog
103-
104-
105-
106-
107-
108-

deps-packaging/libcurl/cfbuild-libcurl.spec

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ CFEngine Build Automation -- libcurl
8383

8484
%dir %prefix/bin
8585
%prefix/bin/curl
86+
%prefix/bin/wcurl
8687

8788
%dir %prefix/lib
8889
%prefix/lib/*.so*
@@ -100,9 +101,3 @@ CFEngine Build Automation -- libcurl
100101
%prefix/lib/pkgconfig
101102

102103
%changelog
103-
104-
105-
106-
107-
108-

packaging/cfengine-community/cfengine-community.spec.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ rm -f $RPM_BUILD_ROOT%{prefix}/lib/libpromises.la
6060
rm -f $RPM_BUILD_ROOT%{prefix}/lib/libpromises.so
6161
rm -f $RPM_BUILD_ROOT%{prefix}/bin/openssl
6262
rm -f $RPM_BUILD_ROOT%{prefix}/bin/curl
63+
rm -f $RPM_BUILD_ROOT%{prefix}/bin/wcurl
6364
rm -rf $RPM_BUILD_ROOT%{prefix}/ssl
6465

6566
# For el9+ and suse-15+ we started seeing issues from other packages not expecting init scripts

packaging/cfengine-nova-hub/cfengine-nova-hub.spec.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,7 @@ exit 0
250250
%prefix/bin/git-upload-archive
251251
%prefix/bin/git-upload-pack
252252
%prefix/bin/curl
253+
%prefix/bin/wcurl
253254
#postgresql binaries
254255
%{prefix}/bin/clusterdb
255256
%{prefix}/bin/createdb

packaging/cfengine-nova/cfengine-nova.spec.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ rm -rf $RPM_BUILD_ROOT%{prefix}/share/CoreBase
7070
rm -f $RPM_BUILD_ROOT%{prefix}/bin/getfacl
7171
rm -f $RPM_BUILD_ROOT%{prefix}/bin/openssl
7272
rm -f $RPM_BUILD_ROOT%{prefix}/bin/curl
73+
rm -f $RPM_BUILD_ROOT%{prefix}/bin/wcurl
7374
rm -rf $RPM_BUILD_ROOT%{prefix}/ssl
7475

7576

0 commit comments

Comments
 (0)