Skip to content

Commit 3346e30

Browse files
committed
squashme: put back some openssl things that should or should not be included in package
1 parent b9bf282 commit 3346e30

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,12 @@ rm -f $RPM_BUILD_ROOT%{prefix}/lib/cfengine-enterprise.la
7777
rm -f $RPM_BUILD_ROOT%{prefix}/lib/cfengine-report-collect.la
7878
rm -f $RPM_BUILD_ROOT%{prefix}/bin/getfacl
7979

80+
# Remove ssl things we don't need
81+
rm -f %{prefix}/ssl/misc/CA.pl
82+
rm -f %{prefix}/ssl/misc/tsget
83+
rm -f %{prefix}/ssl/openssl.cnf.dist
84+
rm -f %{prefix}/ssl/misc/tsget.pl
85+
8086
# Hub does not need cf-upgrade, it is only present in host packages
8187
rm -f $RPM_BUILD_ROOT%{prefix}/bin/cf-upgrade
8288

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ rm -f $RPM_BUILD_ROOT%{prefix}/lib/libpromises.so
5757
rm -f $RPM_BUILD_ROOT%{prefix}/lib/cfengine-enterprise.la
5858
rm -rf $RPM_BUILD_ROOT%{prefix}/share/CoreBase
5959
rm -f $RPM_BUILD_ROOT%{prefix}/bin/getfacl
60+
rm -f $RPM_BUILD_ROOT%{prefix}/bin/openssl
6061
rm -f $RPM_BUILD_ROOT%{prefix}/bin/curl
6162
rm -f $RPM_BUILD_ROOT%{prefix}/bin/wcurl
6263
rm -rf $RPM_BUILD_ROOT%{prefix}/ssl

0 commit comments

Comments
 (0)