rpms/openssl/devel openssl.spec,1.164,1.165

Tomáš Mráz tmraz at fedoraproject.org
Wed May 19 15:39:13 UTC 2010


Author: tmraz

Update of /cvs/pkgs/rpms/openssl/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv29195

Modified Files:
	openssl.spec 
Log Message:
* Wed May 19 2010 Tomas Mraz <tmraz at redhat.com> 1.0.0-5
- pkgconfig files now contain the correct libdir (#593723)



Index: openssl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssl/devel/openssl.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -p -r1.164 -r1.165
--- openssl.spec	18 May 2010 15:40:32 -0000	1.164
+++ openssl.spec	19 May 2010 15:39:13 -0000	1.165
@@ -21,7 +21,7 @@
 Summary: A general purpose cryptography library with TLS implementation
 Name: openssl
 Version: 1.0.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 # We remove certain patented algorithms from the openssl source tarball
 # with the hobble-openssl script which is included below.
 Source: openssl-%{version}-usa.tar.bz2
@@ -305,16 +305,6 @@ mkdir -m755 $RPM_BUILD_ROOT%{_sysconfdir
 # mulitlib conflicts and unnecessary renames on upgrade
 touch -r %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/pki/tls/openssl.cnf
 
-# Fix libdir.
-pushd $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
-for i in *.pc ; do
-	sed 's,^libdir=${exec_prefix}/lib,libdir=${exec_prefix}/%{_lib},g' \
-		$i >$i.tmp && \
-	cat $i.tmp >$i && \
-	rm -f $i.tmp
-done
-popd
-
 # Determine which arch opensslconf.h is going to try to #include.
 basearch=%{_arch}
 %ifarch %{ix86}
@@ -405,6 +395,9 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/fipsca
 %postun -p /sbin/ldconfig
 
 %changelog
+* Wed May 19 2010 Tomas Mraz <tmraz at redhat.com> 1.0.0-5
+- pkgconfig files now contain the correct libdir (#593723)
+
 * Tue May 18 2010 Tomas Mraz <tmraz at redhat.com> 1.0.0-4
 - make CA dir readable - the private keys are in private subdir (#584810)
 



More information about the scm-commits mailing list