Updated package cpu-g-bzr r13-2

6 files changed, 44 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 001174a4607e..e25aefca7412 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,9 @@
 pkgbase = cpu-g-bzr
 	pkgdesc = An application that shows useful information about your CPU, Motherboard and some general information about your system.
 	pkgver = r13
-	pkgrel = 1
+	pkgrel = 2
 	epoch = 1
 	url = http://cpug.sourceforge.net/
-	install = cpu-g-bzr.install
 	arch = any
 	license = GPL3
 	makedepends = bzr
@@ -17,10 +16,12 @@ pkgbase = cpu-g-bzr
 	conflicts = cpu-g
 	source = bzr+lp:/cpug
 	source = cpu-g_desktop.patch
-	source = xorg_version.patch
+	source = archlinux_logo.patch
+	source = archlinux.png
 	sha256sums = SKIP
 	sha256sums = dbe89f2fd631880dc2fd6239fc035fe16b91543a5a80acc57c2ec407d8e00a34
-	sha256sums = 6a3af8148005bb255591681fc8a32568c07eee705012116f8a80a356130fcc42
+	sha256sums = f68ad58db224e87f193cae84cd2a8e41fa164c9a38156d2638a2f08a8a621158
+	sha256sums = 5badb15ab15f5b004c510f17622edb0a6c781b6f8dc8638e14e8d30f14d17c57
 
 pkgname = cpu-g-bzr
 
diff --git a/PKGBUILD b/PKGBUILD
index 642964ff738b..bf67ec3bf0a6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 pkgname=cpu-g-bzr
 _pkgname=cpug
 pkgver=r13
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc="An application that shows useful information about your CPU, Motherboard and some general information about your system."
 url="http://cpug.sourceforge.net/"
@@ -16,11 +16,12 @@ provides=('cpu-g')
 conflicts=('cpu-g')
 source=('bzr+lp:/cpug'
         'cpu-g_desktop.patch'
-        'xorg_version.patch')
+        'archlinux_logo.patch'
+        'archlinux.png')
 sha256sums=('SKIP'
             'dbe89f2fd631880dc2fd6239fc035fe16b91543a5a80acc57c2ec407d8e00a34'
-            '6a3af8148005bb255591681fc8a32568c07eee705012116f8a80a356130fcc42')
-install="${pkgname}.install"
+            'f68ad58db224e87f193cae84cd2a8e41fa164c9a38156d2638a2f08a8a621158'
+            '5badb15ab15f5b004c510f17622edb0a6c781b6f8dc8638e14e8d30f14d17c57')
 
 pkgver() {
   cd "${_pkgname}"
@@ -30,7 +31,9 @@ pkgver() {
 prepare() {
   cd "${_pkgname}"
   patch -p0 -i "${srcdir}/cpu-g_desktop.patch"
-  patch -p0 -i "${srcdir}/xorg_version.patch"
+  # Add Arch Linux logo
+  patch -p0 -i "${srcdir}/archlinux_logo.patch"
+  install -m 644 -t "gfx/logos/distro_logo/" "${srcdir}/archlinux.png"
 }
 
 package() {
diff --git a/archlinux.png b/archlinux.png
new file mode 100644
index 000000000000..ca7e5a28cf7c
--- /dev/null
+++ b/archlinux.png
diff --git a/archlinux_logo.patch b/archlinux_logo.patch
new file mode 100644
index 000000000000..44419960edd9
--- /dev/null
+++ b/archlinux_logo.patch
@@ -0,0 +1,31 @@
+--- cpu-g.py.orig	2019-08-31 13:31:50.361597000 +0200
++++ cpu-g.py	2019-08-31 15:29:01.168812987 +0200
+@@ -337,10 +337,16 @@
+         except AttributeError:
+             values = platform.dist()
+ 
+-        if len(values) !=0:
++        if len(values) !=0 and ''.join(values) != '':
+             return "%s %s %s" %(values[0], values[1], values[2])
+         else:
+-            return self.readfile('/etc/lsb-release').strip()
++            values = os.popen('lsb_release -d -s').read().strip()
++            if values[0] == '"' and values[-1] == '"':
++                values = values[1:-1]
++            if len(values) != 0:
++                return values
++            else:
++                return self.readfile('/etc/lsb-release').strip()
+ 
+     def gccver(self):
+         gcc_version = os.popen('gcc -dumpversion').read().strip()
+@@ -421,6 +427,9 @@
+ 	#LinuxMint
+ 	elif re.findall("Mint\s*",dist):
+ 	    label = 'linuxmintlogo.png'
++        # Arch Linux
++        elif re.findall("Arch Linux\s*",dist):
++            label = 'archlinux.png'
+ 	#If any distro not found then set standard Tux logo
+ 	elif re.findall("Linux\s*",dist):
+ 	    label = 'linux_logo.png'
diff --git a/cpu-g-bzr.install b/cpu-g-bzr.install
deleted file mode 100644
index d59dca6e808e..000000000000
--- a/cpu-g-bzr.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/xorg_version.patch b/xorg_version.patch
deleted file mode 100644
index 84c5640eadbf..000000000000
--- a/xorg_version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cpu-g.py.orig	2015-03-15 19:34:44.627931000 +0100
-+++ cpu-g.py	2015-03-15 19:35:31.935819377 +0100
-@@ -350,7 +350,7 @@
-             return 'N/A'
- 
-     def xver(self):
--        command = subprocess.Popen(['Xorg', '-version'],stdout=subprocess.PIPE,stderr=subprocess.PIPE)
-+        command = subprocess.Popen(['/usr/lib/xorg-server/Xorg', '-version'],stdout=subprocess.PIPE,stderr=subprocess.PIPE)
-         stdout, stderr = command.communicate()
-         return re.findall("X\.Org X Server (.*)", stderr)[0]
-