From c198b7596ac776e025ad50e5a811b35fecb54542 Mon Sep 17 00:00:00 2001 From: arcan1s Date: Sun, 29 Sep 2013 00:44:03 +0400 Subject: [PATCH] Release 1.3.5 * fix bug with definition net dev in old version of net-tools --- PKGBUILD | 44 +++++++++++------- ext-sysmon-1.2.zip | Bin 2974 -> 2974 bytes kdeplasma-applets-pytextmonitor.install | 10 +--- ...plasmoid => py-text-monitor-1.3.5.plasmoid | Bin 15356 -> 15355 bytes sources/contents/code/main.py | 4 +- sources/metadata.desktop | 2 +- 6 files changed, 31 insertions(+), 29 deletions(-) rename py-text-monitor-1.3.4.plasmoid => py-text-monitor-1.3.5.plasmoid (75%) diff --git a/PKGBUILD b/PKGBUILD index 6b61cfd..1dc9f5f 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,44 +3,52 @@ pkgname=kdeplasma-applets-pytextmonitor _pkgname=py-text-monitor -pkgver=1.3.4 -pkgrel=6 +pkgver=1.3.5 +pkgrel=1 _dtengine=ext-sysmon _dtver=1.2 pkgdesc="Minimalistic Plasmoid script written on Python2. It looks like widgets in awesome-wm" -arch=(any) +arch=('i686' 'x86_64') url="https://github.com/arcan1s/pytextmonitor" license=('GPL') depends=('kdebase-workspace' 'kdebindings-python2' 'lm_sensors' 'net-tools') -optdepends=("hddtemp: for HDD temperature monitor" - "catalyst: for GPU monitor" - "nvidia-utils: for GPU monitor") -makedepends=('cmake' 'automoc4') +optdepends=('hddtemp: for HDD temperature monitor' + '775bc3a6057f2dc1696f09b8d315a3e9' + '775bc3a6057f2dc1696f09b8d315a3e9') +makedepends=('automoc4' 'cmake') source=(https://github.com/arcan1s/pytextmonitor/releases/download/V.${pkgver}/${_pkgname}-${pkgver}.plasmoid https://github.com/arcan1s/pytextmonitor/releases/download/V.${pkgver}/${_dtengine}-${_dtver}.zip) install=${pkgname}.install -md5sums=('7cca5fd76735add215f35d406c020dea' - '9b547781732ab19ad103710b7bd07d8d') +md5sums=('d99c8a152693b6b10ebe8fb1a076a333' + '775bc3a6057f2dc1696f09b8d315a3e9') build () { -# build dataengine + # build dataengine if [ -d ${srcdir}/${_dtengine}/build ]; then rm -r ${srcdir}/${_dtengine}/build fi mkdir ${srcdir}/${_dtengine}/build && cd ${srcdir}/${_dtengine}/build - cmake -DCMAKE_INSTALL_PREFIX=`kde4-config --prefix` -DCMAKE_BUILD_TYPE=Release ../ - make || return 1 + cmake -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=`kde4-config --prefix` \ + ../ + make } package() { -# install dataengine + # install dataengine cd ${srcdir}/${_dtengine}/build - make DESTDIR=${pkgdir} install || return 1 + make DESTDIR=${pkgdir} install -# install plasmoid - install -D ${srcdir}/metadata.desktop ${pkgdir}/`kde4-config --prefix`/share/kde4/services/${_pkgname}.desktop || return 1 - install -D ${srcdir}/metadata.desktop ${pkgdir}/`kde4-config --prefix`/share/apps/plasma/plasmoids/${_pkgname}/metadata.desktop || return 1 - cp -r ${srcdir}/contents ${pkgdir}/`kde4-config --prefix`/share/apps/plasma/plasmoids/${_pkgname}/ || return 1 + # install plasmoid + install -D -m644 ${srcdir}/metadata.desktop \ + ${pkgdir}/`kde4-config --prefix`/share/kde4/services/${_pkgname}.desktop + install -D -m644 ${srcdir}/metadata.desktop \ + ${pkgdir}/`kde4-config --prefix`/share/apps/plasma/plasmoids/${_pkgname}/metadata.desktop + mkdir -p ${pkgdir}/`kde4-config --prefix`/share/apps/plasma/plasmoids/${_pkgname}/contents/{code,ui} + install -m644 ${srcdir}/contents/code/* \ + -t ${pkgdir}/`kde4-config --prefix`/share/apps/plasma/plasmoids/${_pkgname}/contents/code + install -m644 ${srcdir}/contents/ui/* \ + -t ${pkgdir}/`kde4-config --prefix`/share/apps/plasma/plasmoids/${_pkgname}/contents/ui } diff --git a/ext-sysmon-1.2.zip b/ext-sysmon-1.2.zip index 6ea64cd8e29175c5fb13e3ec77d1d50483479751..efeb97ba70062cedc5dac4f95091106e8d886601 100644 GIT binary patch delta 48 scmbOyK2Lmt5wnZE`$W@35Vdh;3nPf$tiW^(!g$HNmjx`clH)5A0B)QQdjJ3c delta 48 zcmbOyK2Lmt5%aEmwTY&QAZp{x7Dnc;S!$aVn2s?rmjM|snfJ0V7Xuk9IleLh0It3f AwEzGB diff --git a/kdeplasma-applets-pytextmonitor.install b/kdeplasma-applets-pytextmonitor.install index 946f255..7fa6471 100644 --- a/kdeplasma-applets-pytextmonitor.install +++ b/kdeplasma-applets-pytextmonitor.install @@ -11,16 +11,10 @@ EOF post_upgrade() { - cat << EOF -Update plasmoids... -EOF - kbuildsycoca4 > /dev/null 2>&1 + post_install } post_remove() { - cat << EOF -Update plasmoids... -EOF - kbuildsycoca4 > /dev/null 2>&1 + post_install } diff --git a/py-text-monitor-1.3.4.plasmoid b/py-text-monitor-1.3.5.plasmoid similarity index 75% rename from py-text-monitor-1.3.4.plasmoid rename to py-text-monitor-1.3.5.plasmoid index c9f2503727ec377a3bb3f5050caf3fcbb43f30e4..7c5e1a64ef5f0b345fee813265de4e2d5b05755f 100644 GIT binary patch delta 2549 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 diff --git a/sources/contents/code/main.py b/sources/contents/code/main.py index 90008e1..9d0ffbc 100644 --- a/sources/contents/code/main.py +++ b/sources/contents/code/main.py @@ -69,8 +69,8 @@ class pyTextWidget(plasmascript.Applet): try: interfaces = [] for line in commands.getoutput("ifconfig -a").split("\n"): - if ((line != '') and (line[0] != ' ') and (line[0:3] != 'lo:')): - interfaces.append(line.split(":")[0]) + if ((line != '') and (line[0] != ' ') and (line.split(":")[0].split()[0] != 'lo')): + interfaces.append(line.split(":")[0].split()[0]) for device in interfaces: if (commands.getoutput("ifconfig " + device + " | grep 'inet '") != ''): diff --git a/sources/metadata.desktop b/sources/metadata.desktop index 8034900..045edb9 100644 --- a/sources/metadata.desktop +++ b/sources/metadata.desktop @@ -12,7 +12,7 @@ X-Plasma-RequiredExtensions=LaunchApp,LocalIO,FileDialog X-KDE-PluginInfo-Author=Evgeniy Alekseev aka arcanis X-KDE-PluginInfo-Email=esalexeev@gmail.com X-KDE-PluginInfo-Name=py-text-monitor -X-KDE-PluginInfo-Version=1.3.4 +X-KDE-PluginInfo-Version=1.3.5 X-KDE-PluginInfo-Website=http://kde-look.org/ X-KDE-PluginInfo-Category=System Information X-KDE-PluginInfo-Depends=