diff --git a/NetworkManager.spec b/NetworkManager.spec index d281c4f..c8d9de6 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -8,7 +8,7 @@ %define ppp_version %(rpm -q ppp-devel >/dev/null && rpm -q --qf '%%{version}' ppp-devel || echo -n bad) %define snapshot %{nil} -%define release_version 3 +%define release_version 4 %define realversion 1.0.6 %define epoch_version 1 @@ -90,6 +90,7 @@ Patch0: 0000-explain-dns1-dns2.patch Patch1: 0001-config-bugfix-parse-commandline-options-into-correct.patch Patch2: 0003-vpn-connection-fix-unsetting-the-gateway.patch Patch3: 0004-device-don-t-reset-NM_UNMANAGED_DEFAULT-when-platfor.patch +Patch4: 0001-test-fix-duplicate-test-names.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -368,6 +369,9 @@ by nm-connection-editor and nm-applet in a non-graphical environment. %setup -q -n NetworkManager-%{realversion} %patch0 -p1 %patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 %build @@ -686,6 +690,10 @@ fi %endif %changelog +* Tue Sep 8 2015 Lubomir Rintel - 1:1.0.6-4 +- Fix build & test with newer glib +- Actually apply patch forgotten in a previous release + * Tue Sep 8 2015 Lubomir Rintel - 1:1.0.6-3 - Fix the tunelled VPN route setup