View | Details | Raw Unified | Return to bug 6099
Collapse All | Expand All

(-)openssl.spec.orig (-6 / +19 lines)
Lines 185-191 Link Here
185
	ADD_ARGS=linux-sparcv9
185
	ADD_ARGS=linux-sparcv9
186
%endif
186
%endif
187
187
188
./Configure shared -DSSL_ALLOW_ADH --prefix=%prefix --openssldir=%openssldir $ADD_ARGS
188
# change /usr/lib to /usr/lib64 if necessary
189
sed -e 	"s+\(\$(INSTALL_PREFIX)\$(INSTALLTOP)\)/lib+\1/%_lib+g" \
190
    -e  "s+\(\${INSTALLTOP}\)/lib+\1/%_lib+g" \
191
    -e	"s+libdir=\$\${exec_prefix}/lib+libdir=\$\${exec_prefix}/%_lib+g" \
192
	Makefile.org > Makefile.new \
193
	&& diff -u Makefile.org Makefile.new \
194
	|| mv Makefile.new Makefile.org
195
196
export DSO_SCHEME='dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)'
197
cat <<EOF>>./Configure
198
"linux-x86_64", "gcc:-DL_ENDIAN -DNO_ASM	::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG::::::::::						$DSO_SCHEME",
199
EOF
200
201
./config shared -DSSL_ALLOW_ADH --prefix=%prefix --openssldir=%openssldir $ADD_ARGS
189
202
190
# SMP-incompatible build.
203
# SMP-incompatible build.
191
make Makefile.ssl
204
make Makefile.ssl
Lines 220-233 Link Here
220
%__subst -p 's,%%version,%version,g;s,%%openssldir,%openssldir,g' \
233
%__subst -p 's,%%version,%version,g;s,%%openssldir,%openssldir,g' \
221
	$RPM_BUILD_ROOT%_bindir/%name-config
234
	$RPM_BUILD_ROOT%_bindir/%name-config
222
235
223
# Relocate shared libraries from %_libdir/ to /lib/.
236
# Relocate shared libraries from %_libdir/ to /%_lib/.
224
%__mkdir_p $RPM_BUILD_ROOT/lib
237
%__mkdir_p $RPM_BUILD_ROOT/%_lib
225
for f in $RPM_BUILD_ROOT%_libdir/*.so; do
238
for f in $RPM_BUILD_ROOT%_libdir/*.so; do
226
	t=`objdump -p "$f" |%__awk '/SONAME/ {print $2}'`
239
	t=`objdump -p "$f" |%__awk '/SONAME/ {print $2}'`
227
	[ -n "$t" ]
240
	[ -n "$t" ]
228
	%__ln_s -nf ../../lib/"$t" "$f"
241
	%__ln_s -nf ../../%_lib/"$t" "$f"
229
done
242
done
230
%__mv $RPM_BUILD_ROOT%_libdir/*.so.* $RPM_BUILD_ROOT/lib/
243
%__mv $RPM_BUILD_ROOT%_libdir/*.so.* $RPM_BUILD_ROOT/%_lib/
231
244
232
# Relocate %name.cnf from %%openssldir/ to %_sysconfdir/%name/.
245
# Relocate %name.cnf from %%openssldir/ to %_sysconfdir/%name/.
233
%__mkdir_p $RPM_BUILD_ROOT%_sysconfdir/%name
246
%__mkdir_p $RPM_BUILD_ROOT%_sysconfdir/%name
Lines 284-290 Link Here
284
%endif #compat
297
%endif #compat
285
298
286
%files -n libssl
299
%files -n libssl
287
/lib/*
300
/%_lib/*
288
%dir %docdir
301
%dir %docdir
289
%docdir/[A-Z]*
302
%docdir/[A-Z]*
290
303

Return to bug 6099