[master] 1607091 Moved libdir/varnish to the varnish-libs subpackage where it belongs, and added an ld.so.conf.d fragment file listing libdir/varnish

Ingvar ingvar at varnish-cache.org
Tue Apr 24 15:02:39 CEST 2012


commit 1607091cdf7ff965a3b6f080087db6372c1a25bc
Author: Ingvar Hagelund <ingvar at redpill-linpro.com>
Date:   Mon Apr 23 11:01:24 2012 +0200

    Moved libdir/varnish to the varnish-libs subpackage where it belongs, and added an ld.so.conf.d fragment file listing libdir/varnish

diff --git a/redhat/varnish.spec b/redhat/varnish.spec
index 5364637..a2d3ae9 100644
--- a/redhat/varnish.spec
+++ b/redhat/varnish.spec
@@ -156,6 +156,7 @@ find %{buildroot}/%{_libdir}/ -name '*.la' -exec rm -f {} ';'
 mkdir -p %{buildroot}/var/lib/varnish
 mkdir -p %{buildroot}/var/log/varnish
 mkdir -p %{buildroot}/var/run/varnish
+mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d/
 install -D -m 0644 redhat/default.vcl %{buildroot}%{_sysconfdir}/varnish/default.vcl
 install -D -m 0644 redhat/varnish.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/varnish
 install -D -m 0644 redhat/varnish.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/varnish
@@ -164,6 +165,8 @@ install -D -m 0755 redhat/varnishlog.initrc %{buildroot}%{_initrddir}/varnishlog
 install -D -m 0755 redhat/varnishncsa.initrc %{buildroot}%{_initrddir}/varnishncsa
 install -D -m 0755 redhat/varnish_reload_vcl %{buildroot}%{_bindir}/varnish_reload_vcl
 
+echo %{_libdir}/varnish > %{buildroot}%{_sysconfdir}/ld.so.conf.d/varnish-%{_arch}.conf
+
 %clean
 rm -rf %{buildroot}
 
@@ -171,7 +174,6 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{_sbindir}/*
 %{_bindir}/*
-%{_libdir}/varnish
 %{_var}/lib/varnish
 %{_var}/log/varnish
 %{_mandir}/man1/*.1*
@@ -190,7 +192,9 @@ rm -rf %{buildroot}
 %files libs
 %defattr(-,root,root,-)
 %{_libdir}/*.so.*
+%{_libdir}/varnish
 %doc LICENSE
+%config %{_sysconfdir}/ld.so.conf.d/varnish-%{_arch}.conf
 
 %files libs-devel
 %defattr(-,root,root,-)



More information about the varnish-commit mailing list