rpms/kde-plasma-networkmanagement/devel kde-plasma-networkmanagement.spec, 1.15, 1.16 sources, 1.9, 1.10 kde-plasma-networkmanagement-0.1-version-check.patch, 1.1, NONE
Rex Dieter
rdieter at fedoraproject.org
Tue Aug 18 19:06:42 UTC 2009
- Previous message: rpms/ipsec-tools/devel ipsec-tools-0.7.3-aliasing.patch, NONE, 1.1 ipsec-tools.spec, 1.66, 1.67 ipsec-tools-0.7.2-review.patch, 1.1, NONE
- Next message: rpms/gdb/devel gdb-6.5-bz190810-gdbserver-arch-advice.patch, 1.4, 1.5 gdb-6.6-buildid-locate.patch, 1.24, 1.25 gdb.spec, 1.375, 1.376
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rdieter
Update of /cvs/pkgs/rpms/kde-plasma-networkmanagement/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31064
Modified Files:
kde-plasma-networkmanagement.spec sources
Removed Files:
kde-plasma-networkmanagement-0.1-version-check.patch
Log Message:
* Sat Aug 15 2009 Rex Dieter <rdieter at fedoraproject.org> 0.1-0.20.20090815svn
- New snapshot
- optimize scriptlets
- -libs subpkg, multilib-friendly
Index: kde-plasma-networkmanagement.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/devel/kde-plasma-networkmanagement.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- kde-plasma-networkmanagement.spec 27 Jul 2009 14:15:30 -0000 1.15
+++ kde-plasma-networkmanagement.spec 18 Aug 2009 19:06:42 -0000 1.16
@@ -1,6 +1,6 @@
Name: kde-plasma-networkmanagement
Version: 0.1
-Release: 0.19.20090726svn%{?dist}
+Release: 0.20.20090815svn%{?dist}
Summary: NetworkManager KDE 4 integration
Group: User Interface/Desktops
@@ -8,20 +8,22 @@ License: (GPLv2 or GPLv3) and GPL
URL: http://websvn.kde.org/trunk/playground/base/plasma/applets/networkmanager/
# The source for this package was pulled from upstream's vcs. Use the
# following commands to generate the tarball:
-# svn export -r 1002781 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
-Patch0: %{name}-%{version}-version-check.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: kdelibs-experimental-devel
-BuildRequires: kdebase-workspace-devel >= 4.2.98
+BuildRequires: kdebase-workspace-devel >= 4.3.0
BuildRequires: NetworkManager-glib-devel >= 0.7.0
BuildRequires: PolicyKit-devel
# manual dep, until something better comes along -- Rex
Requires: NetworkManager
+Obsoletes: kde-plasma-networkmanagement < 0.1-20
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+
Obsoletes: kde-plasma-networkmanager < %{version}-%{release}
Provides: kde-plasma-networkmanager = %{version}-%{release}
%if 0%{?fedora} > 10
@@ -34,10 +36,19 @@ A Plasma applet to control your wired an
the default NetworkManager service. This is alpha software with known issues.
We still recommend nm-applet from NetworkManager-gnome for production use.
+%package libs
+Summary: Runtime libraries for %{name}
+Group: System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+#Requires: kdelibs4%{?_isa} >= %{kde4_version}
+%description libs
+%{summary}.
+
+
%package devel
Summary: Files needed to develop programs which use the Network Manager plasmoid
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires: kdebase-workspace-devel
Requires: NetworkManager-glib-devel
@@ -86,7 +97,6 @@ Provides: knetworkmanager-vpnc = 1
%prep
%setup -q
-%patch0
%build
@@ -94,7 +104,7 @@ 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
@@ -107,13 +117,25 @@ rm -rf %{buildroot}
%post
-/sbin/ldconfig
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
-
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
%postun
-/sbin/ldconfig
-xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
+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
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null
+
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
%files
@@ -122,27 +144,33 @@ xdg-icon-resource forceupdate --theme ox
%{_sysconfdir}/dbus-1/system.d/NetworkManager-kde4.conf
%{_kde4_libdir}/kde4/kcm_networkmanagement.so
%{_kde4_libdir}/kde4/kded_networkmanagement.so
+%{_kde4_libdir}/kde4/networkmanagement_pptpui.so
%{_kde4_libdir}/kde4/plasma_applet_networkmanagement.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
%{_kde4_libexecdir}/networkmanagement_configshell
-%{_kde4_iconsdir}/*/*/*/*.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/networkmanagement.desktop
+%{_kde4_datadir}/kde4/services/networkmanagement_pptpui.desktop
%{_kde4_datadir}/kde4/services/plasma-applet-networkmanagement.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 libs
+%defattr(-,root,root,-)
+%{_kde4_libdir}/libknmclient.so.4*
+%{_kde4_libdir}/libknminternals.so.4*
+%{_kde4_libdir}/libknmservice.so.4*
+%{_kde4_libdir}/libknmui.so.4*
+
%files devel
%defattr(-,root,root,-)
%{_kde4_libdir}/libknmclient.so
@@ -162,6 +190,11 @@ xdg-icon-resource forceupdate --theme ox
%changelog
+* 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
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources 27 Jul 2009 14:03:20 -0000 1.9
+++ sources 18 Aug 2009 19:06:42 -0000 1.10
@@ -1 +1 @@
-4cfec4d31d38b62e2874334cedc97e58 kde-plasma-networkmanagement-0.1.tar.bz2
+8a072d778cda60990c4670d85cad2f0c kde-plasma-networkmanagement-0.1.tar.bz2
--- kde-plasma-networkmanagement-0.1-version-check.patch DELETED ---
- Previous message: rpms/ipsec-tools/devel ipsec-tools-0.7.3-aliasing.patch, NONE, 1.1 ipsec-tools.spec, 1.66, 1.67 ipsec-tools-0.7.2-review.patch, 1.1, NONE
- Next message: rpms/gdb/devel gdb-6.5-bz190810-gdbserver-arch-advice.patch, 1.4, 1.5 gdb-6.6-buildid-locate.patch, 1.24, 1.25 gdb.spec, 1.375, 1.376
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list