rpms/kde-plasma-networkmanagement/F-10 kde-plasma-networkmanagement-0.9-desktop.patch, NONE, 1.1 kde-plasma-networkmanagement.spec, 1.4, 1.5
Kevin Kofler
kkofler at fedoraproject.org
Sun Oct 25 08:05:02 UTC 2009
Author: kkofler
Update of /cvs/pkgs/rpms/kde-plasma-networkmanagement/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25702/F-10
Modified Files:
kde-plasma-networkmanagement.spec
Added Files:
kde-plasma-networkmanagement-0.9-desktop.patch
Log Message:
Sync new snapshot from devel. We may have to push this because F10 is getting a new NM which breaks WPA in the old kde-plasma-nm. :-(
* Sun Oct 25 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1:0.9-0.4.20090930svn
- Build as knetworkmanager4 for F10 so KDE 3 KNM users are not forced to upgrade
- Obsolete knetworkmanager4 (and keep replacing the KDE 3 KNM) on F11+
* Wed Sep 30 2009 Ben Boeckel <MathStuf at gmail.com> 1:0.9-0.3.20090930svn
- New snapshot
* Mon Sep 21 2009 Ben Boeckel <MathStuf at gmail.com> 1:0.9-0.2.20090919svn
- Add back missing Requires:
* Mon Sep 21 2009 Ben Boeckel <MathStuf at gmail.com> 1:0.9-0.1.20090919svn
- Version seems to be .9 now
- Fix trailing spaces
- New snapshot
* Tue Sep 15 2009 Rex Dieter <rdieter at fedoraproject.org> 1:0.8-0.22.20090815svn
- Epoch: 1
* Fri Aug 28 2009 Rex Dieter <rdieter at fedoraproject.org> 0.8-0.21.20090815svn
- use knetworkmanager pkg names
- quasi-artificially inflate version to 0.8 (for now), to simplify upgrade path
for knetworkmanager-0.7 (from F-10)
- nuke -devel pkg
- drop references to short-lived kde-plasma-networkmanager
* Sat Aug 15 2009 Rex Dieter <rdieter at fedoraproject.org> 0.1-0.20.20090815svn
- New snapshot
- optimize scriptlets
- -libs subpkg, multilib-friendly
* Mon Jul 27 2009 Ben Boeckel <MathStuf at gmail.com> 0.1-0.19.20090726svn
- Add BR on kdelibs-experimental-devel
* Mon Jul 27 2009 Ben Boeckel <MathStuf at gmail.com> 0.1-0.18.20090726svn
- New snapshot
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1-0.17.20090602svn
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
* Tue Jun 09 2009 Rex Dieter <rdieter at fedoraproject.org> 0.1-0.16.20090602svn
- Requires: NetworkManager
kde-plasma-networkmanagement-0.9-desktop.patch:
kded/networkmanagement.desktop | 2 +-
monolithic/knetworkmanager.desktop | 2 +-
settings/service/knetworkmanager.desktop | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
--- NEW FILE kde-plasma-networkmanagement-0.9-desktop.patch ---
diff -r -U5 kde-plasma-networkmanagement-0.9/kded/networkmanagement.desktop kde-plasma-networkmanagement-0.9.desktop/kded/networkmanagement.desktop
--- kde-plasma-networkmanagement-0.9/kded/networkmanagement.desktop 2009-09-24 05:38:22.000000000 -0400
+++ kde-plasma-networkmanagement-0.9.desktop/kded/networkmanagement.desktop 2009-09-30 11:17:27.000000000 -0400
@@ -45,6 +45,6 @@
X-KDE-ModuleType=Library
X-KDE-Library=networkmanagement
X-KDE-DBus-ModuleName=networkmanagement
X-KDE-Kded-autoload=false
X-KDE-Kded-load-on-demand=true
-OnlyShowIn=KDE
+OnlyShowIn=KDE;
diff -r -U5 kde-plasma-networkmanagement-0.9/monolithic/knetworkmanager.desktop kde-plasma-networkmanagement-0.9.desktop/monolithic/knetworkmanager.desktop
--- kde-plasma-networkmanagement-0.9/monolithic/knetworkmanager.desktop 2009-09-24 05:38:22.000000000 -0400
+++ kde-plasma-networkmanagement-0.9.desktop/monolithic/knetworkmanager.desktop 2009-09-30 11:16:50.000000000 -0400
@@ -64,6 +64,6 @@
X-KDE-StartupNotify=false
X-KDE-UniqueApplet=true
X-DCOP-ServiceType=Unique
X-KDE-autostart-condition=networkmanagementrc:General:Autostart:true
Categories=Utility;TrayIcon;System;Applet;
-
+OnlyShowIn=KDE;
diff -r -U5 kde-plasma-networkmanagement-0.9/settings/service/knetworkmanager.desktop kde-plasma-networkmanagement-0.9.desktop/settings/service/knetworkmanager.desktop
--- kde-plasma-networkmanagement-0.9/settings/service/knetworkmanager.desktop 2009-09-21 05:35:32.000000000 -0400
+++ kde-plasma-networkmanagement-0.9.desktop/settings/service/knetworkmanager.desktop 2009-09-30 11:16:50.000000000 -0400
@@ -52,6 +52,6 @@
X-KDE-ModuleType=Library
X-KDE-Library=knetworkmanager
X-KDE-DBus-ModuleName=knetworkmanager
X-KDE-Kded-autoload=false
X-KDE-Kded-load-on-demand=true
-OnlyShowIn=KDE
+OnlyShowIn=KDE;
Index: kde-plasma-networkmanagement.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/F-10/kde-plasma-networkmanagement.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- kde-plasma-networkmanagement.spec 4 Jun 2009 03:11:27 -0000 1.4
+++ kde-plasma-networkmanagement.spec 25 Oct 2009 08:05:01 -0000 1.5
@@ -1,86 +1,112 @@
+%if 0%{?fedora} && 0%{?fedora} < 11
+%define have_knm3 1
+%endif
+
+%define disclaimer \
+This is alpha software with known issues.\
+We still recommend nm-applet from NetworkManager-gnome for production use.
+
+%if 0%{?have_knm3}
+%define knetworkmanager knetworkmanager4
+%else
+%define knetworkmanager knetworkmanager
+%endif
+
Name: kde-plasma-networkmanagement
-Version: 0.1
-Release: 0.15.20090602svn%{?dist}
+# to be a higher, natural upgrade from F-10's knetworkmanager-0.7
+Epoch: 1
+Version: 0.9
+Release: 0.4.20090930svn%{?dist}
Summary: NetworkManager KDE 4 integration
-Group: User Interface/Desktops
+Group: Applications/Internet
License: (GPLv2 or GPLv3) and GPLv2+ and LGPLv2+ and LGPLv2
URL: http://websvn.kde.org/trunk/playground/base/plasma/applets/networkmanager/
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
# The source for this package was pulled from upstream's vcs. Use the
# following commands to generate the tarball:
-# svn export -r 977393 svn://anonsvn.kde.org/home/kde/trunk/playground/base/plasma/applets/networkmanager kde-plasma-networkmanagement-0.1
-# tar -c kde-plasma-networkmanagement-0.1 | bzip2 --best -c > kde-plasma-networkmanagement-0.1.tar.bz2
+# svn export -r 1029690 svn://anonsvn.kde.org/home/kde/trunk/playground/base/plasma/applets/networkmanager kde-plasma-networkmanagement-0.9
+# tar -c kde-plasma-networkmanagement-0.9 | bzip2 --best -c > kde-plasma-networkmanagement-0.9.tar.bz2
Source0: %{name}-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# Patch to get .desktop files validated
+Patch0: %{name}-%{version}-desktop.patch
-BuildRequires: kdebase-workspace-devel >= 4.1.96
+BuildRequires: kdelibs-experimental-devel
+BuildRequires: kdebase-workspace-devel >= 4.3.0
BuildRequires: NetworkManager-glib-devel >= 0.7.0
BuildRequires: PolicyKit-devel
-Obsoletes: kde-plasma-networkmanager < %{version}-%{release}
-Provides: kde-plasma-networkmanager = %{version}-%{release}
-%if 0%{?fedora} > 10
-Obsoletes: knetworkmanager < 1:%{version}-%{release}
-Provides: knetworkmanager = 1:%{version}-%{release}
-%endif
+Requires: NetworkManager
+
+# multilib upgrades
+Obsoletes: kde-plasma-networkmanagement < 0.1-0.21
+Obsoletes: kde-plasma-networkmanagement-devel < 0.1-0.21
+
+Requires: %{knetworkmanager} = %{?epoch:%{epoch}:}%{version}-%{release}
%description
A Plasma applet to control your wired and wireless network(s) in KDE 4 using
-the default NetworkManager service. This is alpha software with known issues.
-We still recommend nm-applet from NetworkManager-gnome for production use.
+the default NetworkManager service.
+%{?disclaimer}
-%package devel
-Summary: Files needed to develop programs which use the Network Manager plasmoid
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: kdebase-workspace-devel
-Requires: NetworkManager-glib-devel
-
-Obsoletes: kde-plasma-networkmanager-devel < %{version}-%{release}
-Provides: kde-plasma-networkmanager-devel = %{version}-%{release}
-%if 0%{?fedora} > 10
-Obsoletes: knetworkmanager-devel < 1:%{version}-%{release}
-Provides: knetworkmanager-devel = 1:%{version}-%{release}
+%package -n %{knetworkmanager}
+Summary: NetworkManager KDE 4 integration
+Group: Applications/Internet
+Requires: %{knetworkmanager}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+%if 0%{?have_knm3}
+Conflicts: knetworkmanager < 0.8
+%else
+Obsoletes: knetworkmanager4 < %{?epoch:%{epoch}:}%{version}-%{release}
%endif
-
-%description devel
+%description -n %{knetworkmanager}
+KNetworkManager is a system tray applet for controlling network
+connections on systems that use the NetworkManager daemon.
+%{?disclaimer}
+
+%package -n %{knetworkmanager}-libs
+Summary: Runtime libraries for %{name}
+Group: System Environment/Libraries
+Requires: %{knetworkmanager} = %{?epoch:%{epoch}:}%{version}-%{release}
+#Requires: kdelibs4%{?_isa} >= %{kde4_version}
+%if ! 0%{?have_knm3}
+Obsoletes: knetworkmanager4-libs < %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
+%description -n %{knetworkmanager}-libs
%{summary}.
-%package openvpn
-Summary: Libraries for the Network Manager plasmoid to use OpenVPN
-Group: User Interface/Desktops
-Requires: %{name} = %{version}-%{release}
+%package -n %{knetworkmanager}-openvpn
+Summary: OpenVPN support for %{knetworkmanager}
+Group: Applications/Internet
+Requires: %{knetworkmanager} = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: NetworkManager-openvpn
-
-Obsoletes: kde-plasma-networkmanager-openvpn < %{version}-%{release}
-Provides: kde-plasma-networkmanager-openvpn = %{version}-%{release}
-%if 0%{?fedora} > 10
-Obsoletes: knetworkmanager-openvpn < 1:%{version}-%{release}
-Provides: knetworkmanager-openvpn = 1:%{version}-%{release}
+Obsoletes: kde-plasma-networkmanagement-openvpn < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: kde-plasma-networkmanagement-openvpn = %{?epoch:%{epoch}:}%{version}-%{release}
+%if ! 0%{?have_knm3}
+Obsoletes: knetworkmanager4-openvpn < %{?epoch:%{epoch}:}%{version}-%{release}
%endif
-
-%description openvpn
+%description -n %{knetworkmanager}-openvpn
%{summary}.
+%{?disclaimer}
-%package vpnc
-Summary: Libraries for the Network Manager plasmoid to use vpnc
-Group: User Interface/Desktops
-Requires: %{name} = %{version}-%{release}
+%package -n %{knetworkmanager}-vpnc
+Summary: Vpnc support for %{knetworkmanager}
+Group: Applications/Internet
+Requires: %{knetworkmanager} = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: NetworkManager-vpnc
-
-Obsoletes: kde-plasma-networkmanager-vpnc < %{version}-%{release}
-Provides: kde-plasma-networkmanager-vpnc = %{version}-%{release}
-%if 0%{?fedora} > 10
-Obsoletes: knetworkmanager-vpnc < 1:%{version}-%{release}
-Provides: knetworkmanager-vpnc = 1:%{version}-%{release}
+Obsoletes: kde-plasma-networkmanagement-vpnc < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: kde-plasma-networkmanagement-vpnc = %{?epoch:%{epoch}:}%{version}-%{release}
+%if ! 0%{?have_knm3}
+Obsoletes: knetworkmanager4-vpnc < %{?epoch:%{epoch}:}%{version}-%{release}
%endif
-
-%description vpnc
+%description -n %{knetworkmanager}-vpnc
%{summary}.
+%{?disclaimer}
%prep
%setup -q
+%patch0 -p1 -b .desktop
%build
@@ -88,66 +114,137 @@ mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} .. -DDBUS_SYSTEM_POLICY_DIR=%{_sysconfdir}/dbus-1/system.d
popd
-make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
+
+make %{?_smp_mflags} -C %{_target_platform}
%install
rm -rf %{buildroot}
+
make install/fast -C %{_target_platform} DESTDIR=%{buildroot} PREFIX=%{_prefix}
+## unpackaged files
+# nuke -devel type stuff for which there isn't a public API
+rm -fv %{buildroot}%{_kde4_libdir}/libknm{client,internals,service,ui}.so
+
%clean
rm -rf %{buildroot}
-%post
-/sbin/ldconfig
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+%post -n %{knetworkmanager}
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
+
+%postun -n %{knetworkmanager}
+if [ $1 -eq 0 ] ; then
+ touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null
+ touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
+ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null
+ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null
+fi
+%posttrans -n %{knetworkmanager}
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null
-%postun
-/sbin/ldconfig
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+%post -n %{knetworkmanager}-libs -p /sbin/ldconfig
+%postun -n %{knetworkmanager}-libs -p /sbin/ldconfig
-%files
+
+%files -n %{knetworkmanager}
%defattr(-,root,root,-)
-%doc TODO DESIGN
+%doc TODO DESIGN COPYING COPYING.LIB
%{_sysconfdir}/dbus-1/system.d/NetworkManager-kde4.conf
%{_kde4_libdir}/kde4/kcm_networkmanagement.so
-%{_kde4_libdir}/kde4/kded_knetworkmanager.so
-%{_kde4_libdir}/kde4/plasma_applet_networkmanagement.so
-%{_kde4_libdir}/libknmdbus.so.4*
-%{_kde4_libdir}/libknmstorage.so.4*
-%{_kde4_libdir}/libknmui.so.4*
+%{_kde4_libdir}/kde4/networkmanagement_pptpui.so
%{_kde4_libexecdir}/networkmanagement_configshell
-%{_kde4_iconsdir}/oxygen/32x32/actions/accesspoint.png
+%{_kde4_iconsdir}/hicolor/*/*/*
+%{_kde4_iconsdir}/oxygen/*/*/*
%{_kde4_appsdir}/desktoptheme/default/networkmanagement/networkmanagement-wireless.svgz
%{_kde4_appsdir}/desktoptheme/default/networkmanagement/networkmanagement.svg
%{_kde4_appsdir}/networkmanagement/
%{_kde4_datadir}/kde4/services/kcm_networkmanagement.desktop
-%{_kde4_datadir}/kde4/services/kded/knetworkmanager.desktop
-%{_kde4_datadir}/kde4/services/plasma-applet-networkmanagement.desktop
+%{_kde4_datadir}/kde4/services/networkmanagement_pptpui.desktop
%{_kde4_datadir}/kde4/servicetypes/networkmanagement_vpnuiplugin.desktop
+%{_kde4_bindir}/knetworkmanager
+%{_kde4_datadir}/autostart/kde4-knetworkmanager-autostart.desktop
+%{_kde4_datadir}/applications/kde4/knetworkmanager.desktop
-%files devel
+%files -n %{knetworkmanager}-libs
%defattr(-,root,root,-)
-%{_kde4_libdir}/libknmdbus.so
-%{_kde4_libdir}/libknmstorage.so
-%{_kde4_libdir}/libknmui.so
+%{_kde4_libdir}/libknmclient.so.4*
+%{_kde4_libdir}/libknminternals.so.4*
+%{_kde4_libdir}/libknmservice.so.4*
+%{_kde4_libdir}/libknmui.so.4*
+# Unversioned libraries
+%{_kde4_libdir}/libknm_nm.so
+%{_kde4_libdir}/libsolidcontrolfuture.so
-%files openvpn
+%files -n %{knetworkmanager}-openvpn
%defattr(-,root,root,-)
%{_kde4_libdir}/kde4/networkmanagement_openvpnui.so
%{_kde4_datadir}/kde4/services/networkmanagement_openvpnui.desktop
-%files vpnc
+%files -n %{knetworkmanager}-vpnc
%defattr(-,root,root,-)
%{_kde4_libdir}/kde4/networkmanagement_vpncui.so
%{_kde4_datadir}/kde4/services/networkmanagement_vpncui.desktop
+%files -n kde-plasma-networkmanagement
+%defattr(-,root,root,-)
+%{_kde4_datadir}/kde4/services/plasma-applet-networkmanagement.desktop
+%{_kde4_datadir}/kde4/services/kcm_networkmanagement_tray.desktop
+%{_kde4_datadir}/kde4/services/kded/networkmanagement.desktop
+%{_kde4_libdir}/kde4/plasma_applet_networkmanagement.so
+%{_kde4_libdir}/kde4/kded_networkmanagement.so
+%{_kde4_libdir}/kde4/kcm_networkmanagement_tray.so
+
%changelog
+* Sun Oct 25 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1:0.9-0.4.20090930svn
+- Build as knetworkmanager4 for F10 so KDE 3 KNM users are not forced to upgrade
+- Obsolete knetworkmanager4 (and keep replacing the KDE 3 KNM) on F11+
+
+* Wed Sep 30 2009 Ben Boeckel <MathStuf at gmail.com> 1:0.9-0.3.20090930svn
+- New snapshot
+
+* Mon Sep 21 2009 Ben Boeckel <MathStuf at gmail.com> 1:0.9-0.2.20090919svn
+- Add back missing Requires:
+
+* Mon Sep 21 2009 Ben Boeckel <MathStuf at gmail.com> 1:0.9-0.1.20090919svn
+- Version seems to be .9 now
+- Fix trailing spaces
+- New snapshot
+
+* Tue Sep 15 2009 Rex Dieter <rdieter at fedoraproject.org> 1:0.8-0.22.20090815svn
+- Epoch: 1
+
+* Fri Aug 28 2009 Rex Dieter <rdieter at fedoraproject.org> 0.8-0.21.20090815svn
+- use knetworkmanager pkg names
+- quasi-artificially inflate version to 0.8 (for now), to simplify upgrade path
+ for knetworkmanager-0.7 (from F-10)
+- nuke -devel pkg
+- drop references to short-lived kde-plasma-networkmanager
+
+* Sat Aug 15 2009 Rex Dieter <rdieter at fedoraproject.org> 0.1-0.20.20090815svn
+- New snapshot
+- optimize scriptlets
+- -libs subpkg, multilib-friendly
+
+* Mon Jul 27 2009 Ben Boeckel <MathStuf at gmail.com> 0.1-0.19.20090726svn
+- Add BR on kdelibs-experimental-devel
+
+* Mon Jul 27 2009 Ben Boeckel <MathStuf at gmail.com> 0.1-0.18.20090726svn
+- New snapshot
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1-0.17.20090602svn
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Jun 09 2009 Rex Dieter <rdieter at fedoraproject.org> 0.1-0.16.20090602svn
+- Requires: NetworkManager
+
* Wed Jun 03 2009 Ben Boeckel <MathStuf at gmail.com> 0.1-0.15.20090602svn
- Remove patch and use wildcards instead
@@ -191,7 +288,7 @@ xdg-icon-resource forceupdate --theme ox
* Sat Feb 7 2009 Ben Boeckel <MathStuf at gmail.com> 0.1-0.3.20090207svn
- Add changelog
-- Added tarball creation
+- Added tarball creation
- Changed name to kde-plasma-networkmanagement
* Tue Jan 13 2009 Rex Dieter <rdieter[AT]fedoraproject.org> 0.1-0.2.20090111svn
More information about the fedora-extras-commits
mailing list