|
@@ -1,3 +1,4 @@
|
|
|
+%define _unpackaged_files_terminate_build 1
|
|
|
%define udev_scriptdir /lib/udev
|
|
|
|
|
|
%define dbus_version 1.4.20
|
|
@@ -6,14 +7,14 @@
|
|
|
%define gtk3_version 3.8.0
|
|
|
%define wireless_tools_version 29
|
|
|
%define libnl3_version 3.2.14
|
|
|
-%define ppp_version 2.4.5
|
|
|
+%define ppp_version 2.4.7
|
|
|
%define mm_version 0.7.991
|
|
|
|
|
|
|
|
|
Name: NetworkManager
|
|
|
Summary: Network connection manager and user applications
|
|
|
Summary(ja): ネットワーク接続マネージャとユーザアプリケーション
|
|
|
-Version: 1.0.12
|
|
|
+Version: 1.10.2
|
|
|
Release: 1%{?snapshot}%{?_dist_release}
|
|
|
Group: System Environment/Base
|
|
|
License: GPLv2+
|
|
@@ -22,7 +23,7 @@ URL: http://www.gnome.org/projects/NetworkManager/
|
|
|
Source: %{name}-%{version}%{?snapshot}.tar.xz
|
|
|
Source2: nm-system-settings.conf
|
|
|
|
|
|
-Patch2: explain-dns1-dns2.patch
|
|
|
+Source1000: NetworkManager.init
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
|
|
|
|
@@ -47,7 +48,7 @@ Conflicts: %{name}-openvpn < 0.7.0.99
|
|
|
|
|
|
BuildRequires: dbus-devel >= %{dbus_version}
|
|
|
BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
|
|
|
-BuildRequires: wireless-tools-devel >= %{wireless_tools_version}
|
|
|
+#BuildRequires: wireless-tools-devel >= %{wireless_tools_version}
|
|
|
BuildRequires: glib2-devel gtk3-devel
|
|
|
BuildRequires: libnl3-devel >= %{libnl3_version}
|
|
|
BuildRequires: libsoup-devel
|
|
@@ -55,14 +56,20 @@ BuildRequires: polkit-devel
|
|
|
BuildRequires: ppp-devel >= %{ppp_version}
|
|
|
BuildRequires: libuuid-devel
|
|
|
BuildRequires: nss-devel >= 3.11.7
|
|
|
-BuildRequires: eudev-libgudev1-devel
|
|
|
+BuildRequires: pkgconfig(libudev)
|
|
|
+BuildRequires: pkgconfig(gudev-1.0)
|
|
|
+BuildRequires: pkgconfig(bluez)
|
|
|
+BuildRequires: pkgconfig(jansson)
|
|
|
+BuildRequires: curl-devel
|
|
|
+BuildRequires: pygobject3
|
|
|
+BuildRequires: vala-tools, vala-devel
|
|
|
+BuildRequires: ppp
|
|
|
BuildRequires: ModemManager-glib-devel >= %{mm_version}
|
|
|
BuildRequires: readline-devel
|
|
|
BuildRequires: libndp-devel
|
|
|
|
|
|
Vendor: Project Vine
|
|
|
Distribution: Vine Linux
|
|
|
-Packager: Takemikaduchi
|
|
|
|
|
|
%description
|
|
|
NetworkManager attempts to keep an active network connection available at all
|
|
@@ -143,8 +150,6 @@ See also NetworkManager-glib-devel.
|
|
|
%prep
|
|
|
%setup -q
|
|
|
|
|
|
-%patch2 -p1 -b .explain-dns1-dns2
|
|
|
-
|
|
|
|
|
|
%build
|
|
|
NOCONFIGURE=1 ./autogen.sh
|
|
@@ -152,6 +157,7 @@ sed -i "s|redhat-release|vine-release|g" configure
|
|
|
%configure \
|
|
|
--enable-silent-rules \
|
|
|
--disable-static \
|
|
|
+ --with-udev-dir=%{udev_scriptdir} \
|
|
|
--enable-ifcfg-rh \
|
|
|
--with-dhclient=yes \
|
|
|
--with-dhcpcd=no \
|
|
@@ -159,44 +165,48 @@ sed -i "s|redhat-release|vine-release|g" configure
|
|
|
--with-docs=yes \
|
|
|
--enable-more-warnings=yes \
|
|
|
--enable-modify-system=yes \
|
|
|
+ --enable-vala=yes \
|
|
|
+ --enable-introspection \
|
|
|
--with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version} \
|
|
|
--with-dist-version=%{version}-%{release}
|
|
|
|
|
|
make %{?_smp_mflags}
|
|
|
|
|
|
%install
|
|
|
-%{__rm} -rf $RPM_BUILD_ROOT
|
|
|
+%{__rm} -rf %{buildroot}
|
|
|
|
|
|
# install NM
|
|
|
-make install DESTDIR=$RPM_BUILD_ROOT
|
|
|
+make install DESTDIR=%{buildroot}
|
|
|
|
|
|
-cp %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/
|
|
|
+cp %{SOURCE2} %{buildroot}%{_sysconfdir}/%{name}/
|
|
|
|
|
|
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.d
|
|
|
-cp -p data/server.conf.in $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.d/00-server.conf
|
|
|
+mkdir -p %{buildroot}%{_sysconfdir}/%{name}/conf.d
|
|
|
+cp -p data/server.conf.in %{buildroot}%{_sysconfdir}/%{name}/conf.d/00-server.conf
|
|
|
|
|
|
# create a VPN directory
|
|
|
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/NetworkManager/VPN
|
|
|
+mkdir -p %{buildroot}%{_sysconfdir}/NetworkManager/VPN
|
|
|
|
|
|
# create a keyfile plugin system settings directory
|
|
|
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/NetworkManager/system-connections
|
|
|
+mkdir -p %{buildroot}%{_sysconfdir}/NetworkManager/system-connections
|
|
|
|
|
|
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/gnome-vpn-properties
|
|
|
+mkdir -p %{buildroot}%{_datadir}/gnome-vpn-properties
|
|
|
|
|
|
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/NetworkManager
|
|
|
+mkdir -p %{buildroot}%{_localstatedir}/lib/NetworkManager
|
|
|
|
|
|
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
|
|
|
+find %{buildroot} -name '*.la' -exec rm -f {} \;
|
|
|
|
|
|
%find_lang %{name}
|
|
|
|
|
|
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d
|
|
|
-install -m 0755 initscript/RedHat/NetworkManager $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/
|
|
|
+mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d
|
|
|
+install -m 0755 %{SOURCE1000} %{buildroot}%{_sysconfdir}/rc.d/init.d/%{name}
|
|
|
+
|
|
|
+mkdir -p %{buildroot}%{_localstatedir}/run/NetworkManager
|
|
|
|
|
|
# remove gnome-bluetooth plugins
|
|
|
-rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-bluetooth/plugins/libnma.so
|
|
|
+rm -f %{buildroot}%{_libdir}/gnome-bluetooth/plugins/libnma.so
|
|
|
|
|
|
%clean
|
|
|
-rm -rf $RPM_BUILD_ROOT
|
|
|
+rm -rf %{buildroot}
|
|
|
|
|
|
|
|
|
%post
|
|
@@ -235,7 +245,7 @@ done
|
|
|
%defattr(-,root,root,0755)
|
|
|
%doc COPYING NEWS AUTHORS README CONTRIBUTING TODO
|
|
|
%{_sysconfdir}/dbus-1/system.d/org.freedesktop.NetworkManager.conf
|
|
|
-%{_sysconfdir}/dbus-1/system.d/nm-avahi-autoipd.conf
|
|
|
+#{_sysconfdir}/dbus-1/system.d/nm-avahi-autoipd.conf
|
|
|
%{_sysconfdir}/dbus-1/system.d/nm-dispatcher.conf
|
|
|
%{_sysconfdir}/dbus-1/system.d/nm-ifcfg-rh.conf
|
|
|
%config %{_sysconfdir}/rc.d/init.d/NetworkManager
|
|
@@ -248,7 +258,7 @@ done
|
|
|
%config(noreplace) %{_sysconfdir}/%{name}/conf.d/00-server.conf
|
|
|
%{_bindir}/nm-online
|
|
|
%{_bindir}/nmcli
|
|
|
-%{_libexecdir}/nm-avahi-autoipd.action
|
|
|
+#{_libexecdir}/nm-avahi-autoipd.action
|
|
|
%{_libexecdir}/nm-dhcp-helper
|
|
|
%{_libexecdir}/nm-dispatcher
|
|
|
%{_libexecdir}/nm-iface-helper
|
|
@@ -257,6 +267,7 @@ done
|
|
|
%{_libdir}/pppd/%{ppp_version}/nm-pppd-plugin.so
|
|
|
%{_mandir}/man1/*
|
|
|
%{_mandir}/man5/*
|
|
|
+%{_mandir}/man7/*
|
|
|
%{_mandir}/man8/*
|
|
|
%dir %{_localstatedir}/run/NetworkManager
|
|
|
%dir %{_localstatedir}/lib/NetworkManager
|
|
@@ -277,6 +288,7 @@ done
|
|
|
%{_libdir}/pkgconfig/%{name}.pc
|
|
|
%dir %{_datadir}/gtk-doc/html/NetworkManager
|
|
|
%{_datadir}/gtk-doc/html/NetworkManager/*
|
|
|
+%{_datadir}/dbus-1/interfaces/*.xml
|
|
|
|
|
|
%files glib
|
|
|
%defattr(-,root,root,0755)
|
|
@@ -304,6 +316,8 @@ done
|
|
|
%{_datadir}/gtk-doc/html/libnm-glib/*
|
|
|
%dir %{_datadir}/gtk-doc/html/libnm-util
|
|
|
%{_datadir}/gtk-doc/html/libnm-util/*
|
|
|
+%{_datadir}/vala/vapi/libnm*.deps
|
|
|
+%{_datadir}/vala/vapi/libnm*.vapi
|
|
|
|
|
|
%files libnm
|
|
|
%defattr(-,root,root,0755)
|
|
@@ -322,6 +336,11 @@ done
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Sat Mar 03 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.10.2-1
|
|
|
+- new upstream release.
|
|
|
+- dropped Patch2.
|
|
|
+- added Source1000.
|
|
|
+
|
|
|
* Sun Jul 17 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.0.12-1
|
|
|
- new upstream release
|
|
|
|