rpms/avahi/devel avahi-0.6.17-exitcode.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 avahi.spec, 1.79, 1.80 sources, 1.15, 1.16
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Mar 14 15:52:23 UTC 2007
- Previous message (by thread): rpms/gtk2/devel .cvsignore, 1.65, 1.66 gtk2.spec, 1.214, 1.215 sources, 1.72, 1.73
- Next message (by thread): rpms/firstboot/devel .cvsignore, 1.74, 1.75 firstboot.spec, 1.97, 1.98 sources, 1.93, 1.94
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mbacovsk
Update of /cvs/dist/rpms/avahi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30194
Modified Files:
.cvsignore avahi.spec sources
Added Files:
avahi-0.6.17-exitcode.patch
Log Message:
* Mon Mar 12 2007 Martin Bacovsky <mbacovsk at redhat.com> - 0.6.17-1
- upgrade to new upstream 0.6.17
- redundant patches removal
- removed auto* stuff from specfile since that was no longer needed
- Resolves: #232205: 'service {avahi-dnsconfd,avahi-daemon} status'
returns 0 when the service is stopped
avahi-0.6.17-exitcode.patch:
avahi-daemon.in | 6 ++++--
avahi-dnsconfd.in | 6 ++++--
2 files changed, 8 insertions(+), 4 deletions(-)
--- NEW FILE avahi-0.6.17-exitcode.patch ---
--- avahi-0.6.17/initscript/fedora/avahi-daemon.in.exitcode 2006-02-12 12:39:15.000000000 +0100
+++ avahi-0.6.17/initscript/fedora/avahi-daemon.in 2007-03-14 12:12:37.000000000 +0100
@@ -80,7 +80,9 @@
;;
status)
$AVAHI_BIN -c
- [ $? = 0 ] && echo $"Avahi daemon is running" || echo $"Avahi daemon is not running"
+ RETVAL=$?
+ [ $RETVAL = 0 ] && echo $"Avahi daemon is running" || echo $"Avahi daemon is not running"
+
;;
restart)
restart
@@ -98,5 +100,5 @@
exit 1
esac
-exit $?
+exit $RETVAL
--- avahi-0.6.17/initscript/fedora/avahi-dnsconfd.in.exitcode 2007-03-14 12:07:38.000000000 +0100
+++ avahi-0.6.17/initscript/fedora/avahi-dnsconfd.in 2007-03-14 12:12:36.000000000 +0100
@@ -76,7 +76,9 @@
;;
status)
$AVAHI_BIN -c
- [ $? = 0 ] && echo $"Avahi DNS daemon is running" || echo $"Avahi DNS daemon is not running"
+ RETVAL=$?
+ [ $RETVAL = 0 ] && echo $"Avahi DNS daemon is running" || echo $"Avahi DNS daemon is not running"
+
;;
restart)
restart
@@ -95,5 +97,5 @@
;;
esac
-exit $?
+exit $RETVAL
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/avahi/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore 22 Jan 2007 11:17:52 -0000 1.15
+++ .cvsignore 14 Mar 2007 15:52:21 -0000 1.16
@@ -1 +1 @@
-avahi-0.6.16.tar.gz
+avahi-0.6.17.tar.gz
Index: avahi.spec
===================================================================
RCS file: /cvs/dist/rpms/avahi/devel/avahi.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- avahi.spec 2 Feb 2007 21:17:14 -0000 1.79
+++ avahi.spec 14 Mar 2007 15:52:21 -0000 1.80
@@ -5,8 +5,8 @@
%define WITH_MONO 0
%endif
Name: avahi
-Version: 0.6.16
-Release: 3%{?dist}
+Version: 0.6.17
+Release: 1%{?dist}
Summary: Local network service discovery
Group: System Environment/Base
License: LGPL
@@ -14,9 +14,9 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: dbus, libdaemon, expat, python, dbus-python, libcap
Requires(post): initscripts, chkconfig, ldconfig
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: libtool
+# BuildRequires: autoconf
+# BuildRequires: automake
+# BuildRequires: libtool
BuildRequires: dbus-devel >= 0.90
BuildRequires: dbus-glib-devel >= 0.70
BuildRequires: dbus-python
@@ -41,8 +41,7 @@
Patch14: avahi-0.6.9-bz189427.patch
Patch17: avahi-0.6.11-use-ipv6-yes.patch
Patch20: avahi-0.6.15-initscript.patch
-Patch21: avahi-0.6.11-align.patch
-Patch23: avahi-0.6.15-netdev.patch
+Patch21: avahi-0.6.17-exitcode.patch
%description
@@ -166,15 +165,14 @@
%patch14 -p1 -b .bz189427
%patch17 -p1 -b .use-ipv6-yes
%patch20 -p1 -b .initscript
-%patch21 -p1 -b .align
-%patch23 -p1 -b .netdev
+%patch21 -p1 -b .exitcode
%build
# auto* update needed for avahi-0.5.2-fedora.patch
-aclocal -I common
-libtoolize --force
-automake-1.10 --add-missing
-autoconf
+# aclocal -I common
+# libtoolize --force
+# automake-1.10 --add-missing
+# autoconf
%configure --with-distro=fedora --disable-qt4 --disable-monodoc --without-python-twisted --with-avahi-user=avahi --with-avahi-group=avahi --enable-compat-howl --with-avahi-priv-access-group=avahi\
%if %{WITH_COMPAT_DNSSD}
@@ -377,6 +375,13 @@
%endif
%changelog
+* Mon Mar 12 2007 Martin Bacovsky <mbacovsk at redhat.com> - 0.6.17-1
+- upgrade to new upstream 0.6.17
+- redundant patches removal
+- removed auto* stuff from specfile since that was no longer needed
+- Resolves: #232205: 'service {avahi-dnsconfd,avahi-daemon} status'
+ returns 0 when the service is stopped
+
* Fri Feb 2 2007 Christopher Aillon <cailloN at redhat.com> - 0.6.16-3
- Remove bogus mono-libdir patches
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/avahi/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources 22 Jan 2007 11:17:52 -0000 1.15
+++ sources 14 Mar 2007 15:52:21 -0000 1.16
@@ -1 +1 @@
-3cbc460bbd55bae35f7b57443c063640 avahi-0.6.16.tar.gz
+29ebb2181958d5721ee5fc45f035a77c avahi-0.6.17.tar.gz
- Previous message (by thread): rpms/gtk2/devel .cvsignore, 1.65, 1.66 gtk2.spec, 1.214, 1.215 sources, 1.72, 1.73
- Next message (by thread): rpms/firstboot/devel .cvsignore, 1.74, 1.75 firstboot.spec, 1.97, 1.98 sources, 1.93, 1.94
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list