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 73a1b16d52ddab96a566ab213fc0051e2330509b..88432b8f9400172564da6e2c2f55da0a1bd65ebf 100644 (file)
--- 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 15091d64e42934f9cf633ff788db6b28de0072f4..e283dba363304474f57645ffa3f6d79d9b562176 100644 (file)
--- 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