- use SERVICE_syslog=y instead of SERVICE=syslog in upstart environment

- Release: 2

Changed files:
    avahi-daemon.upstart -> 1.2
    avahi.spec -> 1.133

diff --git a/avahi-daemon.upstart b/avahi-daemon.upstart
index 5f0c6850c588c8734683b74b723583cffb671011..5ecc34fb870ce44dfc022901b800532686dcc040 100644 (file)
--- a/avahi-daemon.upstart
+++ b/avahi-daemon.upstart
@@ -1,6 +1,6 @@
 description "Starts the Avahi daemon"
 
-start on pld.network-started and started SERVICE=syslog and started messagebus
+start on pld.network-started and started SERVICE_syslog=y and started messagebus
 stop on pld.shutdown-started
 
 respawn

diff --git a/avahi.spec b/avahi.spec
index 9ffa9d06474c6ea0b5c643242ff3b70e7d3fbc55..33c124d80705dc0ad316511edb6ab7a64b6d49ca 100644 (file)
--- a/avahi.spec
+++ b/avahi.spec
@@ -31,7 +31,7 @@ Summary:      Free mDNS/DNS-SD/Zeroconf implementation
 Summary(pl.UTF-8):     Wolna implementacja mDNS/DNS-SD/Zeroconf
 Name:          avahi
 Version:       0.6.30
-Release:       1
+Release:       2
 License:       LGPL v2.1+
 Group:         Applications
 Source0:       http://avahi.org/download/%{name}-%{version}.tar.gz
@@ -117,6 +117,7 @@ Summary(pl.UTF-8):  Opis zadań Upstart dla demonów Avahi
 Group:         Daemons
 Requires:      %{name} = %{version}-%{release}
 Requires:      upstart >= 0.6
+Conflicts:     syslog-ng-upstart < 3.2.4-1
 
 %description upstart
 Upstart jobs description for Avahi daemons.