Fix build & test with newer glib
This commit is contained in:
parent
54db5813ad
commit
72bc078e03
@ -8,7 +8,7 @@
|
|||||||
%define ppp_version %(rpm -q ppp-devel >/dev/null && rpm -q --qf '%%{version}' ppp-devel || echo -n bad)
|
%define ppp_version %(rpm -q ppp-devel >/dev/null && rpm -q --qf '%%{version}' ppp-devel || echo -n bad)
|
||||||
|
|
||||||
%define snapshot %{nil}
|
%define snapshot %{nil}
|
||||||
%define release_version 3
|
%define release_version 4
|
||||||
%define realversion 1.0.6
|
%define realversion 1.0.6
|
||||||
%define epoch_version 1
|
%define epoch_version 1
|
||||||
|
|
||||||
@ -90,6 +90,7 @@ Patch0: 0000-explain-dns1-dns2.patch
|
|||||||
Patch1: 0001-config-bugfix-parse-commandline-options-into-correct.patch
|
Patch1: 0001-config-bugfix-parse-commandline-options-into-correct.patch
|
||||||
Patch2: 0003-vpn-connection-fix-unsetting-the-gateway.patch
|
Patch2: 0003-vpn-connection-fix-unsetting-the-gateway.patch
|
||||||
Patch3: 0004-device-don-t-reset-NM_UNMANAGED_DEFAULT-when-platfor.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)
|
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}
|
%setup -q -n NetworkManager-%{realversion}
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
|
%patch2 -p1
|
||||||
|
%patch3 -p1
|
||||||
|
%patch4 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
|
||||||
@ -686,6 +690,10 @@ fi
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Sep 8 2015 Lubomir Rintel <lrintel@redhat.com> - 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 <lrintel@redhat.com> - 1:1.0.6-3
|
* Tue Sep 8 2015 Lubomir Rintel <lrintel@redhat.com> - 1:1.0.6-3
|
||||||
- Fix the tunelled VPN route setup
|
- Fix the tunelled VPN route setup
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user