NetworkManager-1.20.0-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12146 ec354946-7b23-47d6-9f5a-488ba84defc7

N/NetworkManager/NetworkManager-vl.spec

@@ -8,19 +8,20 @@
 %define wireless_tools_version 29
 %define libnl3_version 3.2.14
 %define ppp_version 2.4.7
-%define mm_version 0.7.991
+%define mm_version 1.10.4
 
+%global major_minor 1.20
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Summary(ja): ネットワーク接続マネージャとユーザアプリケーション
-Version: 1.14.4
+Version: %{major_minor}.0
-Release: 2%{?snapshot}%{?_dist_release}
+Release: 1%{?snapshot}%{?_dist_release}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
 
-Source: %{name}-%{version}%{?snapshot}.tar.xz
+Source: https://download.gnome.org/sources/NetworkManager/%{major_minor}/%{name}-%{version}.tar.xz
 Source2: nm-system-settings.conf
 
 Source1000: NetworkManager.init
@@ -81,6 +82,7 @@ NetworkManager is _intended_ to replace default routes, obtain IP addresses
 from a DHCP server, and change nameservers whenever it sees fit.
 
 
+%if 0
 %package devel
 Summary: Libraries and headers for adding NetworkManager support to applications
 Summary(ja): アプリケーションに NetworkManager サポートを追加するためのライブラリ並びにヘッダファイル
@@ -117,12 +119,14 @@ Requires: pkgconfig
 %description glib-devel
 This package contains the header and pkg-config files for development applications using
 NetworkManager functionality from applications that use glib.
+%endif
 
 
 %package libnm
 Summary: Libraries for adding NetworkManager support to applications (new API).
 Summary(ja): NetworkManager サポートを追加するためのライブラリ (new API)
 Group: System Environment/Libraries
+Obsoletes: %{name}-glib < 1.15.0
 Requires: dbus
 Requires: dbus-glib
 
@@ -136,7 +140,9 @@ NetworkManager-glib.
 Summary: Header files for adding NetworkManager support to applications (new API).
 Summary(ja): NetworkManager サポートを追加するためのヘッダファイル (new API)
 Group: Development/Libraries
-Requires: %{name}-devel = %{version}-%{release}
+Obsoletes: %{name}-devel < 1.15.0
+Obsoletes: %{name}-glib-devel < 1.15.0
+#Requires: %{name}-devel = %{version}-%{release}
 Requires: %{name}-libnm = %{version}-%{release}
 Requires: dbus-glib-devel
 Requires: glib2-devel
@@ -210,6 +216,7 @@ mkdir -p %{buildroot}%{_localstatedir}/run/NetworkManager
 # remove gnome-bluetooth plugins
 rm -f %{buildroot}%{_libdir}/gnome-bluetooth/plugins/libnma.so
 
+
 %clean
 rm -rf %{buildroot}
 
@@ -230,8 +237,10 @@ fi
 %post   libnm -p /sbin/ldconfig
 %postun libnm -p /sbin/ldconfig
 
+%if 0
 %post   glib -p /sbin/ldconfig
 %postun glib -p /sbin/ldconfig
+%endif
 
 %posttrans
 for file in `ls %{_sysconfdir}/sysconfig/network-scripts/ifcfg-*`
@@ -249,7 +258,7 @@ do
 done
 
 
-%files -f %{name}.lang
+%files
 %defattr(-,root,root,0755)
 %doc COPYING NEWS AUTHORS README CONTRIBUTING TODO
 %{_sysconfdir}/dbus-1/system.d/org.freedesktop.NetworkManager.conf
@@ -289,6 +298,7 @@ done
 %{udev_scriptdir}/rules.d/*.rules
 %doc %{_docdir}/NetworkManager/examples/server.conf
 
+%if 0
 %files devel
 %defattr(-,root,root,0755)
 %dir %{_includedir}/%{name}
@@ -297,9 +307,6 @@ done
 %{_includedir}/NetworkManager/nm-version.h
 %{_includedir}/NetworkManager/nm-version-macros.h
 %{_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)
@@ -327,30 +334,37 @@ 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
+%endif
-%{_datadir}/vala/vapi/libnm*.vapi
 
-%files libnm
+%files libnm -f %{name}.lang
 %defattr(-,root,root,0755)
 %{_libdir}/libnm.so.*
 %{_libdir}/girepository-1.0/NM-1.0.typelib
-%{_datadir}/gir-1.0/NetworkManager-1.0.gir
 
 %files libnm-devel
 %defattr(-,root,root,0755)
 %{_includedir}/libnm
 %{_libdir}/libnm.so
 %{_libdir}/pkgconfig/libnm.pc
+%{_datadir}/dbus-1/interfaces/*.xml
 %{_datadir}/gir-1.0/NM-1.0.gir
+%{_datadir}/vala/vapi/libnm*.deps
+%{_datadir}/vala/vapi/libnm*.vapi
+%dir %{_datadir}/gtk-doc/html/NetworkManager
+%{_datadir}/gtk-doc/html/NetworkManager/*
 %dir %{_datadir}/gtk-doc/html/libnm
 %{_datadir}/gtk-doc/html/libnm/*
 
 
 %changelog
-* Sat Aug 31 2019 Toshiaki Ara <ara_t@384.jp> 1.10.2-2
+* Sun Sep 01 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.20.0-1
+- new upstream release.
+- dropped the subpackages devel, glib and glib-devel: deprecated in upstream.
+
+* Sat Aug 31 2019 Toshiaki Ara <ara_t@384.jp> 1.14.4-2
 - rebuild with readline-8.0
 
-* Sat Mar 03 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.10.2-1
+* Sat Mar 03 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.14.4-1
 - new upstream release.
 - dropped Patch2.
 - added Source1000.