fixup! fixup! fixup! fixup! fix manager-build

uyuni-project · Sep 12, 2023 · c011e2a · c011e2a
1 parent 28b13ad
commit c011e2a
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
@@ -694,14 +694,11 @@ chown tomcat:%{apache_group} /var/log/rhn/gatherer.log
 
 %files
 %defattr(-,root,root)
+%dir %{susemanagershareddir} 
 %dir %{_localstatedir}/lib/spacewalk
 %defattr(644,tomcat,tomcat,775)
 %attr(775, %{salt_user_group}, %{salt_user_group}) %dir %{serverdir}/susemanager/salt/salt_ssh
 %attr(700, %{salt_user_group}, %{salt_user_group}) %dir %{serverdir}/susemanager/salt/salt_ssh/temp_bootstrap_keys
-%attr(775, root, tomcat) %dir %{susemanagershareddir} 
-%dir %{serverdir}
-%dir %{serverdir}/tomcat
-%dir %{serverdir}/tomcat/webapps
 %dir %{serverdir}/susemanager
 %dir %{serverdir}/susemanager/salt
 %attr(775,tomcat,susemanager) %dir %{serverdir}/susemanager/pillar_data
@@ -727,6 +724,9 @@ chown tomcat:%{apache_group} /var/log/rhn/gatherer.log
 %{serverdir}/tomcat/webapps/rhn/WEB-INF/*.xml
 
 # all jars in WEB-INF/lib/
+%dir %{serverdir}
+%dir %{serverdir}/tomcat
+%dir %{serverdir}/tomcat/webapps
 %{serverdir}/tomcat/webapps/rhn/WEB-INF/lib
 %exclude %{serverdir}/tomcat/webapps/rhn/WEB-INF/lib/postgresql-jdbc.jar
 %exclude %{serverdir}/tomcat/webapps/rhn/WEB-INF/lib/ongres-*.jar
@@ -799,11 +799,12 @@ chown tomcat:%{apache_group} /var/log/rhn/gatherer.log
 %defattr(644,root,root,755)
 %dir %{_prefix}/share/rhn/search
 %dir %{_prefix}/share/rhn/search/lib
+%dir %{susemanagershareddir} 
+%dir %{serverdir}
 %{serverdir}/tomcat/webapps/rhn/WEB-INF/lib/postgresql-jdbc.jar
 %{_prefix}/share/rhn/search/lib/postgresql-jdbc.jar
-
-%attr(775, root, tomcat) %dir %{susemanagershareddir} 
-%dir %{serverdir}
+%defattr(644,tomcat,tomcat,775)
 %dir %{serverdir}/tomcat
 %dir %{serverdir}/tomcat/webapps
+
 %changelog