Hello community,
here is the log from the commit of package NetworkManager-kde4 for
openSUSE:Factory
checked in at Tue Aug 23 15:32:18 CEST 2011.
--------
--- KDE/NetworkManager-kde4/NetworkManager-kde4.changes 2011-08-11
14:44:24.000000000 +0200
+++
/mounts/work_src_done/STABLE/NetworkManager-kde4/NetworkManager-kde4.changes
2011-08-19 15:28:57.000000000 +0200
@@ -1,0 +2,13 @@
+Fri Aug 19 13:28:01 UTC 2011 - [email protected]
+
+- Update to git snapshot 20110819
+ * Fix crash while disabling bluetooth interface
+
+-------------------------------------------------------------------
+Fri Aug 12 08:16:51 UTC 2011 - [email protected]
+
+- Update to git snapshot 20110811
+ * Make WEP key validation for [nm09]
+ * More VPN fixes [nm08]
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ NetworkManager-kde4.spec ++++++
--- /var/tmp/diff_new_pack.rr56Jh/_old 2011-08-23 15:31:32.000000000 +0200
+++ /var/tmp/diff_new_pack.rr56Jh/_new 2011-08-23 15:31:32.000000000 +0200
@@ -20,24 +20,24 @@
Name: NetworkManager-kde4
BuildRequires: kdebase4-workspace-devel
-%if %suse_version >= 1210
+%if 0%{?suse_version} >= 1210
BuildRequires: NetworkManager-devel > 0.8.999
%else
BuildRequires: NetworkManager-devel < 0.8.5
%endif
-BuildRequires: git
-Version: 0.9.1git20110811
+Version: 0.9.1git20110812
Release: 1
License: LGPL v2 or later
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Group: System/GUI/KDE
Summary: NetworkManager client for KDE 4
+Group: System/GUI/KDE
Source0: networkmanagement.tar.bz2
Source1: networkmanager-po.tar.bz2
Source2: knetworkmanager.default.sh
+BuildRequires: git
+Requires: %{name}-libs = %{version}
Recommends: %{name}-libs-lang = %{version}
-Requires: %{name}-libs = %{version}-%{release}
Provides: NetworkManager-client
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExcludeArch: s390 s390x
%kde4_runtime_requires
@@ -58,7 +58,7 @@
Network Management Plasmoid is a KDE 4 applet and connection editor for
controlling
network connections on systems that use the NetworkManager service
-%if %suse_version >= 1210
+%if 0%{?suse_version} >= 1210
%package devel
License: LGPL v2 or later
@@ -75,9 +75,9 @@
License: GPLv2+
Summary: NetworkManager client for KDE 4
Group: System/GUI/KDE
+Recommends: %{name}-libs-lang = %{version}
Obsoletes: NetworkManager-kde4
Provides: NetworkManager-client
-Recommends: %{name}-libs-lang = %{version}
%description -n plasmoid-networkmanagement
Network Management Plasma applet for controlling network connections
@@ -87,9 +87,9 @@
License: GPLv2+
Summary: NetworkManager client for KDE 4
Group: System/GUI/KDE
-Provides: NetworkManager-openvpn-frontend
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs = %{version}
Requires: NetworkManager-openvpn
+Provides: NetworkManager-openvpn-frontend
%description -n NetworkManager-openvpn-kde4
OpenVPN VPN plugin for KDE Network Management components.
@@ -98,9 +98,9 @@
License: GPLv2+
Summary: NetworkManager client for KDE 4
Group: System/GUI/KDE
-Provides: NetworkManager-pptp-frontend
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs = %{version}
Requires: NetworkManager-pptp
+Provides: NetworkManager-pptp-frontend
%description -n NetworkManager-pptp-kde4
PPTP VPN plugin for KDE Network Management components.
@@ -109,9 +109,9 @@
License: GPLv2+
Summary: NetworkManager client for KDE 4
Group: System/GUI/KDE
-Provides: NetworkManager-vpnc-frontend
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs = %{version}
Requires: NetworkManager-vpnc
+Provides: NetworkManager-vpnc-frontend
%description -n NetworkManager-vpnc-kde4
Cisco VPN plugin for KDE Network Management components.
@@ -120,9 +120,9 @@
License: GPLv2+
Summary: NovellVPN NetworkManager plugin for KDE 4
Group: System/GUI/KDE
-Provides: NetworkManager-novellvpn-frontend
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs = %{version}
Requires: NetworkManager-novellvpn
+Provides: NetworkManager-novellvpn-frontend
%description -n NetworkManager-novellvpn-kde4
NovellVPN VPN plugin for KDE Network Management components.
@@ -131,18 +131,17 @@
License: GPLv2+
Summary: Strongswan NetworkManager plugin for KDE 4
Group: System/GUI/KDE
-Provides: NetworkManager-strongswan-frontend
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs = %{version}
Requires: strongswan
+Provides: NetworkManager-strongswan-frontend
%description -n NetworkManager-strongswan-kde4
Strongswan VPN plugin for KDE Network Management components.
-
-%lang_package -n %name-libs
+%lang_package -n %{name}-libs
%prep
%setup -q -n networkmanagement
-%if %suse_version >= 1210
+%if 0%{?suse_version} >= 1210
git checkout nm09
%endif
tar -xjf %{SOURCE1}
@@ -156,16 +155,16 @@
%install
cd build
- %makeinstall
+%make_install
%kde_post_install
- mkdir -p $RPM_BUILD_ROOT%_kde4_sharedir/env
- install -m 755 %{S:2} $RPM_BUILD_ROOT%_kde4_sharedir/env
+ mkdir -p %{buildroot}%_kde4_sharedir/env
+ install -m 755 %{SOURCE2} %{buildroot}%_kde4_sharedir/env
# Add a general frontend dbus configuration in NetworkManager
# so delete the conf in knetworkmanager, [email protected](bnc#476502).
- rm $RPM_BUILD_ROOT/etc/dbus-1/system.d/NetworkManager-kde4.conf
+ rm %{buildroot}%{_sysconfdir}/dbus-1/system.d/NetworkManager-kde4.conf
%ifarch s390 s390x
-rm -f $RPM_BUILD_ROOT/%_kde4_modules/networkmanagement_openvpnui.so
-rm -f $RPM_BUILD_ROOT/%_kde4_servicesdir/networkmanagement_openvpnui.desktop
+rm -f %{buildroot}/%_kde4_modules/networkmanagement_openvpnui.so
+rm -f %{buildroot}/%_kde4_servicesdir/networkmanagement_openvpnui.desktop
%endif
cd ..
%find_lang libknetworkmanager %{name}.lang
@@ -177,15 +176,14 @@
%postun libs -p /sbin/ldconfig
%clean
-rm -rf "$RPM_BUILD_ROOT"
+rm -rf %{buildroot}
%files libs-lang -f %{name}.lang
%files libs
%defattr(-,root,root)
%_kde4_servicesdir/kcm_networkmanagement.desktop
-%dir %_kde4_appsdir/networkmanagement
-%_kde4_appsdir/networkmanagement/*
+%_kde4_appsdir/networkmanagement/
%_kde4_modulesdir/kcm_networkmanagement.so
%_kde4_modulesdir/kcm_networkmanagement_tray.so
%{_libdir}/libknmui.so*
@@ -204,13 +202,13 @@
%_kde4_iconsdir/oxygen/128x128/devices/
%_kde4_modulesdir/libexec/networkmanagement_configshell
%_kde4_sharedir/env
-%if %suse_version >= 1210
+%if 0%{?suse_version} >= 1210
%{_kde4_modulesdir}/solid_networkmanager09.so
%_kde4_servicesdir/solidbackends/solid_networkmanager09.desktop
%_kde4_servicetypesdir/solidnetworkmanagernm09.desktop
%endif
-%if %suse_version >= 1210
+%if 0%{?suse_version} >= 1210
%files devel
%defattr(-,root,root)
++++++ networkmanagement.tar.bz2 ++++++
KDE/NetworkManager-kde4/networkmanagement.tar.bz2
/mounts/work_src_done/STABLE/NetworkManager-kde4/networkmanagement.tar.bz2
differ: char 11, line 1
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
