From 7d7897f4e824268b9c454caa88c01620bfed2a4f Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Apr 05 2018 16:14:19 +0000 Subject: use %make_build %ldconfig_scriptlets %license %build: --enable-shared=yes --enable-static=no --disable-silent-rules --- diff --git a/avahi.spec b/avahi.spec index bba0ac3..f58987a 100644 --- a/avahi.spec +++ b/avahi.spec @@ -26,7 +26,7 @@ Name: avahi Version: 0.7 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Local network service discovery License: LGPLv2+ URL: http://avahi.org @@ -381,6 +381,9 @@ NOCONFIGURE=1 ./autogen.sh --with-autoipd-group=avahi-autoipd \ --with-systemdsystemunitdir=%{_unitdir} \ --enable-introspection=no \ + --enable-shared=yes \ + --enable-static=no \ + --disable-silent-rules \ %if %{WITH_COMPAT_DNSSD} --enable-compat-libdns_sd \ %endif @@ -398,12 +401,14 @@ NOCONFIGURE=1 ./autogen.sh %endif ; -make %{?_smp_mflags} V=1 +%make_build V=1 %install %make_install -find %{buildroot} \( -name '*.a' -o -name '*.la' \) -exec rm -v {} \; + +# omit libtool .la files +rm -fv %{buildroot}%{_libdir}/lib*.la # remove example rm -fv %{buildroot}%{_sysconfdir}/avahi/services/ssh.service @@ -466,7 +471,7 @@ fi exit 0 %post -/sbin/ldconfig >/dev/null 2>&1 || : +%{?ldconfig} /usr/bin/dbus-send --system --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig >/dev/null 2>&1 || : if [ "$1" -eq 1 -a -s /etc/localtime ]; then /usr/bin/cp -cfp /etc/localtime /etc/avahi/etc/localtime >/dev/null 2>&1 || : @@ -477,7 +482,7 @@ fi %systemd_preun avahi-daemon.socket avahi-daemon.service %postun -/sbin/ldconfig >/dev/null 2>&1 || : +%{?ldconfig} %systemd_postun_with_restart avahi-daemon.socket avahi-daemon.service %pre autoipd @@ -500,36 +505,19 @@ exit 0 %postun dnsconfd %systemd_postun_with_restart avahi-dnsconfd.service -%post glib -p /sbin/ldconfig -%postun glib -p /sbin/ldconfig - -%post compat-howl -p /sbin/ldconfig -%postun compat-howl -p /sbin/ldconfig - -%post compat-libdns_sd -p /sbin/ldconfig -%postun compat-libdns_sd -p /sbin/ldconfig +%ldconfig_scriptlets glib -%post libs -p /sbin/ldconfig -%postun libs -p /sbin/ldconfig +%ldconfig_scriptlets compat-howl -%if %{WITH_QT3} -%post qt3 -p /sbin/ldconfig -%postun qt3 -p /sbin/ldconfig -%endif +%ldconfig_scriptlets compat-libdns_sd -%if %{WITH_QT4} -%post qt4 -p /sbin/ldconfig -%postun qt4 -p /sbin/ldconfig -%endif +%ldconfig_scriptlets libs -%post ui -p /sbin/ldconfig -%postun ui -p /sbin/ldconfig +%ldconfig_scriptlets ui -%post ui-gtk3 -p /sbin/ldconfig -%postun ui-gtk3 -p /sbin/ldconfig +%ldconfig_scriptlets ui-gtk3 -%post gobject -p /sbin/ldconfig -%postun gobject -p /sbin/ldconfig +%ldconfig_scriptlets gobject %files -f %{name}.lang %doc docs/* avahi-daemon/example.service avahi-daemon/sftp-ssh.service avahi-daemon/ssh.service @@ -600,7 +588,8 @@ exit 0 %{_libdir}/pkgconfig/avahi-client.pc %files libs -%doc README LICENSE +%doc README +%license LICENSE %{_libdir}/libavahi-common.so.* %{_libdir}/libavahi-client.so.* @@ -638,6 +627,8 @@ exit 0 %{_libdir}/pkgconfig/avahi-ui-gtk3.pc %if %{WITH_QT3} +%ldconfig_scriptlets qt3 + %files qt3 %{_libdir}/libavahi-qt3.so.* @@ -648,6 +639,8 @@ exit 0 %endif %if %{WITH_QT4} +%ldconfig_scriptlets qt4 + %files qt4 %{_libdir}/libavahi-qt4.so.* @@ -704,6 +697,10 @@ exit 0 %changelog +* Thu Apr 05 2018 Rex Dieter - 0.7-12 +- use %%make_build %%ldconfig_scriptlets %%license +- %%build: --enable-shared=yes --enable-static=no --disable-silent-rules + * Thu Apr 05 2018 Rex Dieter - 0.7-11 - avahi-discover is missing "gi" module (#1564059)