|
@@ -14,23 +14,27 @@
|
|
|
Name: network-manager-applet
|
|
|
Summary: GNOME applications for use with NetworkManager
|
|
|
Summary(ja): NetworkManager 用 GNOME アプリケーション
|
|
|
-Version: 1.8.10
|
|
|
+Version: 1.8.22
|
|
|
Release: 1%{?snapshot}%{?_dist_release}
|
|
|
|
|
|
Group: Applications/Internet
|
|
|
License: GPLv2+
|
|
|
URL: http://www.gnome.org/projects/NetworkManager/
|
|
|
|
|
|
-Source: %{name}-%{version}.tar.gz
|
|
|
+%define major_minor %(echo %{version} | sed -e 's/\.[0-9]*$//')
|
|
|
+Source: https://download.gnome.org/sources/network-manager-applet/%{major_minor}/%{name}-%{version}.tar.xz
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
|
|
-BuildRequires: NetworkManager-glib-devel >= %{version}
|
|
|
+BuildRequires: meson
|
|
|
+BuildRequires: libappstream-glib-devel
|
|
|
+BuildRequires: NetworkManager-libnm-devel
|
|
|
BuildRequires: ModemManager-glib-devel
|
|
|
BuildRequires: dbus-devel >= %{dbus_version}
|
|
|
BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
|
|
|
BuildRequires: gtk3-devel
|
|
|
BuildRequires: GConf2-devel
|
|
|
BuildRequires: libgnome-keyring-devel
|
|
|
+BuildRequires: gcr-devel
|
|
|
#BuildRequires: gettext
|
|
|
BuildRequires: libnotify-devel >= 0.7
|
|
|
BuildRequires: libgudev1-devel
|
|
@@ -38,12 +42,12 @@ BuildRequires: libsecret-devel
|
|
|
BuildRequires: pkgconfig(jansson)
|
|
|
BuildRequires: pygobject3
|
|
|
BuildRequires: iso-codes
|
|
|
+BuildRequires: mobile-broadband-provider-info-devel
|
|
|
|
|
|
Requires(post): chkconfig
|
|
|
Requires(preun): chkconfig
|
|
|
|
|
|
-Requires: libnm-gtk = %{version}-%{release}
|
|
|
-Requires: NetworkManager >= %{version}
|
|
|
+Requires: NetworkManager >= 1.20.0
|
|
|
|
|
|
Requires: dbus
|
|
|
Requires: dbus-glib
|
|
@@ -55,6 +59,8 @@ Requires: gnome-icon-theme
|
|
|
Obsoletes: NetworkManager-gnome < 0.9.7.0
|
|
|
Provides: NetworkManager-gnome = 0.9.7.0
|
|
|
|
|
|
+Obsoletes: libnm-gtk < 1.8.22
|
|
|
+
|
|
|
|
|
|
Vendor: Project Vine
|
|
|
Distribution: Vine Linux
|
|
@@ -64,33 +70,6 @@ This package contains GNOME utilities and applications for use with
|
|
|
NetworkManager, including a panel applet for wireless networks.
|
|
|
|
|
|
|
|
|
-%package -n libnm-gtk
|
|
|
-Summary: Private libraries for NetworkManager GUI support
|
|
|
-Group: System Environment/Libraries
|
|
|
-Requires: gtk3 >= %{gtk3_version}
|
|
|
-Obsoletes: NetworkManager-gtk < 0.9.7.0
|
|
|
-Provides: NetworkManager-gtk = 0.9.7.0
|
|
|
-
|
|
|
-%description -n libnm-gtk
|
|
|
-This package contains private libraries to be used only by nm-applet and
|
|
|
-the GNOME Control Center.
|
|
|
-
|
|
|
-
|
|
|
-%package -n libnm-gtk-devel
|
|
|
-Summary: Private header files for NetworkManager GUI support
|
|
|
-Group: Development/Libraries
|
|
|
-Requires: libnm-gtk = %{version}-%{release}
|
|
|
-Requires: gtk3-devel
|
|
|
-Requires: dbus-glib-devel
|
|
|
-Requires: pkgconfig
|
|
|
-Obsoletes: NetworkManager-gtk-devel < 0.9.7.0
|
|
|
-Provides: NetworkManager-gtk-devel = 0.9.7.0
|
|
|
-
|
|
|
-%description -n libnm-gtk-devel
|
|
|
-This package contains private header and pkg-config files to be used only by
|
|
|
-nm-applet and the GNOME control center.
|
|
|
-
|
|
|
-
|
|
|
%package -n libnma
|
|
|
Summary: Private libraries for NetworkManager GUI support
|
|
|
Group: System Environment/Libraries
|
|
@@ -106,7 +85,6 @@ Group: Development/Libraries
|
|
|
Requires: pkgconfig
|
|
|
Requires: pkgconfig(libnm)
|
|
|
Requires: libnma = %{version}-%{release}
|
|
|
-Requires: NetworkManager-devel
|
|
|
Requires: NetworkManager-libnm-devel
|
|
|
|
|
|
%description -n libnma-devel
|
|
@@ -118,22 +96,27 @@ nm-applet, nm-connection-editor, and the GNOME control center.
|
|
|
%setup -q
|
|
|
|
|
|
%build
|
|
|
-export CFLAGS="$CFLAGS -Wno-error=deprecated-declarations"
|
|
|
-NOCONFIGURE=1 ./autogen.sh
|
|
|
-%configure --disable-static --without-selinux
|
|
|
-make
|
|
|
+%meson \
|
|
|
+ -Dgcr=true \
|
|
|
+ -Dselinux=false \
|
|
|
+ -Dwwan=true \
|
|
|
+ -Dgtk_doc=false \
|
|
|
+ -Dlibnm_gtk=false
|
|
|
+
|
|
|
+%meson_build
|
|
|
|
|
|
%install
|
|
|
%{__rm} -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
# install the applet
|
|
|
-make install DESTDIR=$RPM_BUILD_ROOT
|
|
|
+%meson_install
|
|
|
|
|
|
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
|
|
|
|
|
|
mkdir -p $RPM_BUILD_ROOT%{_datadir}/gnome-vpn-properties
|
|
|
|
|
|
%find_lang nm-applet
|
|
|
+cat nm-applet.lang >> %{name}.lang
|
|
|
|
|
|
%clean
|
|
|
rm -rf $RPM_BUILD_ROOT
|
|
@@ -157,17 +140,13 @@ fi
|
|
|
%posttrans
|
|
|
glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
|
|
|
|
|
|
-%post -n libnm-gtk -p /sbin/ldconfig
|
|
|
-
|
|
|
-%postun -n libnm-gtk -p /sbin/ldconfig
|
|
|
-
|
|
|
|
|
|
%files -f nm-applet.lang
|
|
|
%defattr(-,root,root,0755)
|
|
|
%{_bindir}/nm-applet
|
|
|
%{_bindir}/nm-connection-editor
|
|
|
#{_libexecdir}/nm-applet-migration-tool
|
|
|
-%{_datadir}/appdata/nm-connection-editor.appdata.xml
|
|
|
+%{_datadir}/metainfo/nm-connection-editor.appdata.xml
|
|
|
%{_datadir}/applications/*.desktop
|
|
|
#{_datadir}/nm-applet/
|
|
|
%{_datadir}/GConf/gsettings/nm-applet.convert
|
|
@@ -183,20 +162,6 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
|
|
|
%{_mandir}/man1/nm-applet.1.gz
|
|
|
%{_mandir}/man1/nm-connection-editor.1.gz
|
|
|
|
|
|
-%files -n libnm-gtk
|
|
|
-%defattr(-,root,root,-)
|
|
|
-%{_libdir}/libnm-gtk.so.*
|
|
|
-%{_libdir}/girepository-1.0/NMGtk-1.0.typelib
|
|
|
-#dir %{_datadir}/libnm-gtk
|
|
|
-#{_datadir}/libnm-gtk/*.ui
|
|
|
-
|
|
|
-%files -n libnm-gtk-devel
|
|
|
-%defattr(-,root,root,-)
|
|
|
-%{_includedir}/libnm-gtk
|
|
|
-%{_libdir}/pkgconfig/libnm-gtk.pc
|
|
|
-%{_libdir}/libnm-gtk.so
|
|
|
-%{_datadir}/gir-1.0/NMGtk-1.0.gir
|
|
|
-
|
|
|
%files -n libnma
|
|
|
%{_libdir}/girepository-1.0/NMA-1.0.typelib
|
|
|
%{_libdir}/libnma.so.*
|
|
@@ -210,6 +175,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Sun Sep 01 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.8.22-1
|
|
|
+- new upstream release.
|
|
|
+- dropped libnma-gtk{,-devel}.
|
|
|
+
|
|
|
* Sat Mar 03 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.8.10-1
|
|
|
- new upstream release.
|
|
|
- added subpackages libnma{,-devel}.
|