Commit cd93c236378861e2c470ac85d5c2f0881ee089a3

Authored by Stéphane Raimbault
1 parent a017c19f

Fix #224496 reported by Todd Denniston.

It is easier to install on rpm based systems with a spec file.

I don't want to update the file to each beta until the 2.0 release so
I already use the 2.0 name in the spec file.
Showing 2 changed files with 89 additions and 2 deletions
1 -libmodbus 1.9.x 1 +libmodbus 2.0.0 (to be released)
  2 +================================
2 - Slave API 3 - Slave API
3 https://blueprints.launchpad.net/libmodbus/+spec/slave-api 4 https://blueprints.launchpad.net/libmodbus/+spec/slave-api
4 - Waf build support 5 - Waf build support
@@ -14,8 +15,8 @@ libmodbus 1.9.x @@ -14,8 +15,8 @@ libmodbus 1.9.x
14 - Better error management 15 - Better error management
15 - Declare more functions with the static keyword 16 - Declare more functions with the static keyword
16 - Enhance an integer division 17 - Enhance an integer division
  18 +- The GNU licences are in version 3
17 - Many cleanups 19 - Many cleanups
18 -  
19 - Fix #159443 reported by Stefan Bisanz 20 - Fix #159443 reported by Stefan Bisanz
20 Index of incoming data in force multiple coils function 21 Index of incoming data in force multiple coils function
21 - Fix #161989 reported by Konstantinos Togias 22 - Fix #161989 reported by Konstantinos Togias
@@ -29,18 +30,23 @@ libmodbus 1.9.x @@ -29,18 +30,23 @@ libmodbus 1.9.x
29 With TCP, automatic reconnect on error may not be desired. 30 With TCP, automatic reconnect on error may not be desired.
30 - Fix #224485 reported by Todd Denniston 31 - Fix #224485 reported by Todd Denniston
31 libmodbus does not link with c++ code. 32 libmodbus does not link with c++ code.
  33 +- Fix #224496 reported by Todd Denniston
  34 + It is easier to install on rpm based systems with a spec file.
32 35
33 libmodbus 1.2.4 (2008-03-14) 36 libmodbus 1.2.4 (2008-03-14)
  37 +============================
34 - Fix #191039 reported by Todd Denniston 38 - Fix #191039 reported by Todd Denniston
35 modbus.h is not installed at prefix. 39 modbus.h is not installed at prefix.
36 40
37 libmodbus 1.2.3 (2008-02-03) 41 libmodbus 1.2.3 (2008-02-03)
  42 +============================
38 - Fix #188189 reported by Chris Hellyar 43 - Fix #188189 reported by Chris Hellyar
39 Compute_response_size() no entry for read_input_status() 44 Compute_response_size() no entry for read_input_status()
40 - Fix #181887 reported by Jesus Hernandez Tapia. 45 - Fix #181887 reported by Jesus Hernandez Tapia.
41 Slave address in build_request_packet_tcp() is hardcoded as 0xFF. 46 Slave address in build_request_packet_tcp() is hardcoded as 0xFF.
42 47
43 libmodbus 1.2.2 (2007-11-12) 48 libmodbus 1.2.2 (2007-11-12)
  49 +============================
44 - Fix #161989 reported by Konstantinos Togias 50 - Fix #161989 reported by Konstantinos Togias
45 Serial device paths more than 10 chars long (eg. /dev/ttyUSB0) don't 51 Serial device paths more than 10 chars long (eg. /dev/ttyUSB0) don't
46 fit to modbus_param_t -> device char[11] var. 52 fit to modbus_param_t -> device char[11] var.
@@ -48,6 +54,7 @@ libmodbus 1.2.2 (2007-11-12) @@ -48,6 +54,7 @@ libmodbus 1.2.2 (2007-11-12)
48 trunk for a real enhancement). 54 trunk for a real enhancement).
49 55
50 libmodbus 1.2.1 (2007-11-02) 56 libmodbus 1.2.1 (2007-11-02)
  57 +============================
51 - Fix #159443 reported by Stefan Bisanz 58 - Fix #159443 reported by Stefan Bisanz
52 Index of incoming data in force multiple coils function 59 Index of incoming data in force multiple coils function
53 - Deleted useless code in check_crc16() 60 - Deleted useless code in check_crc16()
@@ -55,5 +62,6 @@ libmodbus 1.2.1 (2007-11-02) @@ -55,5 +62,6 @@ libmodbus 1.2.1 (2007-11-02)
55 - Changed author's email to Stéphane Raimbault 62 - Changed author's email to Stéphane Raimbault
56 63
57 libmodbus 1.2.0 (2007-05-10) 64 libmodbus 1.2.0 (2007-05-10)
  65 +============================
58 - FIX Compilation GCC-4.0 66 - FIX Compilation GCC-4.0
59 - Project name in autogen.sh 67 - Project name in autogen.sh
libmodbus.spec 0 → 100644
  1 +Summary: A Modbus library in C, which supports RTU communication over a serial line or a TCP link.
  2 +Name: libmodbus
  3 +Version: 2.0.0
  4 +Release: 1
  5 +License: LGPL V3+
  6 +Packager: Some random Internet user
  7 +URL: https://launchpad.net/libmodbus/
  8 +Group: Applications/System
  9 +Provides: libmodbus=2.0.0
  10 +Requires: ,/bin/sh
  11 +
  12 +Source0: libmodbus-2.0.0.tar.bz2
  13 +
  14 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  15 +BuildRequires: autoconf, automake
  16 +
  17 +%description
  18 +A Modbus library for Linux (and OSX) wrote in C and which supports
  19 +RTU communication over a serial line or a TCP link. Clean and fast!
  20 +Supports controling an RTU and being an RTU.
  21 +
  22 +%prep
  23 +%setup -q
  24 +
  25 +autoreconf
  26 +
  27 +%build
  28 +%configure
  29 +
  30 +make
  31 +
  32 +
  33 +%install
  34 +rm -rf $RPM_BUILD_ROOT
  35 +mkdir -p -m755 $RPM_BUILD_ROOT/
  36 +make install DESTDIR=$RPM_BUILD_ROOT
  37 +mkdir -p -m755 $RPM_BUILD_ROOT/usr/share/libmodbus/
  38 +ls -lRh $RPM_BUILD_ROOT/
  39 +
  40 +
  41 +%clean
  42 +rm -rf $RPM_BUILD_ROOT
  43 +
  44 +
  45 +%files
  46 +%defattr(-,root,root)
  47 +%attr(0755,root,root) %dir %{_libdir}
  48 +%attr(0755,root,root) %dir %{_libdir}/pkgconfig
  49 +%attr(0755,root,root) %dir %{_includedir}
  50 +%attr(0755,root,root) %dir %{_includedir}/modbus/
  51 +%dir %{_libdir}/libmodbus.so.2
  52 +%dir %{_libdir}/libmodbus.so
  53 +%attr(0755,root,root) %{_libdir}/libmodbus.so.2.0.0
  54 +%attr(0755,root,root) %{_libdir}/libmodbus.la
  55 +%attr(0644,root,root) %{_libdir}/pkgconfig/modbus.pc
  56 +%attr(0644,root,root) %{_includedir}/modbus/modbus.h
  57 +%doc AUTHORS ChangeLog INSTALL NEWS COPYING* README
  58 +
  59 +
  60 +%changelog
  61 +* Fri May 2 2008 Stéphane Raimbault <stephane.raimbault@gmail.com> - 2.0.0-1
  62 +- integrate extern_for_cpp in upstream.
  63 +- update the license to version LGPL v3.
  64 +
  65 +* Tue Apr 30 2008 Todd Denniston <Todd.Denniston@ssa.crane.navy.mil> - 1.9.0-2
  66 +- get the license corrected in the spec file.
  67 +- add a URL for where to find libmodbus.
  68 +- tweak the summary and description.
  69 +
  70 +* Tue Apr 29 2008 Todd Denniston <Todd.Denniston@ssa.crane.navy.mil> - 1.9.0-1
  71 +- upgrade to latest upstream (pre-release)
  72 +- port extern_for_cpp patch to 1.9.0
  73 +
  74 +* Tue Apr 29 2008 Todd Denniston <Todd.Denniston@ssa.crane.navy.mil> - 1.2.4-2_tad
  75 +- add a patch to allow compiling with c++ code.
  76 +
  77 +* Mon Apr 28 2008 Todd Denniston <Todd.Denniston@ssa.crane.navy.mil> - 1.2.4-1_tad
  78 +- build spec file.
  79 +- include patch for controling error-treat.