From: Eric Bollengier <eric@baculasystems.com>
Date: Mon, 4 Jul 2022 20:33:07 +0000 (+0200)
Subject: rpms: fix bacula spec file
X-Git-Tag: Release-13.0.1~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80b57bcaf4b77c592a07ecc7e5506c99b5dfefbd;p=thirdparty%2Fbacula.git

rpms: fix bacula spec file
---

diff --git a/bacula/platforms/rpms/redhat/bacula-docker.spec.in b/bacula/platforms/rpms/redhat/bacula-docker.spec.in
index 73a1b16d5..88432b8f9 100644
--- a/bacula/platforms/rpms/redhat/bacula-docker.spec.in
+++ b/bacula/platforms/rpms/redhat/bacula-docker.spec.in
@@ -101,7 +101,7 @@ make
 
 %install
 d=`mktemp -d`
-make DESTDIR=$d -C ../bacula-enterprise-%{_version}/src/plugins/fd install-docker
+make DESTDIR=$d -C ../bacula-%{_version}/src/plugins/fd install-docker
 mv $d/opt $RPM_BUILD_ROOT/
 rm -rf $d
 
diff --git a/bacula/platforms/rpms/redhat/bacula.spec.in b/bacula/platforms/rpms/redhat/bacula.spec.in
index 15091d64e..e283dba36 100644
--- a/bacula/platforms/rpms/redhat/bacula.spec.in
+++ b/bacula/platforms/rpms/redhat/bacula.spec.in
@@ -769,6 +769,7 @@ rm -f $RPM_BUILD_ROOT%{plugin_dir}/ldap-dir.so
 %endif
 
 rm -f $RPM_BUILD_ROOT%{_sbindir}/ldaptest
+rm -f $RPM_BUILD_ROOT%{script_dir}/isworm
 
 # install sqlite
 %if %{sqlite}
@@ -833,7 +834,6 @@ rm -f $RPM_BUILD_ROOT%{script_dir}/bconsole
 rm -f $RPM_BUILD_ROOT%{script_dir}/mtx-changer.conf
 rm -f $RPM_BUILD_ROOT%{_sbindir}/bacula
 rm -f $RPM_BUILD_ROOT%{plugin_dir}/docker-fd.so
-rm -f $RPM_BUILD_ROOT%{script_dir}/isworm
 
 %endif