Skip to content

Commit 2458dc7

Browse files
author
Andrew Branson
committed
[rpm] Switch crypto from nss to openssl to reduce build loops. Fixes JB#45074. Contributes JB#36024.
Also drop the transitional legacy lib copy from the previous upgrade.
1 parent 84ae95f commit 2458dc7

File tree

1 file changed

+3
-12
lines changed

1 file changed

+3
-12
lines changed

rpm/rpm.spec

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ License: GPLv2+
3535
Requires: curl
3636
Requires: coreutils
3737
Requires: db4-utils
38+
Requires: openssl-libs
3839
BuildRequires: db4-devel
3940

4041
BuildRequires: meego-rpm-config
@@ -45,7 +46,7 @@ BuildRequires: gawk
4546
BuildRequires: elfutils-devel >= 0.112
4647
BuildRequires: elfutils-libelf-devel
4748
BuildRequires: readline-devel zlib-devel
48-
BuildRequires: nss-devel
49+
BuildRequires: openssl-devel
4950
# The popt version here just documents an older known-good version
5051
BuildRequires: popt-devel >= 1.10.2
5152
BuildRequires: file-devel
@@ -135,7 +136,6 @@ Man pages for %{name}, %{name}-build and %{name}-devel.
135136
%patch14 -p1
136137

137138
%build
138-
CPPFLAGS="$CPPFLAGS `pkg-config --cflags nss`"
139139
CFLAGS="$RPM_OPT_FLAGS"
140140
export CPPFLAGS CFLAGS LDFLAGS
141141
_libdir=%{_usr}/lib
@@ -148,6 +148,7 @@ _libdir=%{_usr}/lib
148148
--libdir=%{_usr}/lib \
149149
--with-vendor=meego \
150150
--with-external-db \
151+
--with-crypto=openssl \
151152
%if %{with python}
152153
--enable-python \
153154
%endif
@@ -161,16 +162,6 @@ rm -rf $RPM_BUILD_ROOT
161162

162163
%make_install
163164

164-
# HACK: include older .so so we can get everything rebuilt properly
165-
cp -a /%{_libdir}/librpm.so.2.0.2 $RPM_BUILD_ROOT/%{_libdir}/
166-
cp -a /%{_libdir}/librpm.so.2 $RPM_BUILD_ROOT/%{_libdir}/
167-
cp -a /%{_libdir}/librpmbuild.so.2.0.1 $RPM_BUILD_ROOT/%{_libdir}/
168-
cp -a /%{_libdir}/librpmbuild.so.2 $RPM_BUILD_ROOT/%{_libdir}/
169-
cp -a /%{_libdir}/librpmio.so.2.0.1 $RPM_BUILD_ROOT/%{_libdir}/
170-
cp -a /%{_libdir}/librpmio.so.2 $RPM_BUILD_ROOT/%{_libdir}/
171-
cp -a /%{_libdir}/librpmsign.so.0.0.1 $RPM_BUILD_ROOT/%{_libdir}/
172-
cp -a /%{_libdir}/librpmsign.so.0 $RPM_BUILD_ROOT/%{_libdir}/
173-
174165
#sed "s/i386/arm/g" platform > platform.arm
175166
#sed "s/i386/mipsel/g" platform > platform.mipsel
176167

0 commit comments

Comments
 (0)