updated for mageia

indimail · May 22, 2023 · 952ad9b · 952ad9b
1 parent ff84b6f
commit 952ad9b
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 51 deletions.
diff --git a/.github/workflows/logalert-obs.yml b/.github/workflows/logalert-obs.yml
@@ -26,8 +26,6 @@ jobs:
       run: |
         sudo apt-get update; sudo apt-get install libpcre3-dev flex bison libmysqlclient-dev libncurses5-dev
         cd libqmail; ./default.configure; make; sudo make install-strip
-    - name: build_virtualdomains
-      run: cd indimail-x; ./default.configure; sudo make install-strip
     - name: prepare obs
       run: cd logalert-x; ./prepare_obs logalert
     - uses: actions/upload-artifact@v2

diff --git a/indimail-access/indimail-access.spec.in b/indimail-access/indimail-access.spec.in
@@ -263,7 +263,6 @@ install -m 644 %{S:5} %{buildroot}%{_sysconfdir}/permissions.d/%{name}-permissio
 %{__rm} -rf %{buildroot}%{_prefix}/include
 %{__rm} -rf %{buildroot}%{mandir}/man3
 # Compress the man pages
-find %{buildroot}%{mandir} -type f -exec gzip -q {} \;
 
 # Create these files so that %%ghost does not complain
 %{__mkdir_p} %{buildroot}%{sysconfdir}/tcp
@@ -409,41 +408,41 @@ done
 %docdir %{shareddir}/doc
 %docdir %{mandir}
 
-%attr(0644,root,root) %{mandir}/man1/fetchmailconf.1.gz
-%attr(0644,root,root) %{mandir}/man1/fetchmail.1.gz
-%attr(0644,root,root) %{mandir}/man1/reformail.1.gz
-%attr(0644,root,root) %{mandir}/man1/makedat.1.gz
-%attr(0644,root,root) %{mandir}/man1/maildrop.1.gz
-%attr(0644,root,root) %{mandir}/man1/mailbot.1.gz
-%attr(0644,root,root) %{mandir}/man1/couriertls.1.gz
-%attr(0644,root,root) %{mandir}/man1/couriertcpd.1.gz
-%attr(0644,root,root) %{mandir}/man1/maildirkw.1.gz
-%attr(0644,root,root) %{mandir}/man1/sharedindexsplit.1.gz
-%attr(0644,root,root) %{mandir}/man1/sharedindexinstall.1.gz
-%attr(0644,root,root) %{mandir}/man1/maildiracl.1.gz
-%attr(0644,root,root) %{mandir}/man1/maildirmake.1.gz
-%attr(0644,root,root) %{mandir}/man1/maildirwatch.1.gz
-%attr(0644,root,root) %{mandir}/man7/maildropgdbm.7.gz
-%attr(0644,root,root) %{mandir}/man7/maildropfilter.7.gz
-%attr(0644,root,root) %{mandir}/man7/maildropex.7.gz
-%attr(0644,root,root) %{mandir}/man7/authlib.7.gz
-%attr(0644,root,root) %{mandir}/man7/authshadow.7.gz
+%attr(0644,root,root) %{mandir}/man1/fetchmailconf.1.*
+%attr(0644,root,root) %{mandir}/man1/fetchmail.1.*
+%attr(0644,root,root) %{mandir}/man1/reformail.1.*
+%attr(0644,root,root) %{mandir}/man1/makedat.1.*
+%attr(0644,root,root) %{mandir}/man1/maildrop.1.*
+%attr(0644,root,root) %{mandir}/man1/mailbot.1.*
+%attr(0644,root,root) %{mandir}/man1/couriertls.1.*
+%attr(0644,root,root) %{mandir}/man1/couriertcpd.1.*
+%attr(0644,root,root) %{mandir}/man1/maildirkw.1.*
+%attr(0644,root,root) %{mandir}/man1/sharedindexsplit.1.*
+%attr(0644,root,root) %{mandir}/man1/sharedindexinstall.1.*
+%attr(0644,root,root) %{mandir}/man1/maildiracl.1.*
+%attr(0644,root,root) %{mandir}/man1/maildirmake.1.*
+%attr(0644,root,root) %{mandir}/man1/maildirwatch.1.*
+%attr(0644,root,root) %{mandir}/man7/maildropgdbm.7.*
+%attr(0644,root,root) %{mandir}/man7/maildropfilter.7.*
+%attr(0644,root,root) %{mandir}/man7/maildropex.7.*
+%attr(0644,root,root) %{mandir}/man7/authlib.7.*
+%attr(0644,root,root) %{mandir}/man7/authshadow.7.*
 %if 0
-%attr(0644,root,root) %{mandir}/man7/authpwd.7.gz
-%endif
-%attr(0644,root,root) %{mandir}/man7/authindi.7.gz
-%attr(0644,root,root) %{mandir}/man7/authpam.7.gz
-%attr(0644,root,root) %{mandir}/man7/maildirquota.7.gz
-%attr(0644,root,root) %{mandir}/man7/courier-unicode.7.gz
-%attr(0644,root,root) %{mandir}/man8/makeimapaccess.8.gz
-%attr(0644,root,root) %{mandir}/man8/pop3login.8.gz
-%attr(0644,root,root) %{mandir}/man8/imaplogin.8.gz
-%attr(0644,root,root) %{mandir}/man8/pop3d.8.gz
-%attr(0644,root,root) %{mandir}/man8/imapd.8.gz
-%attr(0644,root,root) %{mandir}/man8/mkpop3dcert.8.gz
-%attr(0644,root,root) %{mandir}/man8/mkimapdcert.8.gz
-%attr(0644,root,root) %{mandir}/man8/mkdhparams.8.gz
-%attr(0644,root,root) %{mandir}/man8/deliverquota.8.gz
+%attr(0644,root,root) %{mandir}/man7/authpwd.7.*
+%endif
+%attr(0644,root,root) %{mandir}/man7/authindi.7.*
+%attr(0644,root,root) %{mandir}/man7/authpam.7.*
+%attr(0644,root,root) %{mandir}/man7/maildirquota.7.*
+%attr(0644,root,root) %{mandir}/man7/courier-unicode.7.*
+%attr(0644,root,root) %{mandir}/man8/makeimapaccess.8.*
+%attr(0644,root,root) %{mandir}/man8/pop3login.8.*
+%attr(0644,root,root) %{mandir}/man8/imaplogin.8.*
+%attr(0644,root,root) %{mandir}/man8/pop3d.8.*
+%attr(0644,root,root) %{mandir}/man8/imapd.8.*
+%attr(0644,root,root) %{mandir}/man8/mkpop3dcert.8.*
+%attr(0644,root,root) %{mandir}/man8/mkimapdcert.8.*
+%attr(0644,root,root) %{mandir}/man8/mkdhparams.8.*
+%attr(0644,root,root) %{mandir}/man8/deliverquota.8.*
 
 %if %build_on_obs == 0
 %license %attr(644,root,root)           %{shareddir}/doc/courier-imap/COPYING

diff --git a/indimail-x/Makefile.am b/indimail-x/Makefile.am
@@ -21,7 +21,7 @@ tcplookupdir=@libdir@
 
 libindimail_LTLIBRARIES = libindimail.la
 libindimail_la_SOURCES = $(COMMONSOURCES)
-libindimail_la_LIBADD = @LIB_MYSQL@ @LIB_QMAIL@ @LIB_SSL@ @LIB_GSASL@ -lm
+libindimail_la_LIBADD = @LIB_MYSQL@ @LIB_QMAIL@ @LIB_SSL@ @LIB_GSASL@ -lm -ldl
 libindimail_la_LDFLAGS = -version-info @LIBVER@ $(LDFLAGS)
 libindimail_la_CFLAGS = -fPIC
 libindimaildir=@libdir@

diff --git a/indimail-x/indimail.spec.in b/indimail-x/indimail.spec.in
@@ -1,6 +1,6 @@
 #
 #
-# $Id: indimail.spec.in,v 1.132 2023-05-15 00:17:46+05:30 Cprogrammer Exp mbhangui $
+# $Id: indimail.spec.in,v 1.133 2023-05-22 20:58:23+05:30 Cprogrammer Exp mbhangui $
 %undefine _missing_build_ids_terminate_build
 %global _unpackaged_files_terminate_build 1
 
@@ -301,13 +301,16 @@ install -m 644 %{S:2} %{buildroot}%{_sysconfdir}/permissions.d/%{name}-permissio
 install -m 644 %{S:3} %{buildroot}%{_sysconfdir}/permissions.d/%{name}-permissions.secure
 %endif
 
-# Compress the man pages
-find %{buildroot}%{mandir} -type f -exec gzip -q {} \;
-if [ -f %{buildroot}%{mandir}/man7/authlib.7.gz ] ; then
+if [ -f %{buildroot}%{mandir}/man7/authlib.7.xz ] ; then
+  ext="xz"
+else
+  ext="gz"
+fi
+if [ -f %{buildroot}%{mandir}/man7/authlib.7."$ext" ] ; then
   for i in authshadow.7 authpwd.7 authpam.7 authcustom.7
   do
     %{__rm} -f %{buildroot}%{mandir}/man7/$i
-    echo ".so man7/authlib.7" |gzip -c > %{buildroot}%{mandir}/man7/$i.gz
+    echo ".so man7/authlib.7" |gzip -c > %{buildroot}%{mandir}/man7/$i."$ext"
   done
 fi
 

diff --git a/logalert-x/logalert.spec.in b/logalert-x/logalert.spec.in
@@ -49,7 +49,7 @@ 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
+%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 mgaversion}
 BuildRequires: libtirpc libtirpc-devel
 %endif
 %if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150300
@@ -99,7 +99,6 @@ echo "------------------------------------------------------"
 %endif
 install -m 0644 %{name}-rpm.info %{buildroot}%{sysconfdir}/%{name}-rpm.info
 /bin/rm -f %{name}-rpm.info
-find %{buildroot}%{mandir} -type f -exec gzip -q {} \;
 
 %files
 %defattr(-,root,root)
@@ -117,12 +116,12 @@ find %{buildroot}%{mandir} -type f -exec gzip -q {} \;
 %doc %attr(0644,root,root)                     %{_prefix}/share/indimail/doc/logalert/LICENSE
 %doc %attr(0644,root,root)                     %{_prefix}/share/indimail/doc/logalert/README.md
 
-%doc %attr(0644,root,root)                     %{_mandir}/man1/incrmesg.1.gz
-%doc %attr(0644,root,root)                     %{_mandir}/man1/logclient.1.gz
-%doc %attr(0644,root,root)                     %{_mandir}/man8/logalert.8.gz
-%doc %attr(0644,root,root)                     %{_mandir}/man8/logsrv.8.gz
-%doc %attr(0644,root,root)                     %{_mandir}/man8/showbytes.8.gz
-%doc %attr(0644,root,root)                     %{_mandir}/man8/rpclog.8.gz
+%doc %attr(0644,root,root)                     %{_mandir}/man1/incrmesg.1.*
+%doc %attr(0644,root,root)                     %{_mandir}/man1/logclient.1.*
+%doc %attr(0644,root,root)                     %{_mandir}/man8/logalert.8.*
+%doc %attr(0644,root,root)                     %{_mandir}/man8/logsrv.8.*
+%doc %attr(0644,root,root)                     %{_mandir}/man8/showbytes.8.*
+%doc %attr(0644,root,root)                     %{_mandir}/man8/rpclog.8.*
 
 %post
 argv1=$1