X-Git-Url: http://git.pld-linux.org/?p=packages%2Fopenssl.git;a=blobdiff_plain;f=openssl.spec;h=b7dfdfec72149dc9ab68a3f8736538eb1dbb9896;hp=b4d78f30a53d559457cd35b16d0abeb75ecbe7c3;hb=bd41855a1a2f3104143199e15b1f0d602e485c8b;hpb=d019e04e9355356e192c0ed3e71a3fd810080c41

diff --git a/openssl.spec b/openssl.spec
index b4d78f3..b7dfdfe 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -45,8 +45,8 @@ for i in ` echo Configure Makefile.org Makefile.ssl `; do
         mv $i.work $i
 done
 
-perl util/perlpath.pl /usr/bin
-perl util/ssldir.pl /var/lib/ssl
+perl util/perlpath.pl %{_bindir}
+perl util/ssldir.pl /var/state/ssl
 
 ./config
 make INSTALLTOP=/usr OPT_FLAGS="$RPM_OPT_FLAGS"
@@ -55,22 +55,22 @@ make rehash
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT/{etc,usr/include/ssl,var/lib/ssl/{certs,private}}
+install -d $RPM_BUILD_ROOT/{etc,usr/include/ssl,var/state/ssl/{certs,private}}
 
 make INSTALLTOP=$RPM_BUILD_ROOT/usr install
 
-install libRSAglue.a $RPM_BUILD_ROOT/usr/lib
+install libRSAglue.a $RPM_BUILD_ROOT%{_libdir}
 
-mv $RPM_BUILD_ROOT/usr/include/*.h $RPM_BUILD_ROOT/usr/include/ssl
+mv $RPM_BUILD_ROOT%{_includedir}/*.h $RPM_BUILD_ROOT/usr/include/ssl
 
-mv $RPM_BUILD_ROOT/usr/lib/openssl.cnf $RPM_BUILD_ROOT/etc
-ln -s ../../etc/openssl.cnf $RPM_BUILD_ROOT/usr/lib/openssl.cnf
+mv $RPM_BUILD_ROOT%{_libdir}/openssl.cnf $RPM_BUILD_ROOT/etc
+ln -s ../../etc/openssl.cnf $RPM_BUILD_ROOT%{_libdir}/openssl.cnf
 
 gzip -9fn CHANGES CHANGES.SSLeay LICENSE NEWS README \
 	doc/*.pod doc/*.txt
 
 %post
-/usr/bin/c_rehash certs
+%{_bindir}/c_rehash certs
 
 %clean
 #rm -rf $RPM_BUILD_ROOT
@@ -81,12 +81,12 @@ gzip -9fn CHANGES CHANGES.SSLeay LICENSE NEWS README \
 %doc doc/*.pod.gz doc/*.txt.gz
 %doc doc/openssl_button.gif doc/openssl_button.html
 
-%attr(755,root,root) /usr/bin/*
+%attr(755,root,root) %{_bindir}/*
 %verify(not md5 size mtime) %config(noreplace) /etc/openssl.cnf
-%verify(not md5 size mtime) %config(noreplace) /usr/lib/openssl.cnf
-/usr/lib/lib*.a
-/usr/include/ssl/*.h
-/var/lib/ssl
+%verify(not md5 size mtime) %config(noreplace) %{_libdir}/openssl.cnf
+%{_libdir}/lib*.a
+%{_includedir}/ssl/*.h
+/var/state/ssl
 
 %changelog
 * Wed Apr 14 1999 Artur Frysiak <wiget@pld.org.pl>