Improve RPM build

git-svn-id: https://svn.argeo.org/slc/trunk@9194 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/dep/org.argeo.slc.dep.backend/pom.xml b/dep/org.argeo.slc.dep.backend/pom.xml
index 1c69af5c20efa1b14c87db625ba1ba2c736d44f7..18cf2d1a48a0a3e85fa45401747f9bae0c99a369 100644 (file)
--- a/dep/org.argeo.slc.dep.backend/pom.xml
+++ b/dep/org.argeo.slc.dep.backend/pom.xml
@@ -179,7 +179,7 @@
                                                                                        <username>root</username>
                                                                                        <groupname>root</groupname>
                                                                                        <filemode>644</filemode>
-                                                                                       <directoryIncluded>false</directoryIncluded>
+                                                                                       <directoryIncluded>true</directoryIncluded>
                                                                                        <sources>
                                                                                                <source>
                                                                                                        <location>${project.build.directory}/lib-argeo</location>
@@ -189,13 +189,14 @@
                                                                                                </source>
                                                                                        </sources>
                                                                                </mapping>
-                                                                               <!-- <mapping> -->
-                                                                               <!-- <directory>/usr/share/osgi</directory> -->
-                                                                               <!-- <username>root</username> -->
-                                                                               <!-- <groupname>root</groupname> -->
-                                                                               <!-- <filemode>644</filemode> -->
-                                                                               <!-- <artifact /> -->
-                                                                               <!-- </mapping> -->
+                                                                               <mapping>
+                                                                                       <directory>/usr/share/osgi/org/argeo/slc/${project.artifactId}/${project.version}</directory>
+                                                                                       <username>root</username>
+                                                                                       <groupname>root</groupname>
+                                                                                       <filemode>644</filemode>
+                                                                                       <directoryIncluded>false</directoryIncluded>
+                                                                                       <artifact />
+                                                                               </mapping>
                                                                        </mappings>
                                                                        <requires>
                                                                                <require>argeo-cms-platform</require>

diff --git a/dep/org.argeo.slc.dep.minimal/pom.xml b/dep/org.argeo.slc.dep.minimal/pom.xml
index 923726b84859d72721e3c81ff2c4cb8f127a57b8..ee4853ba41e22a57a80250fa17dfa40715b85ba6 100644 (file)
--- a/dep/org.argeo.slc.dep.minimal/pom.xml
+++ b/dep/org.argeo.slc.dep.minimal/pom.xml
@@ -132,7 +132,7 @@
                                                                                        <username>root</username>
                                                                                        <groupname>root</groupname>
                                                                                        <filemode>644</filemode>
-                                                                                       <directoryIncluded>false</directoryIncluded>
+                                                                                       <directoryIncluded>true</directoryIncluded>
                                                                                        <sources>
                                                                                                <source>
                                                                                                        <location>${project.build.directory}/lib-argeo</location>
@@ -142,6 +142,14 @@
                                                                                                </source>
                                                                                        </sources>
                                                                                </mapping>
+                                                                               <mapping>
+                                                                                       <directory>/usr/share/osgi/org/argeo/slc/${project.artifactId}/${project.version}</directory>
+                                                                                       <username>root</username>
+                                                                                       <groupname>root</groupname>
+                                                                                       <filemode>644</filemode>
+                                                                                       <directoryIncluded>false</directoryIncluded>
+                                                                                       <artifact />
+                                                                               </mapping>
                                                                        </mappings>
                                                                        <requires>
                                                                                <require>argeo-cms-node</require>