Update to 1.8.6 release

- Switch to Meson build system
This commit is contained in:
Lubomir Rintel 2017-11-07 19:23:13 +01:00
parent 9de6775371
commit 9ba8afd970
3 changed files with 20 additions and 13 deletions

1
.gitignore vendored
View File

@ -37,3 +37,4 @@
/network-manager-applet-1.8.0.tar.xz /network-manager-applet-1.8.0.tar.xz
/network-manager-applet-1.8.2.tar.xz /network-manager-applet-1.8.2.tar.xz
/network-manager-applet-1.8.4.tar.xz /network-manager-applet-1.8.4.tar.xz
/network-manager-applet-1.8.6.tar.xz

View File

@ -3,8 +3,8 @@
%global nm_version 1:1.1.0 %global nm_version 1:1.1.0
%global obsoletes_ver 1:0.9.7 %global obsoletes_ver 1:0.9.7
%global rpm_version 1.8.4 %global rpm_version 1.8.6
%global real_version 1.8.4 %global real_version 1.8.6
%global release_version 1 %global release_version 1
%global real_version_major %(printf '%s' '%{real_version}' | sed -n 's/^\\([1-9][0-9]*\\.[1-9][0-9]*\\)\\.[1-9][0-9]*$/\\1/p') %global real_version_major %(printf '%s' '%{real_version}' | sed -n 's/^\\([1-9][0-9]*\\.[1-9][0-9]*\\)\\.[1-9][0-9]*$/\\1/p')
@ -39,7 +39,9 @@ BuildRequires: gettext-devel
BuildRequires: /usr/bin/autopoint BuildRequires: /usr/bin/autopoint
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: libnotify-devel >= 0.4 BuildRequires: libnotify-devel >= 0.4
BuildRequires: automake autoconf intltool libtool BuildRequires: meson
BuildRequires: intltool
BuildRequires: gtk-doc
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: iso-codes-devel BuildRequires: iso-codes-devel
BuildRequires: libgudev1-devel >= 147 BuildRequires: libgudev1-devel >= 147
@ -122,17 +124,15 @@ This package deprecates libnm-gtk.
%patch1 -p1 %patch1 -p1
%build %build
autoreconf -i -f %meson \
intltoolize --force -Dwith-gcr=true \
%configure \ -Dwith-selinux=true \
--with-gcr \ -Ddisable-static=true \
--with-selinux \ -Denable-more-warnings=yes
--disable-static \ %meson_build
--enable-more-warnings=yes
make %{?_smp_mflags}
%install %install
make install DESTDIR=$RPM_BUILD_ROOT %meson_install
mkdir -p $RPM_BUILD_ROOT%{_datadir}/gnome-vpn-properties mkdir -p $RPM_BUILD_ROOT%{_datadir}/gnome-vpn-properties
%find_lang nm-applet %find_lang nm-applet
@ -144,6 +144,8 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
desktop-file-validate $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/nm-applet.desktop desktop-file-validate $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/nm-applet.desktop
desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/nm-connection-editor.desktop desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/nm-connection-editor.desktop
%check
%meson_test
%post -n libnma -p /sbin/ldconfig %post -n libnma -p /sbin/ldconfig
%postun -n libnma -p /sbin/ldconfig %postun -n libnma -p /sbin/ldconfig
@ -235,6 +237,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
%changelog %changelog
* Tue Nov 07 2017 Lubomir Rintel <lkundrak@v3.sk> - 1.8.6-1
- Update to 1.8.6 release
- Switch to Meson build system
* Wed Sep 20 2017 Thomas Haller <thaller@redhat.com> - 1.8.4-1 * Wed Sep 20 2017 Thomas Haller <thaller@redhat.com> - 1.8.4-1
- Update to 1.8.4 release - Update to 1.8.4 release

View File

@ -1 +1 @@
SHA512 (network-manager-applet-1.8.4.tar.xz) = 1ea149b8f0ea0fb44c71506a6fd637d3d9cc05e5f9acd7732f5e6e43de598f0d6f78f6e00d54ed9bd1d2a2f039b0e28c4b0aed6b77f4eae46e30bee15f944cc9 SHA512 (network-manager-applet-1.8.6.tar.xz) = 9080fe1ef252837f16c698fe2083ebe66949e2a30f626619ef7eb82f44e988a0b8488f4f8cd0946a78a240f9bf7a5d054afc988b25c1bedeba7f79a7c84d46fa