[packages/openssl102: 301/432] - resolved conflicts with arekm

adwol adwol at pld-linux.org
Sat Sep 29 01:26:52 CEST 2018


commit c75cb5a1eba252972d9fa8eee2c2aeadc2afecb5
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Apr 11 06:20:07 2010 +0000

    - resolved conflicts with arekm
    
    Changed files:
        openssl.spec -> 1.219

 openssl.spec | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)
---
diff --git a/openssl.spec b/openssl.spec
index 1529009..0184464 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -265,7 +265,7 @@ OPTFLAGS="%{rpmcflags} %{?with_purify:-DPURIFY}" \
 
 %{__make} -j1 all rehash %{?with_tests:tests} \
 	CC="%{__cc}" \
-	ASFLAG='$(CFLAG) -c -Wa,--noexecstack' \
+	ASFLAG='$(CFLAG) -Wa,--noexecstack' \
 	INSTALLTOP=%{_prefix}
 
 # Rename POD sources of man pages. "openssl_" prefix is added to each
@@ -319,17 +319,6 @@ cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/pl/man1/openssl.1
 install -p %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/ssl-certificate
 install -p %{SOURCE4} $RPM_BUILD_ROOT%{_bindir}/c_rehash.sh
 
-for mtype in man1 man3 man5 man7; do
-	for man in $RPM_BUILD_ROOT%{_mandir}/${mtype}/*.[0-9]; do
-		b=$(readlink "$man" || :)
-		[ -z "$b" ] && continue
-		# delete manual pages pointing to nowhere
-		[ ! -f "$RPM_BUILD_ROOT%{_mandir}/${mtype}/$b" ] && rm "$man"
-		# delete manual pages pointing to openssl_ prefixed man page
-		echo "$b" | grep -q "^openssl_" && rm "$man"
-	done
-done
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -414,7 +403,6 @@ fi
 %{_mandir}/man1/openssl_ec.1*
 %{_mandir}/man1/openssl_ecparam.1*
 %{_mandir}/man1/openssl_enc.1*
-%{_mandir}/man1/openssl_*pkey*.1*
 %{_mandir}/man1/openssl_errstr.1*
 %{_mandir}/man1/openssl_gendsa.1*
 %{_mandir}/man1/openssl_genpkey.1*
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/openssl102.git/commitdiff/9fc1b1b87b259e8a327c99835865e91a391efc9e



More information about the pld-cvs-commit mailing list