packages: openssl/openssl.spec - resolved conflicts with arekm

qboosh qboosh at pld-linux.org
Sun Apr 11 08:20:12 CEST 2010


Author: qboosh                       Date: Sun Apr 11 06:20:12 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- resolved conflicts with arekm

---- Files affected:
packages/openssl:
   openssl.spec (1.218 -> 1.219) 

---- Diffs:

================================================================
Index: packages/openssl/openssl.spec
diff -u packages/openssl/openssl.spec:1.218 packages/openssl/openssl.spec:1.219
--- packages/openssl/openssl.spec:1.218	Sat Apr 10 23:07:22 2010
+++ packages/openssl/openssl.spec	Sun Apr 11 08:20:07 2010
@@ -266,7 +266,7 @@
 
 %{__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
@@ -320,17 +320,6 @@
 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
 
@@ -415,7 +404,6 @@
 %{_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*
@@ -476,6 +464,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.219  2010/04/11 06:20:07  qboosh
+- resolved conflicts with arekm
+
 Revision 1.218  2010/04/10 21:07:22  qboosh
 - updated patches and files
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openssl/openssl.spec?r1=1.218&r2=1.219&f=u



More information about the pld-cvs-commit mailing list