rpms/hardinfo/FC-6 disablesensors.patch, NONE, 1.1 fixuserdsp.patch, NONE, 1.1 hardinfo.spec, NONE, 1.1 multilibfix.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Adel Gadllah (drago01)
fedora-extras-commits at redhat.com
Tue Jul 24 05:43:41 UTC 2007
Author: drago01
Update of /cvs/pkgs/rpms/hardinfo/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26158/FC-6
Modified Files:
.cvsignore sources
Added Files:
disablesensors.patch fixuserdsp.patch hardinfo.spec
multilibfix.patch
Log Message:
Initial Import
disablesensors.patch:
--- NEW FILE disablesensors.patch ---
diff -upNr hardinfo-0.4.2.2.orign/devices.c hardinfo-0.4.2.2/devices.c
--- hardinfo-0.4.2.2.orign/devices.c 2007-07-20 16:45:08.000000000 +0200
+++ hardinfo-0.4.2.2/devices.c 2007-07-23 11:58:21.000000000 +0200
@@ -66,7 +66,7 @@ static ModuleEntry entries[] = {
{"USB Devices", "usb.png", callback_usb, scan_usb},
{"Printers", "printer.png", callback_printers, scan_printers,},
{"Battery", "battery.png", callback_battery, scan_battery},
- {"Sensors", "therm.png", callback_sensors, scan_sensors},
+ /*{"Sensors", "therm.png", callback_sensors, scan_sensors},*/
{"Input Devices", "inputdevices.png", callback_input, scan_input},
{"Storage", "hdd.png", callback_storage, scan_storage},
{NULL}
fixuserdsp.patch:
--- NEW FILE fixuserdsp.patch ---
diff -upNr hardinfo-0.4.2.2.orign/arch/common/users.h hardinfo-0.4.2.2/arch/common/users.h
--- hardinfo-0.4.2.2.orign/arch/common/users.h 2007-07-20 16:44:59.000000000 +0200
+++ hardinfo-0.4.2.2/arch/common/users.h 2007-07-23 14:09:57.000000000 +0200
@@ -44,7 +44,7 @@ scan_users_do(void)
uid = atoi(tmp[2]);
strend(tmp[4], ',');
- if (uid >= 1000 && uid <= 65530) {
+ if (uid >= 500 && uid <= 65530) {
human_users = h_strdup_cprintf("$%s$%s=%s\n", human_users, key, tmp[0], tmp[4]);
} else {
sys_users = h_strdup_cprintf("$%s$%s=%s\n", sys_users, key, tmp[0], tmp[4]);
--- NEW FILE hardinfo.spec ---
Name: hardinfo
Version: 0.4.2.2
Release: 2%{?dist}
Summary: System Profiler and Benchmark
Group: User Interface/Desktops
License: GPL
URL: http://hardinfo.berlios.de/
Source0: http://download.berlios.de/hardinfo/%{name}-%{version}.tar.bz2
Patch0: multilibfix.patch
Patch1: disablesensors.patch
Patch2: fixuserdsp.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk2-devel
BuildRequires: libsoup-devel
BuildRequires: desktop-file-utils
BuildRequires: pciutils
Requires: pciutils
Requires: zlib
%description
HardInfo can gather information about a system's hardware and operating system,
perform benchmarks, and generate printable reports either in HTML or in plain
text formats
%prep
%setup -q
%patch0 -p1 -b .multilib
#disable sensors for now (segfaults)
%patch1 -p1 -b .disablesensors
%patch2 -p1 -b .fixuserdsp
%build
export LIBDIR=%{_libdir}
%configure
make %{?_smp_mflags} ARCHOPTS="%{optflags}"
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir}
desktop-file-install --vendor="fedora" \
--dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
${RPM_BUILD_ROOT}%{_datadir}/applications/hardinfo.desktop
rm -f ${RPM_BUILD_ROOT}%{_datadir}/applications/hardinfo.desktop
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%{_bindir}/hardinfo
%{_libdir}/hardinfo
%{_datadir}/hardinfo
%{_datadir}/applications/fedora-hardinfo.desktop
%doc LICENSE
%changelog
* Mon Jul 23 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.4.2.2-2
- In Fedora (human)uids start with 500 not 1000
* Mon Jul 23 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.4.2.2-1
- Initial Build
multilibfix.patch:
--- NEW FILE multilibfix.patch ---
diff -upNr hardinfo-0.4.2.2.orign/configure hardinfo-0.4.2.2/configure
--- hardinfo-0.4.2.2.orign/configure 2007-07-20 16:45:08.000000000 +0200
+++ hardinfo-0.4.2.2/configure 2007-07-23 11:44:14.000000000 +0200
@@ -187,7 +187,7 @@ echo "#define KERNEL \"`uname -r`\"" >
echo "#define HOSTNAME \"`hostname`\"" >> config.h
echo "#define PREFIX \"/usr/share/hardinfo/\"" >> config.h
-echo "#define LIBPREFIX \"/usr/lib/hardinfo/\"" >> config.h
+echo "#define LIBPREFIX \"$LIBDIR/hardinfo/\"" >> config.h
if [ "$SOUP" == "1" ]; then
echo "#define HAS_LIBSOUP" >> config.h
@@ -200,7 +200,7 @@ else
echo ' __FILE__, __LINE__, __FUNCTION__, ##__VA_ARGS__)' >> config.h
fi
-echo "#define ENABLE_BINRELOC 1" >> config.h
+echo "#define ENABLE_BINRELOC 0" >> config.h
echo "#define RELEASE $RELEASE" >> config.h
echo -e "\n#endif /* __CONFIG_H__ */" >> config.h
diff -upNr hardinfo-0.4.2.2.orign/Makefile.in hardinfo-0.4.2.2/Makefile.in
--- hardinfo-0.4.2.2.orign/Makefile.in 2007-07-20 16:59:04.000000000 +0200
+++ hardinfo-0.4.2.2/Makefile.in 2007-07-23 11:10:27.000000000 +0200
@@ -2,7 +2,7 @@
CC = gcc $(ARCHOPTS)
CCSLOW = gcc -O0
CFLAGS = -fPIC -pipe -Wall $(GTK_CFLAGS) $(GLADE_CFLAGS) $(SOUP_CFLAGS) -I.
-
+LIBDIR =
# ----------------------------------------------------------------------------
OBJECTS = hardinfo.o shell.o util.o iconcache.o loadgraph.o sha1.o md5.o \
@@ -61,7 +61,7 @@ install: all
mkdir -p ${DESTDIR}/usr/bin
mkdir -p ${DESTDIR}/usr/local
mkdir -p ${DESTDIR}/usr/share/applications
- mkdir -p ${DESTDIR}/usr/lib/hardinfo/modules
+ mkdir -p ${DESTDIR}${LIBDIR}/hardinfo/modules
mkdir -p ${DESTDIR}/usr/share/hardinfo/pixmaps
@echo '[01;34m*** Installing icon...[00m'
@@ -71,7 +71,7 @@ install: all
cp hardinfo ${DESTDIR}/usr/bin/hardinfo
@echo '[01;34m*** Installing modules...[00m'
- cp -Lr modules/*.so ${DESTDIR}/usr/lib/hardinfo/modules
+ cp -Lr modules/*.so ${DESTDIR}${LIBDIR}/hardinfo/modules
@echo '[01;34m*** Installing pixmaps...[00m'
cp -Lr pixmaps/* ${DESTDIR}/usr/share/hardinfo/pixmaps
diff -upNr hardinfo-0.4.2.2.orign/util.c hardinfo-0.4.2.2/util.c
--- hardinfo-0.4.2.2.orign/util.c 2007-07-20 16:45:08.000000000 +0200
+++ hardinfo-0.4.2.2/util.c 2007-07-23 11:53:00.000000000 +0200
@@ -244,10 +244,8 @@ gboolean binreloc_init(gboolean try_hard
tmp = gbr_find_data_dir(PREFIX);
params.path_data = g_build_filename(tmp, "hardinfo", NULL);
g_free(tmp);
-
- tmp = gbr_find_lib_dir(PREFIX);
- params.path_lib = g_build_filename(tmp, "hardinfo", NULL);
- g_free(tmp);
+
+ params.path_lib = g_build_filename(LIBPREFIX, "", NULL);
}
DEBUG("searching for runtime data on these locations:");
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hardinfo/FC-6/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 23 Jul 2007 15:50:00 -0000 1.1
+++ .cvsignore 24 Jul 2007 05:43:08 -0000 1.2
@@ -0,0 +1 @@
+hardinfo-0.4.2.2.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hardinfo/FC-6/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 23 Jul 2007 15:50:00 -0000 1.1
+++ sources 24 Jul 2007 05:43:08 -0000 1.2
@@ -0,0 +1 @@
+d8fcc2317bbd3c3e024a711976b89334 hardinfo-0.4.2.2.tar.bz2
More information about the scm-commits
mailing list