From ab91aee5819d15b04f198a5c6ef387ee73affed4 Mon Sep 17 00:00:00 2001 From: Dirk Zimoch Date: Tue, 14 Jan 2025 09:54:38 +0100 Subject: [PATCH] handle new directories --- epics-base.spec | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/epics-base.spec b/epics-base.spec index ea25ddaab..4efb912bc 100644 --- a/epics-base.spec +++ b/epics-base.spec @@ -265,6 +265,8 @@ then systemctl daemon-reload fi +########################################### + %files %defattr(-,root,root,-) %dir %{prog_folder} @@ -282,8 +284,8 @@ fi %{prog_folder}/lib/perl/EpicsHostArch.pl %{prog_folder}/lib/perl/CA.pm %dir %{prog_folder}/lib/perl -%dir %{prog_folder}/lib/perl/* -%dir %{prog_folder}/lib/perl/*/*-linux-thread-multi +%dir %{prog_folder}/lib/perl/[0-9]* +%dir %{prog_folder}/lib/perl/[0-9]*/*-linux-thread-multi %{prog_folder}/lib/perl/*/*-linux-thread-multi/libCap5.so # Install host binaries but avoid installing *.pl scripts @@ -378,8 +380,8 @@ fi %dir %{prog_folder}/lib/[a-z]*-* %{prog_folder}/lib/[a-z]*-*/*.so* %dir %{prog_folder}/lib/perl -%{prog_folder}/lib/perl/EPICS -%{prog_folder}/lib/perl/DBD* +%{prog_folder}/lib/perl/[A-Z]*/ +%{prog_folder}/lib/perl/DBD.pm %dir %{prog_folder}/bin # avoid pulling in host files again @@ -448,8 +450,8 @@ fi %dir %{prog_folder}/lib/pkgconfig %{prog_folder}/lib/pkgconfig/epics-base.pc %{prog_folder}/lib/pkgconfig/epics-base-%{epics_host_arch}*.pc -%{prog_folder}/lib/perl/EPICS -%{prog_folder}/lib/perl/DBD* +%{prog_folder}/lib/perl/[A-Z]*/ +%{prog_folder}/lib/perl/DBD.pm %{prog_folder}/dbd ########################################### @@ -492,10 +494,10 @@ fi # VxWorks and RTEMS need static libs %{prog_folder}/lib/V* %{prog_folder}/lib/RTEMS* +# Windows needs *.lib %{prog_folder}/lib/win* # Basic libraries to build stand-alone clients %exclude %{prog_folder}/lib/pkgconfig -%exclude %{prog_folder}/lib/win* %dir %{prog_folder}/lib/[a-z]* %{prog_folder}/lib/[a-z]*/libCom.so* %{prog_folder}/lib/[a-z]*/libca.so* @@ -524,4 +526,6 @@ fi %defattr(-,root,root,-) %dir %{prog_folder} %docdir %{prog_folder}/html +%docdir %{prog_folder}/doc %{prog_folder}/html +%{prog_folder}/doc