update to 1.20 [release 1.20-1mamba;Sat Aug 10 2019]

libts.spec

@@ -1,13 +1,13 @@
 Name:          libts
-Version:       1.0.0.git20110130
+Version:       1.20
-Release:       5mamba
+Release:       1mamba
 Summary:       An abstraction library for touchscreen panel events
 Group:         System/Libraries
 Vendor:        openmamba
 Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 URL:           http://tslib.berlios.de/
-Source:        http://download.berlios.de/tslib/tslib-%{version}.tar.bz2
+Source:        https://github.com/libts/tslib.git/%{version}/tslib-%{version}.tar.bz2
 Source1:       ts-calibrate-init
 Source2:       ts-calibrate.conf.sample
 Source3:       ts-calibrate.service
@@ -30,11 +30,22 @@ Requires:      %{name} = %{?epoch:%epoch:}%{version}-%{release}
 %description devel
 Tslib is an abstraction layer for touchscreen panel events, as well as a filter stack for the manipulation of those events. It was created by Russell King, of arm.linux.org.uk. Examples of implemented filters include jitter smoothing and the calibration transform.
 Tslib is generally used on embedded devices to provide a common user space interface to touchscreen functionality. It is supported by Kdrive (aka TinyX) and OPIE as well as being used on a number of commercial Linux devices including the Nokia 770.
-This package contains static libraries and header files need for development.
+This package contains static libraries and header files needed for development.
+
+%package tools
+Group:         System/Utilities
+Summary:       Tools for %{name}
+Requires:      %{name} = %{?epoch:%epoch:}%{version}-%{release}
+
+%description tools
+Tslib is an abstraction layer for touchscreen panel events, as well as a filter stack for the manipulation of those events. It was created by Russell King, of arm.linux.org.uk. Examples of implemented filters include jitter smoothing and the calibration transform.
+Tslib is generally used on embedded devices to provide a common user space interface to touchscreen functionality. It is supported by Kdrive (aka TinyX) and OPIE as well as being used on a number of commercial Linux devices including the Nokia 770.
+This package contains static tools for %{name}.
 
 %prep
 %setup -q -n tslib-%{version}
-%patch0 -p1
+#%patch0 -p1
+./autogen.sh
 
 %build
 #./autogen.sh
@@ -45,7 +56,7 @@ This package contains static libraries and header files need for development.
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 %makeinstall
 
-ln -s libts-1.0.so.0 %{buildroot}%{_libdir}/libts-1.0.so
+#ln -s libts-1.0.so.0 %{buildroot}%{_libdir}/libts-1.0.so
 
 #install -D -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/ts-calibrate
 install -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/ts-calibrate.conf.sample
@@ -54,34 +65,33 @@ install -D -m0644 %{SOURCE3} %{buildroot}/lib/systemd/system/ts-calibrate.servic
 %clean
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 
-%post
+%post -p /sbin/ldconfig
-if [ $1 -eq 1 ]; then
-# new install
-    chkconfig --add ts-calibrate
-fi
-/sbin/ldconfig
-exit 0
-
-%preun
-if [ $1 -eq 0 ]; then
-# erase
-    chkconfig --del ts-calibrate
-fi
-exit 0
-
 %postun -p /sbin/ldconfig
 
-%files
+%post tools
+%systemd_post ts-calibrate
+:
+
+%preun tools
+%systemd_preun ts-calibrate
+:
+
+%postun tools
+%systemd_postun ts-calibrate
+:
+
+%files tools
 %defattr(-,root,root)
 %{_sysconfdir}/ts.conf
 %{_sysconfdir}/ts-calibrate.conf.sample
-%{_bindir}/ts_calibrate
+%{_bindir}/ts_*
-%{_bindir}/ts_harvest
+%{_unitdir}/ts-calibrate.service
-%{_bindir}/ts_print
+%{_mandir}/man1/ts_*.1*
-%{_bindir}/ts_print_raw
+%{_mandir}/man5/ts.conf.5*
-%{_bindir}/ts_test
+
-/lib/systemd/system/ts-calibrate.service
+%files
-%{_libdir}/libts-1.0.so.*
+%defattr(-,root,root)
+%{_libdir}/libts.so.*
 %dir %{_libdir}/ts
 %{_libdir}/ts/*
 %doc AUTHORS COPYING
@@ -91,12 +101,15 @@ exit 0
 %{_includedir}/tslib.h
 %{_libdir}/libts.la
 %{_libdir}/libts.so
-%{_libdir}/libts-1.0.so
 %{_libdir}/pkgconfig/tslib.pc
-%{_libdir}/pkgconfig/tslib-*.pc
+%{_mandir}/man3/ts_*.3*
+%{_mandir}/man3/tslib_version.3*
 %doc ChangeLog README
 
 %changelog
+* Sat Aug 10 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 1.20-1mamba
+- update to 1.20
+
 * Fri Jun 27 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 1.0.0.git20110130-5mamba
 - remove sysv5 initscript and fix systemd service file
 

ts-calibrate.service

@@ -4,7 +4,7 @@ DefaultDependencies=no
 Before=graphical.target
 
 [Service]
-ConditionPathExists=/etc/ts-calibrate.conf !/etc/pointercal
+ConditionPathExist=/etc/ts-calibrate.conf !/etc/pointercal
 Type=oneshot
 RemainAfterExit=yes
 ExecStart=/usr/bin/ts_calibrate