rpms/kde-plasma-networkmanagement/F-11 kde-plasma-networkmanagement.spec, 1.7, 1.8 sources, 1.7, 1.8
Rex Dieter
rdieter at fedoraproject.org
Fri Aug 28 18:38:05 UTC 2009
Author: rdieter
Update of /cvs/pkgs/rpms/kde-plasma-networkmanagement/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29863
Modified Files:
kde-plasma-networkmanagement.spec sources
Log Message:
sync w/devel branch for newest goodness
Index: kde-plasma-networkmanagement.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/F-11/kde-plasma-networkmanagement.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- kde-plasma-networkmanagement.spec 4 Jun 2009 03:09:45 -0000 1.7
+++ kde-plasma-networkmanagement.spec 28 Aug 2009 18:38:05 -0000 1.8
@@ -1,86 +1,86 @@
+
+%define disclaimer \
+This is alpha software with known issues.\
+We still recommend nm-applet from NetworkManager-gnome for production use.
+
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
+Version: 0.8
+Release: 0.21.20090815svn%{?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
+# svn export -r 1011744 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
-Source0: %{name}-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+#Source0: %{name}-%{version}.tar.bz2
+Source0: kde-plasma-networkmanagement-0.1.tar.bz2
-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
-%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.
+# multilib upgrades
+Obsoletes: kde-plasma-networkmanagement < 0.1-0.21
+Obsoletes: kde-plasma-networkmanagement-devel < 0.1-0.21
-%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
+Requires: knetworkmanager = %{version}-%{release}
-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}
-%endif
+%description
+A Plasma applet to control your wired and wireless network(s) in KDE 4 using
+the default NetworkManager service.
+%{?disclaimer}
-%description devel
+%package -n knetworkmanager
+Summary: NetworkManager KDE 4 integration
+Group: Applications/Internet
+Requires: knetworkmanager-libs%{?_isa} = %{version}-%{release}
+%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 = %{version}-%{release}
+#Requires: kdelibs4%{?_isa} >= %{kde4_version}
+%description -n knetworkmanager-libs
%{summary}.
-%package openvpn
-Summary: Libraries for the Network Manager plasmoid to use OpenVPN
-Group: User Interface/Desktops
+%package -n knetworkmanager-openvpn
+Summary: OpenVPN support for knetworkmanager
+Group: Applications/Internet
Requires: %{name} = %{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}
-%endif
-
-%description openvpn
+Obsoletes: kde-plasma-networkmanagement-openvpn < %{version}-%{release}
+Provides: kde-plasma-networkmanagement-openvpn = %{version}-%{release}
+%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 = %{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}
-%endif
-
-%description vpnc
+Obsoletes: kde-plasma-networkmanagement-vpnc < %{version}-%{release}
+Provides: kde-plasma-networkmanagement-vpnc = %{version}-%{release}
+%description -n knetworkmanager-vpnc
%{summary}.
+%{?disclaimer}
%prep
-%setup -q
+%setup -q -n kde-plasma-networkmanagement-0.1
%build
@@ -88,66 +88,117 @@ 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
+%post -n knetworkmanager-libs -p /sbin/ldconfig
-%postun
-/sbin/ldconfig
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+%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/kded/networkmanagement.desktop
+%{_kde4_libdir}/kde4/plasma_applet_networkmanagement.so
+%{_kde4_libdir}/kde4/kded_networkmanagement.so
+
%changelog
+* 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
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources 4 Jun 2009 03:09:45 -0000 1.7
+++ sources 28 Aug 2009 18:38:05 -0000 1.8
@@ -1 +1 @@
-f8835e99c3683a11319150f310089f97 kde-plasma-networkmanagement-0.1.tar.bz2
+8a072d778cda60990c4670d85cad2f0c kde-plasma-networkmanagement-0.1.tar.bz2
More information about the fedora-extras-commits
mailing list