diff --git a/geome-2.0-fedora-portal.patch b/geome-2.0-fedora-portal.patch new file mode 100644 index 0000000..eb45c7b --- /dev/null +++ b/geome-2.0-fedora-portal.patch @@ -0,0 +1,13 @@ +diff -Naur geome-2.0-orig/geome geome-2.0/geome +--- geome-2.0-orig/geome 2013-10-06 16:02:15.000000000 -0400 ++++ geome-2.0/geome 2016-12-02 20:01:56.857855349 -0500 +@@ -70,7 +70,8 @@ + + desturl = fp.geturl() + content = fp.readline() +- if desturl == "http://fedoraproject.org/static/hotspot.txt" and content == "OK\n": ++ # someone or something removed the \n from the hotspot page :( Accept both in case it flips back ++ if desturl == "http://fedoraproject.org/static/hotspot.txt" and (content == "OK\n" or content == "OK"): + # clean internet, proceed + if args.address: + loc = geome.my_address() diff --git a/geome.spec b/geome.spec index b5d2372..6aff11f 100644 --- a/geome.spec +++ b/geome.spec @@ -1,7 +1,7 @@ Summary: Obtain your geo-location data from Google using NetworkManager Name: geome Version: 2.0 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv3 Url: http://ftp.nohats.ca/%{name} Source: http://ftp.nohats.ca/%{name}/%{name}-%{version}.tar.gz @@ -11,6 +11,7 @@ BuildRequires: python-setuptools, python2-devel Requires: dbus-python Requires: python-geome = %{version} +Patch1: geome-2.0-fedora-portal.patch %description geome queries NetworkManager for its wifi information, such as ESSID's @@ -29,6 +30,7 @@ Geome python module with the geome.location() function %prep %setup -q +%patch1 -p1 %build @@ -48,6 +50,9 @@ install -p -m 644 geome.1 %{buildroot}%{_mandir}/man1 %{_mandir}/man1/geome.1* %changelog +* Sat Dec 03 2016 Paul Wouters - 2.0-7 +- Patch to allow for fedora capture portal's changed output lacking a newline :( + * Tue Jul 19 2016 Fedora Release Engineering - 2.0-6 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages