pull in upstream fixed, translations mostly (#1270332)

This commit is contained in:
Rex Dieter 2015-11-19 12:33:03 -06:00
parent e17f462da0
commit 4b6704647d
3 changed files with 25 additions and 3 deletions

5
.gitignore vendored
View File

@ -4,3 +4,8 @@
*.src.rpm *.src.rpm
/avahi-0.6.31.tar.gz /avahi-0.6.31.tar.gz
/avahi-0.6.32-rc.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

View File

@ -20,7 +20,7 @@
Name: avahi Name: avahi
Version: 0.6.32 Version: 0.6.32
Release: 0.3.%{beta}%{?dist} Release: 0.4.%{beta}%{?dist}
Summary: Local network service discovery Summary: Local network service discovery
License: LGPLv2+ License: LGPLv2+
URL: http://avahi.org URL: http://avahi.org
@ -77,6 +77,13 @@ Source0: http://avahi.org/download/%{name}-%{version}.tar.gz
%endif %endif
## upstream patches ## 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 Patch100: avahi-0.6.30-mono-libdir.patch
@ -344,9 +351,11 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%prep %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 rm -fv docs/INSTALL
%build %build
@ -664,6 +673,9 @@ exit 0
%{python3_sitelib}/avahi/ %{python3_sitelib}/avahi/
%changelog %changelog
* Thu Nov 19 2015 Rex Dieter <rdieter@fedoraproject.org> 0.6.32-0.4.rc
- pull in upstream fixed, translations mostly (#1270332)
* Tue Nov 10 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.32-0.3.rc * Tue Nov 10 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.32-0.3.rc
- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 - Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5

View File

@ -1 +1,6 @@
40781846af871d043c2ddfc4eb846a1d avahi-0.6.32-rc.tar.gz 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