Update to 1.10.4 release

This commit is contained in:
Lubomir Rintel 2018-02-05 11:37:29 +01:00
parent e5d9e5bbb2
commit dc410627f6
3 changed files with 24 additions and 6 deletions

1
.gitignore vendored
View File

@ -341,3 +341,4 @@ network-manager-applet-0.8.1.tar.bz2
/NetworkManager-1.8.2.tar.xz /NetworkManager-1.8.2.tar.xz
/NetworkManager-1.8.4.tar.xz /NetworkManager-1.8.4.tar.xz
/NetworkManager-1.10.2.tar.xz /NetworkManager-1.10.2.tar.xz
/NetworkManager-1.10.4.tar.xz

View File

@ -7,8 +7,8 @@
%global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo bad) %global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo bad)
%global epoch_version 1 %global epoch_version 1
%global rpm_version 1.10.2 %global rpm_version 1.10.4
%global real_version 1.10.2 %global real_version 1.10.4
%global release_version 1 %global release_version 1
%global snapshot %{nil} %global snapshot %{nil}
%global git_sha %{nil} %global git_sha %{nil}
@ -52,6 +52,11 @@
%endif %endif
%bcond_without test %bcond_without test
%bcond_with sanitizer %bcond_with sanitizer
%if 0%{?fedora} > 28 || 0%{?rhel} > 7
%bcond_with libnm_glib
%else
%bcond_without libnm_glib
%endif
############################################################################### ###############################################################################
@ -451,7 +456,12 @@ intltoolize --automake --copy --force
--with-config-plugins-default='ifcfg-rh,ibft' \ --with-config-plugins-default='ifcfg-rh,ibft' \
--with-config-dns-rc-manager-default=symlink \ --with-config-dns-rc-manager-default=symlink \
--with-config-logging-backend-default=journal \ --with-config-logging-backend-default=journal \
--enable-json-validation --enable-json-validation \
%if %{with libnm_glib}
--with-libnm-glib
%else
--without-libnm-glib
%endif
make %{?_smp_mflags} make %{?_smp_mflags}
@ -621,13 +631,16 @@ fi
%{_libdir}/%{name}/libnm-ppp-plugin.so %{_libdir}/%{name}/libnm-ppp-plugin.so
%endif %endif
%if %{with libnm_glib}
%files glib -f %{name}.lang %files glib -f %{name}.lang
%{_libdir}/libnm-glib.so.* %{_libdir}/libnm-glib.so.*
%{_libdir}/libnm-glib-vpn.so.* %{_libdir}/libnm-glib-vpn.so.*
%{_libdir}/libnm-util.so.* %{_libdir}/libnm-util.so.*
%{_libdir}/girepository-1.0/NetworkManager-1.0.typelib %{_libdir}/girepository-1.0/NetworkManager-1.0.typelib
%{_libdir}/girepository-1.0/NMClient-1.0.typelib %{_libdir}/girepository-1.0/NMClient-1.0.typelib
%endif
%if %{with libnm_glib}
%files glib-devel %files glib-devel
%doc docs/api/html/* %doc docs/api/html/*
%dir %{_includedir}/libnm-glib %dir %{_includedir}/libnm-glib
@ -654,10 +667,9 @@ fi
%{_datadir}/gtk-doc/html/libnm-glib/* %{_datadir}/gtk-doc/html/libnm-glib/*
%dir %{_datadir}/gtk-doc/html/libnm-util %dir %{_datadir}/gtk-doc/html/libnm-util
%{_datadir}/gtk-doc/html/libnm-util/* %{_datadir}/gtk-doc/html/libnm-util/*
%dir %{_datadir}/gtk-doc/html/NetworkManager
%{_datadir}/gtk-doc/html/NetworkManager/*
%{_datadir}/vala/vapi/libnm-*.deps %{_datadir}/vala/vapi/libnm-*.deps
%{_datadir}/vala/vapi/libnm-*.vapi %{_datadir}/vala/vapi/libnm-*.vapi
%endif
%files libnm -f %{name}.lang %files libnm -f %{name}.lang
%{_libdir}/libnm.so.* %{_libdir}/libnm.so.*
@ -672,6 +684,8 @@ fi
%{_datadir}/gir-1.0/NM-1.0.gir %{_datadir}/gir-1.0/NM-1.0.gir
%dir %{_datadir}/gtk-doc/html/libnm %dir %{_datadir}/gtk-doc/html/libnm
%{_datadir}/gtk-doc/html/libnm/* %{_datadir}/gtk-doc/html/libnm/*
%dir %{_datadir}/gtk-doc/html/NetworkManager
%{_datadir}/gtk-doc/html/NetworkManager/*
%{_datadir}/vala/vapi/libnm.deps %{_datadir}/vala/vapi/libnm.deps
%{_datadir}/vala/vapi/libnm.vapi %{_datadir}/vala/vapi/libnm.vapi
%{_datadir}/dbus-1/interfaces/*.xml %{_datadir}/dbus-1/interfaces/*.xml
@ -696,6 +710,9 @@ fi
%endif %endif
%changelog %changelog
* Mon Feb 5 2018 Lubomir Rintel <lkundrak@v3.sk> - 1:1.10.4-1
- Update to 1.10.4 release
* Fri Dec 15 2017 Thomas Haller <thaller@redhat.com> - 1:1.10.2-1 * Fri Dec 15 2017 Thomas Haller <thaller@redhat.com> - 1:1.10.2-1
- Update to 1.10.2 release - Update to 1.10.2 release

View File

@ -1 +1 @@
SHA512 (NetworkManager-1.10.2.tar.xz) = bc372b334120bc62ce4d9f78baf9f46a880fe6fa24181bcefe71eb1c67868c32edb4c5b323e63aa720284b13189a0704e0b3d13a2c6e6a9be72e5bfb6bca9072 SHA512 (NetworkManager-1.10.4.tar.xz) = d093a028eeb0e4d28de0e030a2f37d2a600651918ecae667cd5bb585377932fc9b905c9cca4aaffbad72ea95362750aa8851c56afe9b9a58723ec335f4984009