From 80de6c67662a65f12daa4f7d65d1c707215974cd Mon Sep 17 00:00:00 2001
From: Manvendra Bhangui <mbhangui@gmail.com>
Date: Fri, 31 May 2024 10:48:55 +0530
Subject: [PATCH] use $HOME/rpmbuild for RPM base directory

---
 indimail-access/indimail-access.spec.in | 12 ++++++------
 indimail-auth/indimail-auth.spec.in     | 12 ++++++------
 indimail-utils/indimail-utils.spec.in   | 12 ++++++------
 logalert-x/doc/ChangeLog                |  2 ++
 logalert-x/logalert.spec.in             |  4 ++--
 logalert-x/logclient.c                  |  5 ++++-
 6 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/indimail-access/indimail-access.spec.in b/indimail-access/indimail-access.spec.in
index 4e821d207..86dea01c6 100644
--- a/indimail-access/indimail-access.spec.in
+++ b/indimail-access/indimail-access.spec.in
@@ -154,12 +154,12 @@ do
   if [ -d $i ] ; then
     %{__rm} -rf $i
   fi
-  if [ -f ../../SOURCES/$i.tar.bz2 ] ; then
-    %{__bzip2} -d -c ../../SOURCES/$i.tar.bz2 | tar xf -
-  elif [ -f ../../SOURCES/$i.tar.xz ] ; then
-    xz -d -c ../../SOURCES/$i.tar.xz |tar xf -
-  elif [ -f ../../SOURCES/$i.tar.gz ] ; then
-    gunzip -c ../../SOURCES/$i.tar.gz | tar xf -
+  if [ -f $HOME/rpmbuild/SOURCES/$i.tar.bz2 ] ; then
+    %{__bzip2} -d -c $HOME/rpmbuild/SOURCES/$i.tar.bz2 | tar xf -
+  elif [ -f $HOME/rpmbuild/SOURCES/$i.tar.xz ] ; then
+    xz -d -c $HOME/rpmbuild/SOURCES/$i.tar.xz |tar xf -
+  elif [ -f $HOME/rpmbuild/SOURCES/$i.tar.gz ] ; then
+    gunzip -c $HOME/rpmbuild/SOURCES/$i.tar.gz | tar xf -
   else
     echo "No Source Archive for $i"
     exit 1
diff --git a/indimail-auth/indimail-auth.spec.in b/indimail-auth/indimail-auth.spec.in
index d85bd5726..57e2db212 100644
--- a/indimail-auth/indimail-auth.spec.in
+++ b/indimail-auth/indimail-auth.spec.in
@@ -120,12 +120,12 @@ do
   if [ -d $i ] ; then
     %{__rm} -rf $i
   fi
-  if [ -f ../../SOURCES/$i.tar.bz2 ] ; then
-    %{__bzip2} -d -c ../../SOURCES/$i.tar.bz2 | tar xf -
-  elif [ -f ../../SOURCES/$i.tar.xz ] ; then
-    xz -d -c ../../SOURCES/$i.tar.xz |tar xf -
-  elif [ -f ../../SOURCES/$i.tar.gz ] ; then
-    gunzip -c ../../SOURCES/$i.tar.gz | tar xf -
+  if [ -f $HOME/rpmbuild/SOURCES/$i.tar.bz2 ] ; then
+    %{__bzip2} -d -c $HOME/rpmbuild/SOURCES/$i.tar.bz2 | tar xf -
+  elif [ -f $HOME/rpmbuild/SOURCES/$i.tar.xz ] ; then
+    xz -d -c $HOME/rpmbuild/SOURCES/$i.tar.xz |tar xf -
+  elif [ -f $HOME/rpmbuild/SOURCES/$i.tar.gz ] ; then
+    gunzip -c $HOME/rpmbuild/SOURCES/$i.tar.gz | tar xf -
   else
     echo "No Source Archive for $i"
     exit 1
diff --git a/indimail-utils/indimail-utils.spec.in b/indimail-utils/indimail-utils.spec.in
index 1d04d45ca..bae5d45c4 100644
--- a/indimail-utils/indimail-utils.spec.in
+++ b/indimail-utils/indimail-utils.spec.in
@@ -108,12 +108,12 @@ do
   if [ -d $i ] ; then
     %{__rm} -rf $i
   fi
-  if [ -f ../../SOURCES/$i.tar.bz2 ] ; then
-    %{__bzip2} -d -c ../../SOURCES/$i.tar.bz2 | tar xf -
-  elif [ -f ../../SOURCES/$i.tar.xz ] ; then
-    xz -d -c ../../SOURCES/$i.tar.xz |tar xf -
-  elif [ -f ../../SOURCES/$i.tar.gz ] ; then
-    gunzip -c ../../SOURCES/$i.tar.gz | tar xf -
+  if [ -f $HOME/rpmbuild/SOURCES/$i.tar.bz2 ] ; then
+    %{__bzip2} -d -c $HOME/rpmbuild/SOURCES/$i.tar.bz2 | tar xf -
+  elif [ -f $HOME/rpmbuild/SOURCES/$i.tar.xz ] ; then
+    xz -d -c $HOME/rpmbuild/SOURCES/$i.tar.xz |tar xf -
+  elif [ -f $HOME/rpmbuild/SOURCES/$i.tar.gz ] ; then
+    gunzip -c $HOME/rpmbuild/SOURCES/$i.tar.gz | tar xf -
   else
     echo "No Source Archive for $i"
     exit 1
diff --git a/logalert-x/doc/ChangeLog b/logalert-x/doc/ChangeLog
index 5ac241bf7..461e48b43 100644
--- a/logalert-x/doc/ChangeLog
+++ b/logalert-x/doc/ChangeLog
@@ -15,6 +15,8 @@ Release 0.4.0-1.1 Start 13/04/2023 End 15/10/2023
 6. logclient.c: fixed compilation warnings
 - 10/05/2024
 7. parser.y: added missing prototype for yylex()
+- 31/05/2024
+8. logalert.spec: added libtirpc-devel for mageia
 
 * Thu 08 Sep 2022 14:38:16 +0000 Manvendra Bhangui <logalert@indimail.org> 0.3.0-1.1%{?dist}
 Release 0.3.0-1.1 Start 25/02/2010
diff --git a/logalert-x/logalert.spec.in b/logalert-x/logalert.spec.in
index 0fcd72ba1..ef3648d41 100644
--- a/logalert-x/logalert.spec.in
+++ b/logalert-x/logalert.spec.in
@@ -49,13 +49,13 @@ BuildRequires: gcc gcc-c++ make autoconf automake
 %if %{defined suse_version} || %{defined sles_version}
 BuildRequires: bison
 %endif
-%if 0%{?fedora_version} > 27 || 0%{?centos_version} > 700 || 0%{?rhel_version} > 700 || 0%{?almalinux_version} > 700 || 0%{?rocky_version} > 700 || 0%{?fedora} > 30 || 0%{?rhel} > 7 || %{defined amzn} || %{defined mgaversion} || %{defined openEuler}
+%if 0%{?fedora_version} > 27 || 0%{?centos_version} > 700 || 0%{?rhel_version} > 700 || 0%{?almalinux_version} > 700 || 0%{?rocky_version} > 700 || 0%{?fedora} > 30 || 0%{?rhel} > 7 || %{defined amzn} || %{defined mgaversion} || %{defined openEuler} || 0%{?mageia}
 BuildRequires: libtirpc libtirpc-devel
 %endif
 %if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150300
 BuildRequires: libtirpc3 libtirpc-devel
 %endif
-BuildRequires: pcre2-devel libqmail-devel
+BuildRequires: pcre-devel libqmail-devel
 BuildRequires: flex coreutils bison
 Requires: coreutils grep /bin/sh glibc
 
diff --git a/logalert-x/logclient.c b/logalert-x/logclient.c
index 5e6306929..971b6fed6 100644
--- a/logalert-x/logclient.c
+++ b/logalert-x/logclient.c
@@ -53,7 +53,7 @@
 #define FATAL   "logclient: fatal: " 
 
 #ifndef	lint
-static char     sccsid[] = "$Id: logclient.c,v 1.15 2023-10-15 18:10:43+05:30 Cprogrammer Exp mbhangui $";
+static char     sccsid[] = "$Id: logclient.c,v 1.16 2024-05-31 09:01:34+05:30 Cprogrammer Exp mbhangui $";
 #endif
 
 
@@ -550,6 +550,9 @@ getversion_logclient_c()
 
 /*
  * $Log: logclient.c,v $
+ * Revision 1.16  2024-05-31 09:01:34+05:30  Cprogrammer
+ * replaced perror with strerr_die2sys
+ *
  * Revision 1.15  2023-10-15 18:10:43+05:30  Cprogrammer
  * ensure qmail/tls.h gets included
  *