packages: syslog-ng/syslog-ng.spec - install to / if build with mixed linki...

[baggins]

Author: baggins                      Date: Thu Jan 27 17:56:52 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- install to / if build with mixed linking
- run ldconfig in post/postun
- updated files

---- Files affected:
packages/syslog-ng:
   syslog-ng.spec (1.201 -> 1.202) 

---- Diffs:

================================================================
Index: packages/syslog-ng/syslog-ng.spec
diff -u packages/syslog-ng/syslog-ng.spec:1.201 packages/syslog-ng/syslog-ng.spec:1.202
--- packages/syslog-ng/syslog-ng.spec:1.201	Thu Jan 27 12:00:23 2011
+++ packages/syslog-ng/syslog-ng.spec	Thu Jan 27 18:56:46 2011
@@ -81,6 +81,12 @@
 Conflicts:	syslog
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%if %{without dynamic}
+%define		no_install_post_check_so	1
+%define		_sbindir			/sbin
+%define		_libdir				/%{_lib}
+%endif
+
 %description
 syslog-ng is a syslogd replacement for Unix and Unix-like systems. It
 has been tested on Solaris, BSDi and Linux, and were found to run
@@ -131,7 +137,7 @@
 %{__automake}
 %configure \
 	--sysconfdir=%{_sysconfdir}/syslog-ng \
-	--with-module-dir=/%{_lib}/syslog-ng \
+	--with-module-dir=%{_libdir}/syslog-ng \
 	--with-timezone-dir=%{_datadir}/zoneinfo \
 	--with-pidfile-dir=/var/run \
 	--enable-ssl \
@@ -146,6 +152,8 @@
 %endif
 %if %{with dynamic}
 	--enable-dynamic-linking
+%else
+	--enable-mixed-linking
 %endif
 
 %{__make}
@@ -169,7 +177,9 @@
 done
 touch $RPM_BUILD_ROOT/etc/sysconfig/%{name}
 
-rm $RPM_BUILD_ROOT%{_bindir}/loggen
+%{__rm} $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1}/loggen*
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.{so,la}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/syslog-ng/*.la
 
 %if "%{pld_release}" == "th"
 cp -a %{SOURCE6} $RPM_BUILD_ROOT/etc/init/%{name}.conf
@@ -179,6 +189,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
+/sbin/ldconfig
 if [ "$1" = "1" ]; then
 	# disable /proc/kmsg from config on first install on vserver
 	{
@@ -205,6 +216,8 @@
 	/sbin/chkconfig --del syslog-ng
 fi
 
+%postun -p /sbin/ldconfig
+
 %post upstart
 %upstart_post %{name}
 
@@ -231,11 +244,21 @@
 %doc contrib/{apparmor,selinux,syslog2ng} doc/syslog-ng-v3.0-guide-admin-en.pdf
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
 %attr(750,root,root) %dir %{_sysconfdir}/syslog-ng
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/syslog-ng/modules.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/syslog-ng/scl.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/syslog-ng/syslog-ng.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/syslog-ng
 %attr(754,root,root) /etc/rc.d/init.d/syslog-ng
+%attr(755,root,root) %{_libdir}/libsyslog-ng.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libsyslog-ng.so.0
+%attr(755,root,root) %{_libdir}/libsyslog-ng-patterndb.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libsyslog-ng-patterndb.so.0
+%dir %{_libdir}/syslog-ng
+%attr(755,root,root) %{_libdir}/syslog-ng/lib*.so
 %attr(755,root,root) %{_sbindir}/syslog-ng
+%attr(755,root,root) %{_sbindir}/syslog-ng-ctl
 %dir %{_var}/lib/%{name}
+%{_mandir}/man1/syslog-ng-ctl.1*
 %{_mandir}/man5/syslog-ng.conf.5*
 %{_mandir}/man8/syslog-ng.8*
 
@@ -253,6 +276,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.202  2011/01/27 17:56:46  baggins
+- install to / if build with mixed linking
+- run ldconfig in post/postun
+- updated files
+
 Revision 1.201  2011/01/27 11:00:23  baggins
 - update guide md5
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/syslog-ng/syslog-ng.spec?r1=1.201&r2=1.202&f=u