diff --git a/rxtx-java.changes b/rxtx-java.changes index 2992002..8d0761c 100644 --- a/rxtx-java.changes +++ b/rxtx-java.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Mar 7 14:29:29 UTC 2024 - Frank Schütte + +- Added patch: + * rxtx-missing-sysmacros.patch + + RH#1645856 missing sysmacros include fixed + ------------------------------------------------------------------- Wed Feb 21 20:57:37 UTC 2024 - Fridrich Strba diff --git a/rxtx-java.spec b/rxtx-java.spec index 32f4146..ee603e6 100644 --- a/rxtx-java.spec +++ b/rxtx-java.spec @@ -39,6 +39,7 @@ Patch5: rxtx-java-38400.patch Patch6: rxtx-java-version.patch Patch7: rxtx-java-missing-javah.patch Patch8: rxtx-yield.patch +Patch9: rxtx-missing-sysmacros.patch BuildRequires: automake BuildRequires: java-devel >= 1.8 BuildRequires: libtool @@ -56,6 +57,7 @@ BuildRequires: javapackages-tools %if 0%{?mdkversion} Patch3: rxtx-java-formatstring.patch %endif +BuildRequires: fdupes %description RxTx is a Java library, using a native implementation (via JNI), providing serial @@ -95,6 +97,7 @@ the specification for Sun's Java Communications API. %patch -P 6 -p1 %patch -P 7 -p1 %patch -P 8 -p1 +%patch -P 9 -p1 %build export THREADS_FLAG=native @@ -131,6 +134,8 @@ fi # install javadoc install -dm 0755 %{buildroot}%{_javadocdir} cp -r javadoc %{buildroot}%{_javadocdir}/%{name}/ +# create hardlinks +%fdupes %{buildroot}%{_javadocdir}/%{name} %files %doc AUTHORS ChangeLog README RMISecurityManager.html INSTALL PORTING TODO @@ -138,7 +143,7 @@ cp -r javadoc %{buildroot}%{_javadocdir}/%{name}/ %files javadoc %dir %{_javadocdir} -%{_javadocdir} +%{_javadocdir}/%{name} %license COPYING %files -n librxtx%{libversion} diff --git a/rxtx-missing-sysmacros.patch b/rxtx-missing-sysmacros.patch new file mode 100644 index 0000000..772c0cd --- /dev/null +++ b/rxtx-missing-sysmacros.patch @@ -0,0 +1,11 @@ +diff -up rxtx-2.2pre2/src/SerialImp.c.orig rxtx-2.2pre2/src/SerialImp.c +--- rxtx-2.2pre2/src/SerialImp.c.orig 2024-03-07 15:23:09.969976021 +0100 ++++ rxtx-2.2pre2/src/SerialImp.c 2024-03-07 15:25:10.089430040 +0100 +@@ -148,6 +148,7 @@ + #endif /* LIBLOCKDEV */ + + extern int errno; ++#include + + #include "SerialImp.h" +