Attachment 2242 Details for Bug 13118 – Подправил

[patch] Подправил

hardinfo-0.4.2.2-x86_64.diff (text/plain), 3.56 KB, created by ruslandh on 2007-10-27 14:10:42 MSD

(hide)

Description:

Filename:

MIME Type:

Creator: ruslandh

Created: 2007-10-27 14:10:42 MSD

Size: 3.56 KB

patch

obsolete

>diff -uNr hardinfo-0.4.2.2/arch/common/zlib.h hardinfo-0.4.2.2-new-r/arch/common/zlib.h
>--- hardinfo-0.4.2.2/arch/common/zlib.h	2007-07-20 18:44:59 +0400
>+++ hardinfo-0.4.2.2-new-r/arch/common/zlib.h	2007-10-27 13:19:54 +0400
>@@ -27,7 +27,7 @@
>     if (!(compress && compressBound)) {
> 	libz = g_module_open("libz", G_MODULE_BIND_LAZY);
> 	if (!libz) {
>-            libz = g_module_open("/usr/lib/libz.so", G_MODULE_BIND_LAZY);
>+            libz = g_module_open("/usr/lib64/libz.so", G_MODULE_BIND_LAZY);
>             if (!libz) {
>                 g_warning("Cannot load ZLib: %s", g_module_error());
>                 return;
>diff -uNr hardinfo-0.4.2.2/arch/linux/common/os.h hardinfo-0.4.2.2-new-r/arch/linux/common/os.h
>--- hardinfo-0.4.2.2/arch/linux/common/os.h	2007-07-20 18:44:57 +0400
>+++ hardinfo-0.4.2.2-new-r/arch/linux/common/os.h	2007-10-27 13:20:41 +0400
>@@ -22,7 +22,7 @@
>     FILE *libc;
>     gchar buf[256], *tmp, *p;
>     
>-    libc = popen("/lib/libc.so.6", "r");
>+    libc = popen("/lib64/libc.so.6", "r");
>     if (!libc) goto err;
>     
>     fgets(buf, 256, libc);
>diff -uNr hardinfo-0.4.2.2/autopackage/default.apspec hardinfo-0.4.2.2-new-r/autopackage/default.apspec
>--- hardinfo-0.4.2.2/autopackage/default.apspec	2007-07-20 18:47:19 +0400
>+++ hardinfo-0.4.2.2-new-r/autopackage/default.apspec	2007-10-27 13:22:05 +0400
>@@ -42,9 +42,9 @@
> # See http://www.autopackage.org/api/ for details
> installExe bin/*
> installData share/*
>-copyFile lib/hardinfo/modules/benchmark.so $PREFIX/lib/hardinfo/modules/benchmark.so
>-copyFile lib/hardinfo/modules/computer.so $PREFIX/lib/hardinfo/modules/computer.so
>-copyFile lib/hardinfo/modules/devices.so $PREFIX/lib/hardinfo/modules/devices.so
>+copyFile lib64/hardinfo/modules/benchmark.so $PREFIX/lib64/hardinfo/modules/benchmark.so
>+copyFile lib64/hardinfo/modules/computer.so $PREFIX/lib64/hardinfo/modules/computer.so
>+copyFile lib64/hardinfo/modules/devices.so $PREFIX/lib64/hardinfo/modules/devices.so
> installMenuItem "System" share/applications/hardinfo.desktop
> 
> [Uninstall]
>diff -uNr hardinfo-0.4.2.2/binreloc.c hardinfo-0.4.2.2-new-r/binreloc.c
>--- hardinfo-0.4.2.2/binreloc.c	2007-07-20 18:45:08 +0400
>+++ hardinfo-0.4.2.2-new-r/binreloc.c	2007-10-27 14:00:03 +0400
>@@ -22,6 +22,8 @@
> #include <string.h>
> #include "binreloc.h"
> 
>+#include "config.h"
>+
> G_BEGIN_DECLS
> /** @internal
>  * Find the canonical filename of the executable. Returns the filename
>@@ -592,7 +594,7 @@
> 	    return NULL;
>     }
> 
>-    dir = g_build_filename(prefix, "lib", NULL);
>+    dir = g_build_filename(prefix, LIBDIR, NULL);
>     g_free(prefix);
>     return dir;
> }
>@@ -624,7 +626,7 @@
> 	    return NULL;
>     }
> 
>-    dir = g_build_filename(prefix, "libexec", NULL);
>+    dir = g_build_filename(prefix, LIBEXECDIR, NULL);
>     g_free(prefix);
>     return dir;
> }
>diff -uNr hardinfo-0.4.2.2/configure hardinfo-0.4.2.2-new-r/configure
>--- hardinfo-0.4.2.2/configure	2007-10-27 13:35:01 +0400
>+++ hardinfo-0.4.2.2-new-r/configure	2007-10-27 13:57:34 +0400
>@@ -173,6 +173,15 @@
> # --------------------------------------------------------------------------
> 
> echo -e "\nWriting config.h..."
>+arh=`arch`
>+if [ "$arh" == x86_64 ];then
>+suf=64
>+echo $suf
>+else
>+suf=''
>+echo !!!!!!
>+fi
>+
> rm -f config.h
> echo -e "#ifndef __CONFIG_H__\n#define __CONFIG_H__\n" > config.h
> 
>@@ -189,6 +198,10 @@
> echo "#define PREFIX \"/usr/share/hardinfo/\"" >> config.h
> echo "#define LIBPREFIX \"/usr/lib64/hardinfo/\"" >> config.h
> 
>+echo "#define LIBDIR \"/usr/lib$suf/\"" >> config.h
>+echo "#define LIBEXECDIR \"/usr/lib/\"" >> config.h
>+
>+
> if [ "$SOUP" == "1" ]; then
> 	echo "#define HAS_LIBSOUP" >> config.h
> fi

Actions: View | Diff

Attachments on bug 13118: 2241 | 2242