Hello community,
here is the log from the commit of package NetworkManager
checked in at Thu Nov 29 02:18:22 CET 2007.
--------
--- NetworkManager/NetworkManager.changes 2007-09-14 09:12:08.000000000 +0200
+++ /mounts/work_src_done/STABLE/NetworkManager/NetworkManager.changes 2007-11-29 01:41:18.724015000 +0100
@@ -1,0 +2,9 @@
+Wed Nov 28 11:32:12 CET 2007 - tambet@suse.de
+
+- Upgrade to the unstable branch (0.7).
+ - many changes and bugfixes
+ - integrate all previous patches
+ - switch to using dhcp-client instead of dhcdbd
+ - gnome applet split off to own source
+
+-------------------------------------------------------------------
Old:
----
NetworkManager-0.6.5.tar.bz2
network-manager-applet-0.6.5.tar.bz2
nm-0.6.5-killswitch-fix.patch
nm-191251.patch
nm-222902.patch
nm-243959.patch
nm-271757.patch
nm-applet-0.6.5-build.patch
nm-applet-disconnect-on-exit.patch
nm-applet-editor.patch
nm-applet-fallback.patch
nm-configure-networking-rml.patch
nm-disconnect-wireless-on-exit.sh
nm-editor.tgz
nm-fallback.patch
nm-fix-adhoc-icon-rml.patch
nm-icons.tar.gz
nm-make-wireless-menu-item-inactive-rml.patch
nm-never-restart-nm-applet-rml.patch
nm-resolv-conf-header-rml.patch
nm-save-passwds-in-keyring.patch
nm-wireless-driver-workarounds-rml.patch
New:
----
NetworkManager-0.7.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ NetworkManager.spec ++++++
--- /var/tmp/diff_new_pack.Sa8868/_old 2007-11-29 02:17:54.000000000 +0100
+++ /var/tmp/diff_new_pack.Sa8868/_new 2007-11-29 02:17:54.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package NetworkManager (Version 0.6.5)
+# spec file for package NetworkManager (Version 0.7.0)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -8,70 +8,29 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
Name: NetworkManager
-BuildRequires: dhcdbd fdupes gconf2-devel gnome-keyring-devel gnome-patch-translation hal-devel intltool iproute2 libgcrypt-devel libglade2-devel libgnomeui-devel libgpg-error-devel libnl-devel libnotify-devel libtool wireless-tools wpa_supplicant
-%if %suse_version > 1010
-BuildRequires: dbus-1-glib-devel
-%else
-BuildRequires: dbus-1-devel dbus-1-glib
-%endif
-%define dbus_version 0.60-22
+Url: http://www.gnome.org/projects/NetworkManager/
+Version: 0.7.0
+Release: 1
+License: GPL v2 or later
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: dbus-1-devel dbus-1-glib hal-devel intltool iproute2 libgcrypt-devel libnl-devel libtool ppp-devel wireless-tools
+Group: Productivity/Networking/System
+Summary: Network Link Manager and User Applications
+Source0: NetworkManager-%{version}.tar.bz2
+Source1: nfs
+Requires: wpa_supplicant >= 0.5.8-54
+Requires: dhcp-client
+Obsoletes: dhcdbd
+%define dbus_version 1.1.2
+%define dbus_glib_version 0.74
%define hal_version 0.5.0
%define wireless_version 28pre13-6
-%define wpa_supplicant_version 0.4.8-14
-%define resmgr_version 0.9.8
-%define dhcp_version 3.0.3-22
%define gtk_version 2.6.0
%define keyring_version 0.4.4
%define libnl_version 1.0-6
-%define dhcdbd_version 1.12-19
%define sysconfig_version 0.50.9-13.3
-License: GPL v2 or later
-Group: Productivity/Networking/System
-Url: http://www.gnome.org/projects/NetworkManager/
-AutoReqProv: on
-Version: 0.6.5
-Release: 27
-Summary: Network Link Manager and User Applications
-Source0: NetworkManager-%{version}.tar.bz2
-Source1: network-manager-applet-%{version}.tar.bz2
-Source2: nm-editor.tgz
-Source3: nm-icons.tar.gz
-Source4: nfs
-Source5: nm-disconnect-wireless-on-exit.sh
-Patch0: nm-wireless-driver-workarounds-rml.patch
-Patch1: nm-resolv-conf-header-rml.patch
-Patch2: nm-fallback.patch
-Patch3: nm-222902.patch
-Patch4: nm-191251.patch
-Patch5: nm-0.6.5-killswitch-fix.patch
-Patch6: nm-271757.patch
-Patch7: nm-applet-0.6.5-build.patch
-Patch8: nm-make-wireless-menu-item-inactive-rml.patch
-Patch9: nm-configure-networking-rml.patch
-Patch10: nm-never-restart-nm-applet-rml.patch
-Patch11: nm-fix-adhoc-icon-rml.patch
-Patch12: nm-applet-disconnect-on-exit.patch
-Patch13: nm-243959.patch
-Patch14: nm-applet-fallback.patch
-Patch15: nm-save-passwds-in-keyring.patch
-Patch16: nm-applet-editor.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-PreReq: sysconfig >= %{sysconfig_version} /usr/bin/sed
-Recommends: %{name}-client
-Requires: wireless-tools >= %{wireless_version}
-Requires: dbus-1 >= %{dbus_version}
-Requires: dbus-1-glib >= %{dbus_version}
-Requires: hal >= %{hal_version}
-Requires: resmgr >= %{resmgr_version}
-Requires: dhcp-client >= %{dhcp_version}
-Requires: wpa_supplicant >= %{wpa_supplicant_version}
-Requires: dhcdbd >= %{dhcdbd_version}
-Requires: libnl >= %{libnl_version}
-Requires: iproute2 openssl nscd
-Conflicts: netapplet
%description
NetworkManager attempts to keep an active network connection available
@@ -88,35 +47,13 @@
Dan Williams
Robert Love
-%package gnome
-Summary: GNOME applications for use with NetworkManager
-Group: System/GUI/GNOME
-Provides: %{name}-client
-Requires: %{name} = %{version}-%{release}
-Requires: dbus-1 >= %{dbus_version}
-Requires: dbus-1-glib >= %{dbus_version}
-Requires: hal >= %{hal_version}
-Requires: gnome-keyring >= %{keyring_version}
-Requires: gtk2 >= %{gtk_version}
-
-%description gnome
-This package contains GNOME utilities and applications for use with
-NetworkManager, including a panel applet for wireless networks.
-
-
-
-Authors:
---------
- Dan Williams
- Robert Love
-
%package devel
Summary: Libraries and headers for adding NetworkManager support to applications
Group: Development/Libraries/Other
Requires: %{name} = %{version}-%{release}
Requires: %{name}-glib = %{version}-%{release}
Requires: dbus-1 >= %{dbus_version}
-Requires: dbus-1-glib >= %{dbus_version}
+Requires: dbus-1-glib >= %{dbus_glib_version}
Requires: dbus-1-devel
Requires: glib2-devel
Requires: dbus-1-glib-devel
@@ -135,16 +72,16 @@
Robert Love
%package glib
-Summary: Libraries and headers for adding NetworkManager support to applications that use glib.
+Summary: Libraries for adding NetworkManager support to applications that use glib
Group: Development/Libraries/GNOME
Requires: %{name} = %{version}-%{release}
Requires: dbus-1 >= %{dbus_version}
-Requires: dbus-1-glib >= %{dbus_version}
+Requires: dbus-1-glib >= %{dbus_glib_version}
Requires: glib2
%description glib
-This package contains the headers and libraries that make it easier to
-use some Network Manager functionality from applications that use glib.
+This package contains the libraries that make it easier to use some
+Network Manager functionality from applications that use glib.
@@ -154,84 +91,31 @@
Robert Love
%prep
-%setup -a 1 -a 2 -a 3
-cd nm-applet-0.6.5
-gnome-patch-translation-prepare
-cd ..
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-mv editor nm-applet-0.6.5/
-# applet
-%patch7 -p1
-%patch8 -p0
-%patch9 -p0
-%patch10 -p0
-%patch11 -p0
-%patch12 -p0
-%patch13 -p0
-%patch14 -p0
-%patch15 -p0
-%patch16 -p1
-cd nm-applet-0.6.5
-gnome-patch-translation-update
-# Prepare directory for gnome-patch-translation-collect:
-mv gnome-patch-translation ..
-cd ..
+%setup
%build
-intltoolize --force
-autoreconf
%configure\
--libexecdir=%{_prefix}/lib/NetworkManager\
--disable-static\
--with-gcrypt=yes\
--with-distro=suse
make %{?jobs:-j%jobs}
-# applet
-pushd nm-applet-0.6.5
- sed -i s/" --sm-disable"// nm-applet.desktop
- autoreconf -i
- intltoolize --force
- %configure\
- --disable-static\
- --with-notify
- make
-popd
%install
-%fdupes -s $RPM_BUILD_ROOT
%makeinstall
+%find_lang %{name}
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+install -m 755 test/nm-tool $RPM_BUILD_ROOT%{_bindir}/
+install -m 755 test/nm-online $RPM_BUILD_ROOT%{_bindir}/
mkdir -p $RPM_BUILD_ROOT/var/log/
touch $RPM_BUILD_ROOT/var/log/NetworkManager
-# applet
-pushd nm-applet-0.6.5
- make install DESTDIR=$RPM_BUILD_ROOT
-popd
-%find_lang %{name}
-%find_lang nm-applet
-cat nm-applet.lang >> %{name}.lang
-cp -r nm-icons/* $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/
-cp test/nm-tool $RPM_BUILD_ROOT%{_bindir}/
-cp test/nm-online $RPM_BUILD_ROOT%{_bindir}/
-install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/NetworkManager/dispatcher.d/
-cp %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/NetworkManager/
+cp %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/NetworkManager/dispatcher.d/
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf "$RPM_BUILD_ROOT"
%post
/sbin/ldconfig
-if [ "$1" = 1 ]; then
- if grep "network_manager.*always" etc/YaST2/ProductFeatures &> /dev/null; then
- sed -i '/^NETWORKMANAGER=.*no/s/no/yes/' etc/sysconfig/network/config
- sed -i '/^NM_DISPATCHER=.*no/s/no/yes/' etc/sysconfig/network/config
- fi
-fi
%postun -p /sbin/ldconfig
@@ -242,42 +126,43 @@
%files -f %{name}.lang
%defattr(-,root,root)
%doc COPYING ChangeLog NEWS AUTHORS README CONTRIBUTING TODO
-%{_bindir}/nm-[ot]*
+%{_bindir}/nm-tool
+%{_bindir}/nm-online
%{_libdir}/libnm-util.so.*
+%{_libdir}/nm-pppd-plugin.*
%{_datadir}/NetworkManager
%dir %attr(0700,root,root) %{_localstatedir}/run/NetworkManager
%doc %{_mandir}/man1/*.*
+%doc %{_mandir}/man8/*.*
%{_prefix}/lib/NetworkManager
%{_sbindir}/*
%{_sysconfdir}/dbus-1/system.d/NetworkManager.conf
-%{_sysconfdir}/NetworkManager
+%{_sysconfdir}/dbus-1/system.d/nm-dhcp-client.conf
+%dir %{_sysconfdir}/NetworkManager
+%dir %{_sysconfdir}/NetworkManager/dispatcher.d
+%attr(0755,root,root) %{_sysconfdir}/NetworkManager/dispatcher.d/nfs
%ghost %config(noreplace) /var/log/NetworkManager
-%files gnome
-%defattr(-,root,root)
-%{_bindir}/nm-applet
-%{_bindir}/nm-vpn-properties
-%{_bindir}/nm-editor
-%{_datadir}/gnome/autostart/nm-applet.desktop
-%{_datadir}/nm-applet
-%{_datadir}/nm-editor
-%{_datadir}/applications/nm-editor.desktop
-%{_datadir}/icons/hicolor/*/apps/*.png
-%{_datadir}/gnome-vpn-properties
-%{_sysconfdir}/dbus-1/system.d/nm-applet.conf
-
%files devel
%defattr(-,root,root)
%{_includedir}/NetworkManager
-%{_libdir}/*.so
-%{_libdir}/*.*a
-%{_libdir}/pkgconfig/*.pc
+%{_includedir}/libnm-glib
+%{_libdir}/libnm-util*
+%{_libdir}/pkgconfig/NetworkManager.pc
+%{_libdir}/pkgconfig/libnm-util.pc
+%{_libdir}/pkgconfig/libnm_glib.pc
%files glib
%defattr(-,root,root)
-%{_libdir}/libnm_glib.so.*
+%{_libdir}/libnm_glib*
%changelog
+* Wed Nov 28 2007 - tambet@suse.de
+- Upgrade to the unstable branch (0.7).
+ - many changes and bugfixes
+ - integrate all previous patches
+ - switch to using dhcp-client instead of dhcdbd
+ - gnome applet split off to own source
* Fri Sep 14 2007 - tambet@suse.de
- Make sure gnome-keyring does not return empty result. (Novell #307910).
* Wed Aug 15 2007 - tambet@suse.de
++++++ NetworkManager-0.6.5.tar.bz2 -> NetworkManager-0.7.0.tar.bz2 ++++++
++++ 148322 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org