colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

contrib: update NetworkManager.spec for libnm

Browse Source 
Add libnm to NetworkManager.spec, and try to update the descriptions
of NetworkManager-devel, NetworkManager-glib, and
NetworkManager-glib-devel to make sense in the libnm world...
This commit is contained in:
Dan Winship
2014-07-31 12:06:31 -04:00
parent a7c4d53d03
commit 058915a9ae
1 changed files with 55 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
contrib/fedora/rpm/NetworkManager.spec
View File

@@ -106,7 +106,7 @@ Requires: glib2 >= %{glib2_version}
Requires: iproute Requires: iproute
Requires: dhclient >= 12:4.1.0 Requires: dhclient >= 12:4.1.0
Requires: libnl3 >= %{libnl3_version} Requires: libnl3 >= %{libnl3_version}
Requires: %{name}-glib%{?_isa} = %{epoch}:%{version}-%{release} Requires: %{name}-libnm%{?_isa} = %{epoch}:%{version}-%{release}
Requires: ppp = %{ppp_version} Requires: ppp = %{ppp_version}
Requires: avahi-autoipd Requires: avahi-autoipd
Requires: dnsmasq Requires: dnsmasq
@@ -256,7 +256,7 @@ devices.
%package devel %package devel
Summary: Libraries and headers for adding NetworkManager support to applications Summary: Headers defining the NetworkManager D-Bus APIs
Group: Development/Libraries Group: Development/Libraries
Requires: %{name} = %{epoch}:%{version}-%{release} Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: dbus-devel >= %{dbus_version} Requires: dbus-devel >= %{dbus_version}
@@ -269,18 +269,19 @@ from applications.
%package glib %package glib
Summary: Libraries for adding NetworkManager support to applications that use glib. Summary: Libraries for adding NetworkManager support to applications (old API).
Group: Development/Libraries Group: Development/Libraries
Requires: dbus >= %{dbus_version} Requires: dbus >= %{dbus_version}
Requires: dbus-glib >= %{dbus_glib_version} Requires: dbus-glib >= %{dbus_glib_version}
%description glib %description glib
This package contains the libraries that make it easier to use some NetworkManager This package contains the libraries that make it easier to use some NetworkManager
functionality from applications that use glib. functionality from applications that use glib. This is the older NetworkManager API.
See also NetworkManager-libnm.
%package glib-devel %package glib-devel
Summary: Header files for adding NetworkManager support to applications that use glib. Summary: Header files for adding NetworkManager support to applications (old API).
Group: Development/Libraries Group: Development/Libraries
Requires: %{name}-devel%{?_isa} = %{epoch}:%{version}-%{release} Requires: %{name}-devel%{?_isa} = %{epoch}:%{version}-%{release}
Requires: %{name}-glib%{?_isa} = %{epoch}:%{version}-%{release} Requires: %{name}-glib%{?_isa} = %{epoch}:%{version}-%{release}
@@ -290,7 +291,36 @@ Requires: dbus-glib-devel >= %{dbus_glib_version}
%description glib-devel %description glib-devel
This package contains the header and pkg-config files for development applications using This package contains the header and pkg-config files for development applications using
NetworkManager functionality from applications that use glib. NetworkManager functionality from applications that use glib. This is the older
NetworkManager API. See also NetworkManager-libnm-devel.
%package libnm
Summary: Libraries for adding NetworkManager support to applications (new API).
Group: Development/Libraries
Requires: dbus >= %{dbus_version}
Requires: dbus-glib >= %{dbus_glib_version}
%description libnm
This package contains the libraries that make it easier to use some NetworkManager
functionality from applications. This is the new NetworkManager API. See also
NetworkManager-glib.
%package libnm-devel
Summary: Header files for adding NetworkManager support to applications (new API).
Group: Development/Libraries
Requires: %{name}-devel%{?_isa} = %{epoch}:%{version}-%{release}
Requires: %{name}-libnm%{?_isa} = %{epoch}:%{version}-%{release}
Requires: glib2-devel
Requires: pkgconfig
Requires: dbus-glib-devel >= %{dbus_glib_version}
%description libnm-devel
This package contains the header and pkg-config files for development applications using
NetworkManager functionality from applications. This is the new NetworkManager API.
See also NetworkManager-glib-devel.
%package config-connectivity-fedora %package config-connectivity-fedora
Summary: NetworkManager config file for connectivity checking via Fedora servers Summary: NetworkManager config file for connectivity checking via Fedora servers
@@ -319,7 +349,7 @@ deployments.
Summary: NetworkManager curses-based UI Summary: NetworkManager curses-based UI
Group: System Environment/Base Group: System Environment/Base
Requires: %{name} = %{epoch}:%{version}-%{release} Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: %{name}-glib%{?_isa} = %{epoch}:%{version}-%{release} Requires: %{name}-libnm%{?_isa} = %{epoch}:%{version}-%{release}
%description tui %description tui
This adds a curses-based "TUI" (Text User Interface) to This adds a curses-based "TUI" (Text User Interface) to
@@ -585,6 +615,24 @@ fi
%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/*
%files libnm
%defattr(-,root,root,0755)
%{_libdir}/libnm.so.*
%{_libdir}/libnm-vpn.so.*
%{_libdir}/girepository-1.0/NM-1.0.typelib
%files libnm-devel
%defattr(-,root,root,0755)
%dir %{_includedir}/libnm
%{_includedir}/libnm/*.h
%{_libdir}/pkgconfig/libnm.pc
%{_libdir}/pkgconfig/libnm-vpn.pc
%{_libdir}/libnm.so
%{_libdir}/libnm-vpn.so
%{_datadir}/gir-1.0/NM-1.0.gir
%dir %{_datadir}/gtk-doc/html/libnm
%{_datadir}/gtk-doc/html/libnm/*
%files config-connectivity-fedora %files config-connectivity-fedora
%defattr(-,root,root,0755) %defattr(-,root,root,0755)
%dir %{_sysconfdir}/%{name}/conf.d %dir %{_sysconfdir}/%{name}/conf.d