[kde-plasma-networkmanagement] 0.9.0.1

Rex Dieter rdieter at fedoraproject.org
Tue Apr 10 13:40:29 UTC 2012


commit 50e1331e930cdbdfa6f363395b1ee32c520269cb
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Apr 10 08:42:31 2012 -0500

    0.9.0.1
    
    - simplify/pkgconfig'ize deps a bit

 .gitignore                        |    5 +---
 kde-plasma-networkmanagement.spec |   45 +++++++++++++++++++-----------------
 sources                           |    2 +-
 3 files changed, 26 insertions(+), 26 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bf9888c..ca494be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1 @@
-/networkmanagement-0.8.95.tar.bz2
-/networkmanagement-0.8.98.tar.bz2
-/networkmanagement-0.8.99.tar.bz2
-/networkmanagement-0.9.0.tar.bz2
+/networkmanagement-0.9.0.1.tar.bz2
diff --git a/kde-plasma-networkmanagement.spec b/kde-plasma-networkmanagement.spec
index 28da0be..7506f86 100644
--- a/kde-plasma-networkmanagement.spec
+++ b/kde-plasma-networkmanagement.spec
@@ -1,6 +1,6 @@
 Name:           kde-plasma-networkmanagement
 Epoch:          1
-Version:        0.9.0
+Version:        0.9.0.1
 Release:        1%{?dist}
 Summary:        NetworkManager KDE 4 integration
 
@@ -15,18 +15,14 @@ Source0:        ftp://ftp.kde.org/pub/kde/unstable/networkmanagement/%{version}/
 # Add plasma-nm to default systray if needed, for upgraders...
 Source10: 00-fedora-networkmanagement.js
 
-BuildRequires:  kdelibs4-devel >= 4.5.0
+BuildRequires:  gettext
+BuildRequires:  kdelibs4-devel
 BuildRequires:  kdebase-workspace-devel
 # really just a runtime dep, meh -- Rex
 BuildRequires:  mobile-broadband-provider-info-devel
 # use pkgconfig() to avoid need for tracking nm epoch
 BuildRequires:  pkgconfig(NetworkManager) >= 0.9.0
-# -glib-devel to work around https://bugzilla.redhat.com/show_bug.cgi?id=685442
-# and related issues (nm-settings-cdma.h)
-BuildRequires:  NetworkManager-glib-devel 
-BuildRequires:  PolicyKit-devel
-BuildRequires:  qt4-devel
-BuildRequires:  gettext
+BuildRequires:  pkgconfig(libnm-glib) pkgconfig(libnm-util) 
 BuildRequires:  pkgconfig(openconnect) >= 3.11
 
 # multilib upgrades
@@ -109,9 +105,20 @@ make %{?_smp_mflags} -C %{_target_platform}
 %install
 rm -rf %{buildroot}
 
-make install/fast -C %{_target_platform} DESTDIR=%{buildroot} PREFIX=%{_prefix}
+make install/fast -C %{_target_platform} DESTDIR=%{buildroot}
+
+# migrate to nm plasmoid
+install -m644 -p -D %{SOURCE10} %{buildroot}%{_kde4_appsdir}/plasma-desktop/updates/00-fedora-networkmanagement.js
+
+%find_lang libknetworkmanager
+%find_lang plasma_applet_networkmanagement
+%find_lang solidcontrolnm09
+
+cat libknetworkmanager.lang solidcontrolnm09.lang > libs.lang
 
 ## unpackaged files
+# knetworkmanager locales
+rm -fv %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/knetworkmanager.*
 # nuke -devel type stuff for which there isn't a public API
 rm -rfv %{buildroot}%{_kde4_includedir}/solid/controlnm09
 rm -fv %{buildroot}%{_kde4_libdir}/libknm{client,internals,service,ui}.so
@@ -122,12 +129,6 @@ rm -fv %{buildroot}%{_kde4_datadir}/kde4/services/networkmanagement_novellvpnui.
 rm -fv %{buildroot}%{_kde4_libdir}/kde4/networkmanagement_strongswanui.so
 rm -fv %{buildroot}%{_kde4_datadir}/kde4/services/networkmanagement_strongswanui.desktop
 
-# migrate to nm plasmoid
-install -m644 -p -D %{SOURCE10} %{buildroot}%{_kde4_appsdir}/plasma-desktop/updates/00-fedora-networkmanagement.js
-
-%find_lang libknetworkmanager
-%find_lang plasma_applet_networkmanagement
-
 
 %clean
 rm -rf %{buildroot}
@@ -145,11 +146,6 @@ fi
 %posttrans
 gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
 
-%post libs -p /sbin/ldconfig
-
-%postun libs -p /sbin/ldconfig
-
-
 %files -f plasma_applet_networkmanagement.lang
 %defattr(-,root,root,-)
 %doc TODO DESIGN COPYING COPYING.LIB
@@ -170,7 +166,10 @@ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
 %{_kde4_libdir}/kde4/kcm_networkmanagement.so
 %{_kde4_libdir}/kde4/kcm_networkmanagement_tray.so
 
-%files libs -f libknetworkmanager.lang
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
+
+%files libs -f libs.lang
 %defattr(-,root,root,-)
 %{_kde4_libdir}/libknmclient.so.4*
 %{_kde4_libdir}/libknminternals.so.4*
@@ -207,6 +206,10 @@ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
 
 
 %changelog
+* Tue Apr 10 2012 Rex Dieter <rdieter at fedoraproject.org> 1:0.9.0.1-1
+- 0.9.0.1
+- simplify/pkgconfig'ize deps a bit
+
 * Mon Feb 27 2012 Kevin Kofler <Kevin at tigcc.ticalc.org> 1:0.9.0-1
 - update to 0.9.0
 
diff --git a/sources b/sources
index 310c862..2b75883 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e39fbc01166c8019104a03c03af890e4  networkmanagement-0.9.0.tar.bz2
+acae23711269a94763a87532f55d301d  networkmanagement-0.9.0.1.tar.bz2


More information about the scm-commits mailing list