Attachment 6218 Details for Bug 15650 – A Patch porting the changes for Cauldron

[patch] A Patch porting the changes for Cauldron

avahi-mga-svn1.diff (text/plain), 1.65 KB, created by Shlomi Fish on 2015-04-08 08:08:56 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Shlomi Fish

Created: 2015-04-08 08:08:56 CEST

Size: 1.65 KB

patch

obsolete

>Index: SPECS/avahi.spec
>===================================================================
>--- SPECS/avahi.spec	(revision 819870)
>+++ SPECS/avahi.spec	(working copy)
>@@ -73,7 +73,7 @@
> 
> Name: avahi
> Version: 0.6.31
>-Release: %mkrel 15
>+Release: %mkrel 16
> Summary: Avahi service discovery (mDNS/DNS-SD) suite
> License: LGPLv2+
> Group: System/Servers
>@@ -89,7 +89,7 @@
> BuildRequires:	dbus-python
> BuildRequires:	libexpat-devel >= 2.0.1
> BuildRequires:	libgdbm-devel
>-BuildRequires:	libglade2.0-devel
>+BuildRequires:	pkgconfig(libglade-2.0)
> BuildRequires:	pygtk2.0
> BuildRequires:  libcap-devel
> #needed by autoreconf
>@@ -103,6 +103,7 @@
> BuildRequires:  pkgconfig(gobject-introspection-1.0)
> Requires(post): rpm-helper >= 0.24.8-1
> Requires(preun):rpm-helper >= 0.24.8-1
>+Conflicts:      avahi < 0.6.31-2.1
> Requires(post): dbus
> Requires(preun):dbus
> Recommends: nss_mdns
>@@ -426,10 +427,18 @@
> rm -f %{buildroot}%{_initrddir}/%{name}-dnsconfd
> 
> %pre
>-%_pre_useradd %{name} %{_var}/%{name} /bin/false
>-%_pre_useradd %{name}-autoipd %{_var}/%{name} /bin/false
>+%_pre_useradd %{name} %{_var}/run/%{name}-daemon /bin/false
>+%_pre_useradd %{name}-autoipd %{_var}/lib/%{name}-autoipd /bin/false
>+# Correct home directories if users already exists (mga#10004)
>+if [ "`getent passwd %{name} | cut -f6 -d:`" = %{_var}/avahi ]; then
>+	%{_sbindir}/usermod -d %{_var}/run/%{name}-daemon %{name}
>+fi
>+if [ "`getent passwd %{name}-autoipd | cut -f6 -d:`" = %{_var}/avahi ]; then
>+        %{_sbindir}/usermod -d %{_var}/lib/%{name}-autoipd %{name}-autoipd
>+fi
> 
> %postun
>+# Note postun_userdel is a dummy script. It does not do anything!
> %_postun_userdel %{name}
> %_postun_userdel %{name}-autoipd
>

Index: SPECS/avahi.spec
===================================================================
--- SPECS/avahi.spec	(revision 819870)
+++ SPECS/avahi.spec	(working copy)
@@ -73,7 +73,7 @@
 
 Name: avahi
 Version: 0.6.31
-Release: %mkrel 15
+Release: %mkrel 16
 Summary: Avahi service discovery (mDNS/DNS-SD) suite
 License: LGPLv2+
 Group: System/Servers
@@ -89,7 +89,7 @@
 BuildRequires:	dbus-python
 BuildRequires:	libexpat-devel >= 2.0.1
 BuildRequires:	libgdbm-devel
-BuildRequires:	libglade2.0-devel
+BuildRequires:	pkgconfig(libglade-2.0)
 BuildRequires:	pygtk2.0
 BuildRequires:  libcap-devel
 #needed by autoreconf
@@ -103,6 +103,7 @@
 BuildRequires:  pkgconfig(gobject-introspection-1.0)
 Requires(post): rpm-helper >= 0.24.8-1
 Requires(preun):rpm-helper >= 0.24.8-1
+Conflicts:      avahi < 0.6.31-2.1
 Requires(post): dbus
 Requires(preun):dbus
 Recommends: nss_mdns
@@ -426,10 +427,18 @@
 rm -f %{buildroot}%{_initrddir}/%{name}-dnsconfd
 
 %pre
-%_pre_useradd %{name} %{_var}/%{name} /bin/false
-%_pre_useradd %{name}-autoipd %{_var}/%{name} /bin/false
+%_pre_useradd %{name} %{_var}/run/%{name}-daemon /bin/false
+%_pre_useradd %{name}-autoipd %{_var}/lib/%{name}-autoipd /bin/false
+# Correct home directories if users already exists (mga#10004)
+if [ "`getent passwd %{name} | cut -f6 -d:`" = %{_var}/avahi ]; then
+	%{_sbindir}/usermod -d %{_var}/run/%{name}-daemon %{name}
+fi
+if [ "`getent passwd %{name}-autoipd | cut -f6 -d:`" = %{_var}/avahi ]; then
+        %{_sbindir}/usermod -d %{_var}/lib/%{name}-autoipd %{name}-autoipd
+fi
 
 %postun
+# Note postun_userdel is a dummy script. It does not do anything!
 %_postun_userdel %{name}
 %_postun_userdel %{name}-autoipd

Actions: View | Diff

Attachments on bug 15650: 6218 | 6222