Home | Content | Search | Navigation | Indexes
 

Mailinglist Archive: opensuse-commit (1855 mails)

< Previous Next >
commit NetworkManager for openSUSE:Factory

Hello community,

here is the log from the commit of package NetworkManager for openSUSE:Factory
checked in at Fri Sep 9 11:04:57 CEST 2011.



--------
--- NetworkManager/NetworkManager.changes 2011-08-30 19:04:39.000000000
+0200
+++ /mounts/work_src_done/STABLE/NetworkManager/NetworkManager.changes
2011-09-06 22:07:00.000000000 +0200
@@ -1,0 +2,20 @@
+Tue Sep 6 18:38:58 UTC 2011 - vuntz@xxxxxxxxxxxx
+
+- Apply shared library packaging policy (bnc#689039):
+ + Create libnm-util2, libnm-glib4, libnm-glib-vpn1 subpackages.
+ + Add Provides/Obsoletes for NetworkManager-glib to libnm-glib4.
+ + Changes NetworkManager-glib Requires in devel subpackage to
+ libnm-util2, libnm-glib4 and libnm-glib-vpn1 Requires.
+ + Remove NetworkManager-glib Requires from main subpackage: there
+ is no reason to have an explicit Requires for the libraries.
+- Merge doc subpackage in devel subpackage, with appropriate
+ Provides/Obsoletes.
+- Rename nm-system-settings.conf source to NetworkManager.conf, to
+ follow the new non-deprecated scheme for configuration. Note that
+ this uses the same format, so there's nothing to adapt. If users
+ have an old modified version of nm-system-settings.conf, then it
+ will still be used. Fix bnc#689042.
+- Mark %{_sysconfdir}/NetworkManager/NetworkManager.conf with
+ %config(noreplace).
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
nm-system-settings.conf

New:
----
NetworkManager.conf

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ NetworkManager.spec ++++++
--- /var/tmp/diff_new_pack.LSd2nj/_old 2011-09-09 11:04:52.000000000 +0200
+++ /var/tmp/diff_new_pack.LSd2nj/_new 2011-09-09 11:04:52.000000000 +0200
@@ -23,13 +23,13 @@
Name: NetworkManager
Url: http://www.gnome.org/projects/NetworkManager/
Version: 0.9.0
-Release: 2
+Release: 4
License: GPLv2+
Group: Productivity/Networking/System
Summary: Network Link Manager and User Applications
Source0:
http://download.gnome.org/sources/NetworkManager/0.9/%{name}-%{version}.tar.bz2
Source1: nfs
-Source2: nm-system-settings.conf
+Source2: NetworkManager.conf
Source99: NetworkManager-rpmlintrc
# PATCH-FEATURE-OPENSUSE systemd-network-config.patch -- don't try to start NM
under systemd if it is disabled in system configuration
Patch0: systemd-network-config.patch
@@ -55,7 +55,6 @@
BuildRequires: pkgconfig(polkit-gobject-1)
BuildRequires: pkgconfig(systemd)
BuildRequires: pkgconfig(uuid)
-Requires: %{name}-glib = %{version}
Requires: dhcp-client
Requires: iproute2
Requires: iputils
@@ -87,33 +86,44 @@
Summary: Libraries and headers for adding NetworkManager support to
applications
Group: Development/Libraries/Other
Requires: %{name} = %{version}
-Requires: %{name}-glib = %{version}
+Requires: libnm-util2 = %{version}
+Requires: libnm-glib4 = %{version}
+Requires: libnm-glib-vpn1 = %{version}
+Provides: %{name}-doc = %{version}
+Obsoletes: %{name}-doc < %{version}

%description devel
This package contains various headers accessing some NetworkManager
functionality from applications.

-%package glib
+%package -n libnm-util2
License: GPLv2+
-Summary: Libraries for adding NetworkManager support to applications
that use glib
-Group: Development/Libraries/GNOME
+Summary: Convenience library for clients of NetworkManager
+Group: System/Libraries

-%description glib
+%description -n libnm-util2
This package contains the libraries that make it easier to use some
Network Manager functionality from applications that use glib.

-%package doc
+%package -n libnm-glib4
License: GPLv2+
-Summary: Network Link Manager and User Applications
-Group: Productivity/Networking/System
+Summary: Convenience library for clients of NetworkManager
+Group: System/Libraries
+Provides: %{name}-glib = %{version}
+Obsoletes: %{name}-glib < %{version}

-%description doc
-NetworkManager attempts to keep an active network connection available
-at all times. The point of NetworkManager is to make networking
-configuration and setup as painless and automatic as possible. If
-using DHCP, NetworkManager is intended to replace default routes,
-obtain IP addresses from a DHCP server, and change name servers
-whenever it sees fit.
+%description -n libnm-glib4
+This package contains the libraries that make it easier to use some
+Network Manager functionality from applications that use glib.
+
+%package -n libnm-glib-vpn1
+License: GPLv2+
+Summary: Convenience library for NetworkManager VPN plugins
+Group: System/Libraries
+
+%description -n libnm-glib-vpn1
+This package contains the libraries that make it easier to use some
+Network Manager functionality from applications that use glib.

%lang_package
%prep
@@ -175,9 +185,17 @@
%service_del_postun NetworkManager.service
%endif

-%post glib -p /sbin/ldconfig
+%post -n libnm-util2 -p /sbin/ldconfig
+
+%postun -n libnm-util2 -p /sbin/ldconfig
+
+%post -n libnm-glib4 -p /sbin/ldconfig
+
+%postun -n libnm-glib4 -p /sbin/ldconfig
+
+%post -n libnm-glib-vpn1 -p /sbin/ldconfig

-%postun glib -p /sbin/ldconfig
+%postun -n libnm-glib-vpn1 -p /sbin/ldconfig

%files
%defattr(-,root,root)
@@ -215,7 +233,7 @@
%dir %{_sysconfdir}/NetworkManager/VPN
%dir %{_sysconfdir}/NetworkManager/dispatcher.d
%dir %{_sysconfdir}/NetworkManager/system-connections
-%{_sysconfdir}/NetworkManager/nm-system-settings.conf
+%config(noreplace) %{_sysconfdir}/NetworkManager/NetworkManager.conf
%attr(0755,root,root) %{_sysconfdir}/NetworkManager/dispatcher.d/nfs
/lib/systemd/system/NetworkManager.service
/lib/systemd/system/NetworkManager-wait-online.service
@@ -236,20 +254,23 @@
%{_libdir}/pkgconfig/libnm-util.pc
%{_libdir}/pkgconfig/libnm-glib.pc
%{_libdir}/pkgconfig/libnm-glib-vpn.pc
+%doc %{_datadir}/gtk-doc/html/NetworkManager/
+%doc %{_datadir}/gtk-doc/html/libnm-glib/
+%doc %{_datadir}/gtk-doc/html/libnm-util/

-%files glib
+%files -n libnm-util2
%defattr(-,root,root)
%{_libdir}/libnm-util.so.*
+%{_libdir}/girepository-1.0/NetworkManager-1.0.typelib
+
+%files -n libnm-glib4
+%defattr(-,root,root)
%{_libdir}/libnm-glib.so.*
-%{_libdir}/libnm-glib-vpn.so.*
%{_libdir}/girepository-1.0/NMClient-1.0.typelib
-%{_libdir}/girepository-1.0/NetworkManager-1.0.typelib

-%files doc
+%files -n libnm-glib-vpn1
%defattr(-,root,root)
-%{_datadir}/gtk-doc/html/NetworkManager/
-%{_datadir}/gtk-doc/html/libnm-glib/
-%{_datadir}/gtk-doc/html/libnm-util/
+%{_libdir}/libnm-glib-vpn.so.*

%files lang -f %{name}.lang


++++++ NetworkManager.conf ++++++
[main]
plugins=ifcfg-suse,keyfile

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread