packages: syslog-ng/syslog-ng.spec - ac deps

[glen]

Author: glen                         Date: Sat Dec 18 19:09:30 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- ac deps

---- Files affected:
packages/syslog-ng:
   syslog-ng.spec (1.194 -> 1.195) 

---- Diffs:

================================================================
Index: packages/syslog-ng/syslog-ng.spec
diff -u packages/syslog-ng/syslog-ng.spec:1.194 packages/syslog-ng/syslog-ng.spec:1.195
--- packages/syslog-ng/syslog-ng.spec:1.194	Thu Nov 25 12:33:56 2010
+++ packages/syslog-ng/syslog-ng.spec	Sat Dec 18 20:09:25 2010
@@ -2,10 +2,18 @@
 #
 # Conditional build:
 %bcond_with	dynamic		# link dynamically with glib, eventlog, pcre, openssl
+%if "%{pld_release}" == "ac"
+%bcond_with		sql		# build with support for logging to SQL DB
+%else
 %bcond_without	sql		# build without support for logging to SQL DB
+%endif
 %bcond_without	tests
 
+%if "%{pld_release}" == "ac"
+%define		glib2_ver	2.16.0
+%else
 %define		glib2_ver	2.24.0
+%endif
 Summary:	Syslog-ng - new generation of the system logger
 Summary(pl.UTF-8):	Syslog-ng - zamiennik syskloga
 Summary(pt_BR.UTF-8):	Daemon de log nova geração
@@ -35,10 +43,11 @@
 BuildRequires:	bison
 BuildRequires:	flex
 BuildRequires:	pkgconfig
+BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpmbuild(macros) >= 1.561
 BuildRequires:	which
 %if %{with tests}
-BuildRequires:	libdbi-drivers-sqlite3
+%{?with_sql:BuildRequires:	libdbi-drivers-sqlite3}
 BuildRequires:	python
 BuildRequires:	python-modules
 BuildRequires:	tzdata
@@ -50,7 +59,7 @@
 %{?with_sql:BuildRequires:	libdbi-devel >= 0.8.3-2}
 BuildRequires:	libnet-devel >= 1:1.1.2.1-3
 BuildRequires:	libwrap-devel
-BuildRequires:	openssl-devel >= 0.9.8
+BuildRequires:	openssl-devel
 BuildRequires:	pcre-devel
 %else
 BuildRequires:	eventlog-static >= 0.2
@@ -60,7 +69,7 @@
 %{?with_sql:BuildRequires:	libdbi-static >= 0.8.3-2}
 BuildRequires:	libnet-static >= 1:1.1.2.1-3
 BuildRequires:	libwrap-static
-BuildRequires:	openssl-static >= 0.9.8
+BuildRequires:	openssl-static
 BuildRequires:	pcre-static
 BuildRequires:	zlib-static
 %endif
@@ -154,19 +163,20 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/syslog-ng
-install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/syslog-ng/syslog-ng.conf
-install %{SOURCE3} $RPM_BUILD_ROOT/etc/logrotate.d/syslog-ng
+install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/syslog-ng
+cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/syslog-ng/syslog-ng.conf
+cp -a %{SOURCE3} $RPM_BUILD_ROOT/etc/logrotate.d/syslog-ng
 
-for n in daemon debug iptables kernel lpr maillog messages secure spooler syslog user xferlog
-do
+for n in daemon debug iptables kernel lpr maillog messages secure spooler syslog user xferlog; do
 	> $RPM_BUILD_ROOT/var/log/$n
 done
 touch $RPM_BUILD_ROOT/etc/sysconfig/%{name}
 
 rm $RPM_BUILD_ROOT%{_bindir}/loggen
 
-install %{SOURCE6} $RPM_BUILD_ROOT/etc/init/%{name}.conf
+%if "%{pld_release}" == "th"
+cp -a %{SOURCE6} $RPM_BUILD_ROOT/etc/init/%{name}.conf
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -217,9 +227,11 @@
 
 %attr(640,root,root) %ghost /var/log/*
 
+%if "%{pld_release}" == "th"
 %files upstart
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) /etc/init/%{name}.conf
+%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -227,6 +239,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.195  2010/12/18 19:09:25  glen
+- ac deps
+
 Revision 1.194  2010/11/25 11:33:56  arekm
 - release 4
 
================================================================

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