diff --git a/.gitignore b/.gitignore index d23988b..b7c6372 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,8 @@ *.src.rpm /avahi-0.6.31.tar.gz /avahi-0.6.32-rc.tar.gz +/0001-update-translations.patch +/0002-avahi-autoipd-only-consider-ARP-Probe-packets.patch +/0003-Sets-the-translation-domain-of-builder.patch +/0004-Sets-the-translation-domain-of-builder-python.patch +/0005-Fix-Korean-translation-file-name.patch diff --git a/avahi.spec b/avahi.spec index c111c92..2cd42da 100644 --- a/avahi.spec +++ b/avahi.spec @@ -20,7 +20,7 @@ Name: avahi Version: 0.6.32 -Release: 0.3.%{beta}%{?dist} +Release: 0.4.%{beta}%{?dist} Summary: Local network service discovery License: LGPLv2+ URL: http://avahi.org @@ -77,6 +77,13 @@ Source0: http://avahi.org/download/%{name}-%{version}.tar.gz %endif ## upstream patches +# fyi: treated as additional sources in lookaside cache +# generated from upstream git checkout via: git format-patch 0.6.32-rc +Patch1: 0001-update-translations.patch +Patch2: 0002-avahi-autoipd-only-consider-ARP-Probe-packets.patch +Patch3: 0003-Sets-the-translation-domain-of-builder.patch +Patch4: 0004-Sets-the-translation-domain-of-builder-python.patch +Patch5: 0005-Fix-Korean-translation-file-name.patch Patch100: avahi-0.6.30-mono-libdir.patch @@ -344,9 +351,11 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release} %prep -%setup -q -n %{name}-%{version}%{?beta:-%{beta}} +%autosetup -n %{name}-%{version}%{?beta:-%{beta}} -p1 + +# let ^^ autosetup handle it -- rex +#patch100 -p1 -b .mono-libdir -%patch100 -p1 -b .mono-libdir rm -fv docs/INSTALL %build @@ -664,6 +673,9 @@ exit 0 %{python3_sitelib}/avahi/ %changelog +* Thu Nov 19 2015 Rex Dieter 0.6.32-0.4.rc +- pull in upstream fixed, translations mostly (#1270332) + * Tue Nov 10 2015 Fedora Release Engineering - 0.6.32-0.3.rc - Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 diff --git a/sources b/sources index f16da80..fab0c82 100644 --- a/sources +++ b/sources @@ -1 +1,6 @@ 40781846af871d043c2ddfc4eb846a1d avahi-0.6.32-rc.tar.gz +0933b1beb4465cd35106f7be1f121021 0001-update-translations.patch +4707ea23bb29a5c50494c0aa572a6269 0002-avahi-autoipd-only-consider-ARP-Probe-packets.patch +3fa7a27e97e5ccd32c228eab98cb1413 0003-Sets-the-translation-domain-of-builder.patch +75e9637b9a51f6963cf6ef87041d3fde 0004-Sets-the-translation-domain-of-builder-python.patch +67f0d1799d46c3c3b6ec36768fdcb760 0005-Fix-Korean-translation-file-name.patch