use $HOME/rpmbuild for RPM base directory

indimail · May 31, 2024 · 80de6c6 · 80de6c6
1 parent fad6b94
commit 80de6c6
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 21 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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 <[email protected]> 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
@@ -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
@@ -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
  *