From 66083b5e60a52257c4eab2b281ad6e302d8791e8 Mon Sep 17 00:00:00 2001 From: "Jean-Marc Pigeon (Delson)" Date: Tue, 17 Jun 2025 07:20:47 -0400 Subject: [PATCH] Still investiguating the postgresql mariadb llibrary problem --- app/Makefile | 3 ++- lib/Makefile | 2 ++ mailleur.spec.in | 16 ++++++++-------- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/app/Makefile b/app/Makefile index bc3055c..2c3f7a0 100644 --- a/app/Makefile +++ b/app/Makefile @@ -40,7 +40,8 @@ SRC= \ CC = gcc LD = gcc -g CFLAGS = -I ../lib -Wall $(OPTIME) -LIBMAIL = ../lib/libmail.a ../shared/libposql.so.1 ../shared/libmasql.so.1 +LIBMAIL = ../lib/libmail.a ../shared/libposql.so ../shared/libmasql.so +#LIBMAIL = ../lib/libmail.a LIBS = $(LIBMAIL) \ -luuid \ -lpq \ diff --git a/lib/Makefile b/lib/Makefile index 6f8aa99..7385ad1 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -20,8 +20,10 @@ clean : shared : libposql libmasql mv -f libposql.so.1.0 ../shared ln -nsf libposql.so.1.0 ../shared/libposql.so.1 + ln -nsf libposql.so.1.0 ../shared/libposql.so mv -f libmasql.so.1.0 ../shared ln -nsf libmasql.so.1.0 ../shared/libmasql.so.1 + ln -nsf libmasql.so.1.0 ../shared/libmasql.so libposql: unipos.o $(CC) -shared -Wl,-soname,$@.so.1 -o $@.so.1.0 unipos.o diff --git a/mailleur.spec.in b/mailleur.spec.in index facbf6d..f3fc3b9 100644 --- a/mailleur.spec.in +++ b/mailleur.spec.in @@ -33,14 +33,13 @@ search about email exchange within time and transaction context. %attr(0755,root,root) %{_datadir}/%{name}/linux/osukiss/receiver %attr(0755,root,root) %{_datadir}/%{name}/linux/osukiss/sorter %{_sbindir}/chkspf -%{_sbindir}/feeder -%attr(0755,%{name},mail) %{_sbindir}/receiver -%attr(0755,%{name},mail) %{_sbindir}/sender -%attr(0755,%{name},mail) %{_sbindir}/sorter +%exclude %{_sbindir}/feeder +%exclude %attr(0755,%{name},mail) %{_sbindir}/receiver +%exclude %attr(0755,%{name},mail) %{_sbindir}/sender +%exclude %attr(0755,%{name},mail) %{_sbindir}/sorter %attr(0754,root,root) %{_libdir}/%{name}/shell/*.sh %attr(0754,root,root) %{_libdir}/%{name}/support/starting.sh %attr(0755,%{name},mail) %dir %{spooldir}/%{name}/{queue,in.log,out.log} - #----------------------------------------------------------------------------- %preun @@ -144,7 +143,7 @@ Requires : postgresql-server #----------------------------------------------------------------------------- %files postgresql %defattr(-,root,root,-) -%{_libdir}/libposql.so.1* +%{_libdir}/libposql.so* #============================================================================= %package mysql @@ -153,7 +152,8 @@ Summary : mailleur using mysql/mariadb as Data-base #----------------------------------------------------------------------------- Requires : %{name} = %{version}-%{release} -Requires : mariadb + +#Requires : mariadb #----------------------------------------------------------------------------- %description mysql @@ -162,7 +162,7 @@ Requires : mariadb #----------------------------------------------------------------------------- %files mysql %defattr(-,root,root,-) -%{_libdir}/libmasql.so.1* +%{_libdir}/libmasql.so* #============================================================================= %prep -- 2.47.3