Hello community,
here is the log from the commit of package NetworkManager-kde4 for
openSUSE:Factory
checked in at Mon Jul 25 09:03:49 CEST 2011.
--------
--- KDE/NetworkManager-kde4/NetworkManager-kde4.changes 2011-05-04
11:31:09.000000000 +0200
+++
/mounts/work_src_done/STABLE/NetworkManager-kde4/NetworkManager-kde4.changes
2011-07-22 10:38:49.000000000 +0200
@@ -1,0 +2,7 @@
+Fri Jul 22 08:37:45 UTC 2011 - [email protected]
+
+- Update to git snapshot 20110722
+ + Build the NM09 branch for Factory
+ + Remove obsolete patches
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
build-fix.diff
code11_networkmanager_no_neverdefault.diff
kde-plasma-networkmanagement-nm-compat.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ NetworkManager-kde4.spec ++++++
--- /var/tmp/diff_new_pack.IqRXsU/_old 2011-07-25 09:02:41.000000000 +0200
+++ /var/tmp/diff_new_pack.IqRXsU/_new 2011-07-25 09:02:41.000000000 +0200
@@ -25,7 +25,8 @@
%else
BuildRequires: NetworkManager-devel < 0.8.5
%endif
-Version: 0.9.1git20110503
+BuildRequires: git
+Version: 0.9.1git20110722
Release: 1
License: LGPL v2 or later
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -34,11 +35,6 @@
Source0: networkmanagement.tar.bz2
Source1: networkmanager-po.tar.bz2
Source2: knetworkmanager.default.sh
-Patch1: build-fix.diff
-Patch9: code11_networkmanager_no_neverdefault.diff
-%if %suse_version > 1140
-Patch99: kde-plasma-networkmanagement-nm-compat.patch
-%endif
Recommends: %{name}-libs-lang = %{version}
Requires: %{name}-libs = %{version}-%{release}
Provides: NetworkManager-client
@@ -66,9 +62,22 @@
Obsoletes: NetworkManager-kde4-lang <= 0.9.svn1192577
%description libs
-Support libraries for KNetworkManager and Network Management plasmoid
-KNetworkManager is a KDE 4 applet and connection editor for controlling
-network connections on systems that use the NetworkManager servicce
+Support libraries for the Network Management plasmoid
+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
+
+%package devel
+License: LGPL v2 or later
+Summary: Development headers for network management plasmoid
+Group: System/GUI/KDE
+Requires: plasmoid-networkmanagement = %{version}
+
+%description devel
+This package contains the necessary development headers for developing
applications
+using network management plasmoid.
+%endif
%package -n plasmoid-networkmanagement
License: GPLv2+
@@ -139,14 +148,11 @@
%lang_package -n %name-libs
%prep
-%setup -q -n networkmanagement -a 1
-%patch1 -p0
-%if %suse_version < 1120
-%patch9
-%endif
+%setup -q -n networkmanagement
%if %suse_version > 1140
-%patch99 -p1
+git checkout nm09
%endif
+tar -xjf %{SOURCE1}
echo "find_package(Msgfmt REQUIRED)" >> CMakeLists.txt
echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt
echo "add_subdirectory(po)" >> CMakeLists.txt
@@ -161,11 +167,9 @@
%kde_post_install
mkdir -p $RPM_BUILD_ROOT%_kde4_sharedir/env
install -m 755 %{S:2} $RPM_BUILD_ROOT%_kde4_sharedir/env
-%if %suse_version > 1120
# 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
-%endif
%ifarch s390 s390x
rm -f $RPM_BUILD_ROOT/%_kde4_modules/networkmanagement_openvpnui.so
rm -f $RPM_BUILD_ROOT/%_kde4_servicesdir/networkmanagement_openvpnui.desktop
@@ -196,7 +200,7 @@
%{_libdir}/libknmservice.so*
%{_libdir}/libknmclient.so*
%{_libdir}/libknm_nm.so*
-%{_libdir}/libsolidcontrolfuture.so
+%{_libdir}/libsolidcontrol*.so*
%_kde4_servicetypesdir/networkmanagement_vpnuiplugin.desktop
%_kde4_servicesdir/kcm_networkmanagement_tray.desktop
%_kde4_iconsdir/oxygen/16x16/devices/
@@ -207,6 +211,18 @@
%_kde4_iconsdir/oxygen/128x128/devices/
%_kde4_modulesdir/libexec/networkmanagement_configshell
%_kde4_sharedir/env
+%if %suse_version >= 1210
+%{_kde4_modulesdir}/solid_networkmanager09.so
+%_kde4_servicesdir/solidbackends/solid_networkmanager09.desktop
+%_kde4_servicetypesdir/solidnetworkmanagernm09.desktop
+%endif
+
+%if %suse_version >= 1210
+
+%files devel
+%defattr(-,root,root)
+%{_includedir}/solid/*
+%endif
%files -n plasmoid-networkmanagement
%defattr(-,root,root)
@@ -217,20 +233,6 @@
%_kde4_modulesdir/kded_networkmanagement.so
%_kde4_servicesdir/kded
-%if 0
-
-%files
-%defattr(-,root,root)
-%{_bindir}/knetworkmanager
-%_kde4_applicationsdir/knetworkmanager.desktop
-%{_datadir}/autostart/kde4-knetworkmanager-autostart.desktop
-%_kde4_iconsdir/hicolor/32x32/apps/knetworkmanager.png
-%_kde4_sharedir/env
-%if %suse_version <= 1120
-%config /etc/dbus-1/system.d/NetworkManager-kde4.conf
-%endif
-%endif
-
%files -n NetworkManager-openvpn-kde4
%defattr(-,root,root)
%_kde4_modulesdir/networkmanagement_openvpnui.so
++++++ networkmanagement.tar.bz2 ++++++
++++ 8182 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
