diff --git a/.gitignore b/.gitignore index 27ee39d..7aff405 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ i2c-tools-3.0.2.tar.bz2 /i2c-tools-3.0.3.tar.bz2 /i2c-tools-3.1.0.tar.bz2 +/i2c-tools-3.1.2.tar.xz diff --git a/i2c-tools-3.1-man-decodeX.patch b/i2c-tools-3.1-man-decodeX.patch deleted file mode 100644 index 46db970..0000000 --- a/i2c-tools-3.1-man-decodeX.patch +++ /dev/null @@ -1,157 +0,0 @@ -diff -Naur i2c-tools-3.1.0.orig/eeprom/decode-dimms.1 i2c-tools-3.1.0/eeprom/decode-dimms.1 ---- i2c-tools-3.1.0.orig/eeprom/decode-dimms.1 1970-01-01 01:00:00.000000000 +0100 -+++ i2c-tools-3.1.0/eeprom/decode-dimms.1 2013-10-03 18:01:35.396288464 +0200 -@@ -0,0 +1,77 @@ -+.\" -+.\" decode-dimms.1 - manpage for the i2c-tools/decode-dimms utility -+.\" Copyright (C) 2013 Jaromir Capik -+.\" -+.\" This program is free software; you can redistribute it and/or modify -+.\" it under the terms of the GNU General Public License as published by -+.\" the Free Software Foundation; either version 2 of the License, or -+.\" (at your option) any later version. -+.\" -+.\" This program is distributed in the hope that it will be useful, -+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of -+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+.\" GNU General Public License for more details. -+.\" -+.\" You should have received a copy of the GNU General Public License along -+.\" with this program; if not, write to the Free Software Foundation, Inc., -+.\" 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -+.\" -+.TH decode-dimms 1 "Oct 2013" "i2c-tools" "User Commands" -+.SH NAME -+decode-dimms \- Decode the information found in memory module SPD EEPROMs. -+.SH SYNOPSIS -+.B decode-dimms -+[-c] [-f [-b]] [-x|-X file [files..]] -+.br -+.B decode-dimms -+-h -+.SH DESCRIPTION -+ -+The purpose of the -+.B decode-dimms -+tool is to decode the information found in memory module SPD EEPROMs. -+The SPD data is read either from the running system or dump files. -+The tool requires the eeprom kernel module to be loaded. -+.SH PARAMETERS -+.TP -+.B \-f, --format -+Print nice html output -+.TP -+.B \-b, --bodyonly -+Don't print html header (useful for postprocessing the output) -+.TP -+.B \--side-by-side -+Display all DIMMs side-by-side if possible -+.TP -+.B \--merge-cells -+Merge neighbour cells with identical values (side-by-side output only) -+.TP -+.B \-c, --checksum -+Decode completely even if checksum fails -+.TP -+.B \-x -+Read data from hexdump files -+.TP -+.B \-X -+Same as -x except treat multibyte hex data as little endian -+.TP -+.B \-h, --help -+Display this usage summary -+.SH SEE ALSO -+.BR decode-vaio (1) -+.SH AUTHORS -+.UR phil@netroedge.com -+Philip Edelbrock -+.UE -+.br -+.UR zany@triq.net -+Christian Zuckschwerdt -+.UE -+.br -+.UR burkart@bollchen.de -+Burkart Lingner -+.UE -+.br -+.UR khali@linux-fr.org -+Jean Delvare -+.UE -diff -Naur i2c-tools-3.1.0.orig/eeprom/decode-vaio.1 i2c-tools-3.1.0/eeprom/decode-vaio.1 ---- i2c-tools-3.1.0.orig/eeprom/decode-vaio.1 1970-01-01 01:00:00.000000000 +0100 -+++ i2c-tools-3.1.0/eeprom/decode-vaio.1 2013-10-03 18:02:49.348720736 +0200 -@@ -0,0 +1,37 @@ -+.\" -+.\" decode-vaio.1 - manpage for the i2c-tools/decode-vaio utility -+.\" Copyright (C) 2013 Jaromir Capik -+.\" -+.\" This program is free software; you can redistribute it and/or modify -+.\" it under the terms of the GNU General Public License as published by -+.\" the Free Software Foundation; either version 2 of the License, or -+.\" (at your option) any later version. -+.\" -+.\" This program is distributed in the hope that it will be useful, -+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of -+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+.\" GNU General Public License for more details. -+.\" -+.\" You should have received a copy of the GNU General Public License along -+.\" with this program; if not, write to the Free Software Foundation, Inc., -+.\" 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -+.\" -+.TH decode-vaio 1 "Oct 2013" "i2c-tools" "User Commands" -+.SH NAME -+decode-vaio \- Decode the information found in the Sony Vaio laptop -+identification EEPROMs. -+.SH SYNOPSIS -+.B decode-vaio -+.SH DESCRIPTION -+ -+The purpose of the -+.B decode-vaio -+tool is to decode the information found in the Sony Vaio laptop -+identification EEPROMs. -+The tool requires the eeprom kernel module to be loaded. -+.SH SEE ALSO -+.BR decode-dimms (1) -+.SH AUTHOR -+.UR khali@linux-fr.org -+Jean Delvare -+.UE -diff -Naur i2c-tools-3.1.0.orig/eeprom/Module.mk i2c-tools-3.1.0/eeprom/Module.mk ---- i2c-tools-3.1.0.orig/eeprom/Module.mk 2009-01-13 18:32:03.000000000 +0100 -+++ i2c-tools-3.1.0/eeprom/Module.mk 2013-10-04 11:58:45.000000000 +0200 -@@ -7,9 +7,10 @@ - # the Free Software Foundation; either version 2 of the License, or - # (at your option) any later version. - --EEPROM_DIR := eeprom -+EEPROM_DIR := eeprom - --EEPROM_TARGETS := decode-dimms decode-vaio ddcmon decode-edid -+EEPROM_TARGETS := decode-dimms decode-vaio ddcmon decode-edid -+EEPROM_MAN_TARGETS := decode-dimms.1 decode-vaio.1 - - # - # Commands -@@ -24,6 +25,16 @@ - for program in $(EEPROM_TARGETS) ; do \ - $(RM) $(DESTDIR)$(bindir)/$$program ; done - --install: install-eeprom -+install-eeprom-man: $(addprefix $(EEPROM_DIR)/,$(EEPROM_MAN_TARGETS)) -+ $(INSTALL_DIR) $(DESTDIR)$(mandir)/man1 -+ for manual in $(EEPROM_MAN_TARGETS) ; do \ -+ $(INSTALL_DATA) $(EEPROM_DIR)/$$manual $(DESTDIR)$(mandir)/man1 ; done - --uninstall: uninstall-eeprom -+uninstall-eeprom-man: -+ for manual in $(EEPROM_MAN_TARGETS) ; do \ -+ $(RM) $(DESTDIR)$(mandir)/$$manual ; done -+ -+ -+install: install-eeprom install-eeprom-man -+ -+uninstall: uninstall-eeprom uninstall-eeprom-man diff --git a/i2c-tools-3.1-man-eeproX.patch b/i2c-tools-3.1-man-eeproX.patch deleted file mode 100644 index 93730cd..0000000 --- a/i2c-tools-3.1-man-eeproX.patch +++ /dev/null @@ -1,261 +0,0 @@ -diff -Naur i2c-tools-3.1.0.orig/eepromer/eeprog.8 i2c-tools-3.1.0/eepromer/eeprog.8 ---- i2c-tools-3.1.0.orig/eepromer/eeprog.8 1970-01-01 01:00:00.000000000 +0100 -+++ i2c-tools-3.1.0/eepromer/eeprog.8 2013-07-03 17:10:46.193787836 +0200 -@@ -0,0 +1,105 @@ -+.\" -+.\" eeprog.8 - manpage for the i2c-tools/eeprog utility -+.\" Copyright (C) 2013 Jaromir Capik -+.\" -+.\" This program is free software; you can redistribute it and/or modify -+.\" it under the terms of the GNU General Public License as published by -+.\" the Free Software Foundation; either version 2 of the License, or -+.\" (at your option) any later version. -+.\" -+.\" This program is distributed in the hope that it will be useful, -+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of -+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+.\" GNU General Public License for more details. -+.\" -+.\" You should have received a copy of the GNU General Public License along -+.\" with this program; if not, write to the Free Software Foundation, Inc., -+.\" 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -+.\" -+.TH eeprog "8" "Jul 2013" "i2c-tools" "System Administration" -+.SH NAME -+eeprog \- reads and writes 24Cxx EEPROMs connected to I2C serial bus. -+.SH SYNOPSIS -+.B eeprog -+[-fqxdh] [-16|-8] [-r addr[:count]|-w addr] -+.SH DESCRIPTION -+.B eeprog -+uses the SMBus protocol used by most of the recent chipsets. -+.SH NOTE -+Don't forget to load your i2c chipset and the i2c-dev drivers. -+.P -+The following environment variables could be set instead of the command line arguments: -+.P -+ EEPROG_DEV device -+.br -+ EEPROG_I2C_ADDR i2c-addr -+.SH PARAMETERS -+.I Address modes -+.TP -+.B \-8 -+Use 8bit address mode for 24c0x...24C16 [default] -+.TP -+.B \-16 -+Use 16bit address mode for 24c32...24C256 -+.TP -+.I Actions -+.TP -+.B \-r addr[:count] -+Read -+.B count -+(1 if omitted) bytes from -+.B addr -+and print them to the standard output -+.TP -+.B \-w addr -+Write input (stdin) at address -+.B addr -+of the EEPROM -+.TP -+.B \-h -+Print this help -+.TP -+.I Options -+.TP -+.B \-x -+Set hex output mode -+.TP -+.B \-d -+Dummy mode, display what *would* have been done -+.TP -+.B \-f -+Disable warnings and don't ask confirmation -+.TP -+.B \-q -+Quiet mode -+.TP -+.I Bus -+.TP -+.B device -+Device file representing the I2C bus (eg. /dev/i2c-0) -+.TP -+.B i2c-addr -+I2C bus address of the EEPROM (eg. 0x3A) -+.SH EXAMPLES -+Read 64 bytes from the EEPROM at address 0x54 on bus 0 starting at address 123 (decimal) -+.P -+.B eeprog -+/dev/i2c-0 0x54 -r 123:64 -+.P -+Print the hex codes of the first 32 bytes read from bus 1 at address 0x22 -+.P -+.B eeprog -+/dev/i2c-1 0x51 -x -r 0x22:0x20 -+.P -+Write the current timestamp at address 0x200 of the EEPROM on bus 0 at address 0x33 -+.P -+ date | -+.B eeprog -+/dev/i2c-0 0x33 -w 0x200 -+.SH SEE ALSO -+.BR eeprom (8) -+.BR eepromer (8) -+.SH AUTHOR -+.UR stefano@codesink.org -+Stefano Barbato -+.UE -diff -Naur i2c-tools-3.1.0.orig/eepromer/eepromer.8 i2c-tools-3.1.0/eepromer/eepromer.8 ---- i2c-tools-3.1.0.orig/eepromer/eepromer.8 1970-01-01 01:00:00.000000000 +0100 -+++ i2c-tools-3.1.0/eepromer/eepromer.8 2013-07-03 17:25:35.067487324 +0200 -@@ -0,0 +1,63 @@ -+.\" -+.\" eeprom.8 - manpage for the i2c-tools/eeprom utility -+.\" Copyright (C) 2013 Jaromir Capik -+.\" -+.\" This program is free software; you can redistribute it and/or modify -+.\" it under the terms of the GNU General Public License as published by -+.\" the Free Software Foundation; either version 2 of the License, or -+.\" (at your option) any later version. -+.\" -+.\" This program is distributed in the hope that it will be useful, -+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of -+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+.\" GNU General Public License for more details. -+.\" -+.\" You should have received a copy of the GNU General Public License along -+.\" with this program; if not, write to the Free Software Foundation, Inc., -+.\" 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -+.\" -+.TH eepromer "8" "Jul 2013" "i2c-tools" "System Administration" -+.SH NAME -+eepromer \- reads and writes 24Cxx EEPROMs connected to I2C serial bus. -+.SH SYNOPSIS -+.B eepromer -+[-r|-w|-e|-p] -f -+.SH DESCRIPTION -+The EEPROM must be a large EEPROM which uses a 2-byte address -+field (24C32 or larger). It will NOT WORK on small EEPROMs -+(24C01 - 24C16) such as those used on SDRAM DIMMs. -+.SH NOTE -+Don't forget to load your i2c chipset and the i2c-dev drivers. -+.P -+Tested only on 24C256. -+.P -+.SH PARAMETERS -+.TP -+.I Actions -+.TP -+.B \-r -+Read -+.TP -+.B \-w -+Write -+.TP -+.B \-e -+Erase -+.TP -+.B \-p -+Print header -+.TP -+.I Bus -+.TP -+.B \-f device -+Device file representing the I2C bus (eg. /dev/i2c-0) -+.TP -+.B i2c-addr -+I2C bus address of the EEPROM (eg. 0x3A) -+.SH SEE ALSO -+.BR eeprog (8) -+.BR eeprom (8) -+.SH AUTHOR -+.UR marvin@sitour.cz -+Daniel Smolik -+.UE -diff -Naur i2c-tools-3.1.0.orig/eepromer/eeprom.8 i2c-tools-3.1.0/eepromer/eeprom.8 ---- i2c-tools-3.1.0.orig/eepromer/eeprom.8 1970-01-01 01:00:00.000000000 +0100 -+++ i2c-tools-3.1.0/eepromer/eeprom.8 2013-07-03 17:14:22.852383941 +0200 -@@ -0,0 +1,64 @@ -+.\" -+.\" eeprom.8 - manpage for the i2c-tools/eeprom utility -+.\" Copyright (C) 2013 Jaromir Capik -+.\" -+.\" This program is free software; you can redistribute it and/or modify -+.\" it under the terms of the GNU General Public License as published by -+.\" the Free Software Foundation; either version 2 of the License, or -+.\" (at your option) any later version. -+.\" -+.\" This program is distributed in the hope that it will be useful, -+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of -+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+.\" GNU General Public License for more details. -+.\" -+.\" You should have received a copy of the GNU General Public License along -+.\" with this program; if not, write to the Free Software Foundation, Inc., -+.\" 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -+.\" -+.TH eeprom "8" "Jul 2013" "i2c-tools" "System Administration" -+.SH NAME -+eeprom \- reads and writes 24Cxx EEPROMs connected to I2C serial bus. -+.SH SYNOPSIS -+.B eeprom -+[-d dev] [-a adr] [-p pgs] [-w] [-y] [-f file] -+.SH DESCRIPTION -+.B eeprom -+can be used for reading from / writing to i2c-eeproms like the popular -+24C16, 24C08, 24C04, etc. -+In contrast to eeprommer which supports 24C256-type eeproms (24C16s) -+this tool works with 1-byte addresses! -+.SH NOTE -+Don't forget to load your i2c chipset and the i2c-dev drivers. -+.P -+Pages/addresses: -+ eeproms with more than 256 bytes appear as if they -+ were several eeproms with consecutive addresses on the bus -+ so we might as well address several separate eeproms with -+ increasing addresses -+.SH PARAMETERS -+.TP -+.B dev -+device, e.g. /dev/i2c-0 (def) -+.TP -+.B adr -+base address of eeprom, eg 0xA0 (def) -+.TP -+.B pgs -+number of pages to read, eg 8 (def) -+.TP -+.B \-w -+write to eeprom (default is reading!) -+.TP -+.B \-y -+suppress warning when writing (default is to warn!) -+.TP -+.B \-f file -+copy eeprom contents to/from file (default for read is test only; for write is all zeros) -+.SH SEE ALSO -+.BR eeprog (8) -+.BR eepromer (8) -+.SH AUTHOR -+.UR chris@hedonism.cx -+Christian Vogel -+.UE -diff -Naur i2c-tools-3.1.0.orig/tools/i2cset.c i2c-tools-3.1.0/tools/i2cset.c ---- i2c-tools-3.1.0.orig/tools/i2cset.c 2011-02-15 17:12:27.000000000 +0100 -+++ i2c-tools-3.1.0/tools/i2cset.c 2013-06-19 12:45:55.852490195 +0200 -@@ -35,7 +35,12 @@ - static void help(void) - { - fprintf(stderr, -- "Usage: i2cset [-f] [-y] [-m MASK] I2CBUS CHIP-ADDRESS DATA-ADDRESS [VALUE] ... [MODE]\n" -+ "Usage: i2cset [OPTIONS] I2CBUS CHIP-ADDRESS DATA-ADDRESS [VALUE] ... [MODE]\n" -+ " OPTIONS are\n" -+ " -f (force access when busy)\n" -+ " -y (disable interactive mode)\n" -+ " -m MASK (value write mask - bits set to 0 are preserved if possible)\n" -+ " -r (write verification by reading back)\n" - " I2CBUS is an integer or an I2C bus name\n" - " ADDRESS is an integer (0x03 - 0x77)\n" - " MODE is one of:\n" diff --git a/i2c-tools.spec b/i2c-tools.spec index 4127099..9e711bb 100644 --- a/i2c-tools.spec +++ b/i2c-tools.spec @@ -5,19 +5,13 @@ # package are under the same license as the package itself. Name: i2c-tools -Version: 3.1.0 -Release: 18%{?dist} +Version: 3.1.2 +Release: 1%{?dist} Summary: A heterogeneous set of I2C tools for Linux Group: Applications/System License: GPLv2+ -URL: http://www.lm-sensors.org/wiki/I2CTools -Source0: http://dl.lm-sensors.org/i2c-tools/releases/%{name}-%{version}.tar.bz2 - -# Introducing man pages for binaries in the eepromer subpackage -# Introducing -r switch in the i2cset help -Patch0: i2c-tools-3.1-man-eeproX.patch -# Introducing man pages for decode-* binaries -Patch1: i2c-tools-3.1-man-decodeX.patch +URL: https://i2c.wiki.kernel.org/index.php/I2C_Tools +Source0: https://www.kernel.org/pub/software/utils/i2c-tools/%{name}-%{version}.tar.xz # for /etc/udev/makedev.d resp /etc/modprobe.d ownership Requires: udev module-init-tools @@ -58,9 +52,6 @@ Group: Applications/System %prep %setup -q -%patch0 -p1 -%patch1 -p1 - %build make CFLAGS="$RPM_OPT_FLAGS" pushd eepromer @@ -141,6 +132,11 @@ exit 0 %changelog +* Wed Jul 19 2017 Ondřej Lysoněk - 3.1.2-1 +- New version +- Updated upstream and source code URL +- Dropped patches accepted by upstream + * Fri Feb 10 2017 Fedora Release Engineering - 3.1.0-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index 273f19f..7c33d30 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f15019e559e378c6e9d5d6299a00df21 i2c-tools-3.1.0.tar.bz2 +SHA512 (i2c-tools-3.1.2.tar.xz) = 65388e9cf4c7f6b1133dfe961aaf7653866d6292325bc3604d8879f319eebac9c8b1e285eb33e59e1371dd32db09b656a77b2d5e60257fe4a89c35c3aa201254