From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 20 Sep 2016 13:55:44 +0000 (+0000)
Subject: Improve RPM build.
X-Git-Tag: argeo-commons-2.1.46~4
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=70ad653e0357403919dd2b1a099efa8533db5ab4;p=lgpl%2Fargeo-commons.git

Improve RPM build.

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

diff --git a/dep/org.argeo.dep.cms.client/pom.xml b/dep/org.argeo.dep.cms.client/pom.xml
index 179f7ba63..2cf24264d 100644
--- a/dep/org.argeo.dep.cms.client/pom.xml
+++ b/dep/org.argeo.dep.cms.client/pom.xml
@@ -270,7 +270,7 @@
 											<username>root</username>
 											<groupname>root</groupname>
 											<filemode>644</filemode>
-											<directoryIncluded>true</directoryIncluded>
+											<directoryIncluded>false</directoryIncluded>
 											<sources>
 												<source>
 													<location>${project.build.directory}/lib-argeo</location>
@@ -284,8 +284,7 @@
 											<directory>/usr/share/osgi/org/argeo/commons/${project.artifactId}/${project.version}</directory>
 											<username>root</username>
 											<groupname>root</groupname>
-											<filemode>644</filemode>
-											<directoryIncluded>true</directoryIncluded>
+											<directoryIncluded>false</directoryIncluded>
 											<artifact />
 										</mapping>
 									</mappings>
diff --git a/dep/org.argeo.dep.cms.node/pom.xml b/dep/org.argeo.dep.cms.node/pom.xml
index 3945b230d..ffc635ebd 100644
--- a/dep/org.argeo.dep.cms.node/pom.xml
+++ b/dep/org.argeo.dep.cms.node/pom.xml
@@ -16,6 +16,7 @@
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.dep.cms.client</artifactId>
 			<version>2.1.46-SNAPSHOT</version>
+			<type>pom</type>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
@@ -313,7 +314,7 @@
 											<username>root</username>
 											<groupname>root</groupname>
 											<filemode>644</filemode>
-											<directoryIncluded>true</directoryIncluded>
+											<directoryIncluded>false</directoryIncluded>
 											<sources>
 												<source>
 													<location>${project.build.directory}/lib-argeo</location>
@@ -327,8 +328,7 @@
 											<directory>/usr/share/osgi/org/argeo/commons/${project.artifactId}/${project.version}</directory>
 											<username>root</username>
 											<groupname>root</groupname>
-											<filemode>644</filemode>
-											<directoryIncluded>true</directoryIncluded>
+											<directoryIncluded>false</directoryIncluded>
 											<artifact />
 										</mapping>
 									</mappings>
diff --git a/dep/org.argeo.dep.cms.platform/pom.xml b/dep/org.argeo.dep.cms.platform/pom.xml
index 89b087770..a596ccb02 100644
--- a/dep/org.argeo.dep.cms.platform/pom.xml
+++ b/dep/org.argeo.dep.cms.platform/pom.xml
@@ -16,6 +16,7 @@
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.dep.cms.node</artifactId>
 			<version>2.1.46-SNAPSHOT</version>
+			<type>pom</type>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
@@ -226,7 +227,7 @@
 											<username>root</username>
 											<groupname>root</groupname>
 											<filemode>644</filemode>
-											<directoryIncluded>true</directoryIncluded>
+											<directoryIncluded>false</directoryIncluded>
 											<sources>
 												<source>
 													<location>${project.build.directory}/lib-argeo</location>
@@ -240,8 +241,7 @@
 											<directory>/usr/share/osgi/org/argeo/commons/${project.artifactId}/${project.version}</directory>
 											<username>root</username>
 											<groupname>root</groupname>
-											<filemode>644</filemode>
-											<directoryIncluded>true</directoryIncluded>
+											<directoryIncluded>false</directoryIncluded>
 											<artifact />
 										</mapping>
 									</mappings>
diff --git a/dep/org.argeo.dep.cms.sdk/pom.xml b/dep/org.argeo.dep.cms.sdk/pom.xml
index cc8b791ea..fd6b69924 100644
--- a/dep/org.argeo.dep.cms.sdk/pom.xml
+++ b/dep/org.argeo.dep.cms.sdk/pom.xml
@@ -14,6 +14,7 @@
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.dep.cms.platform</artifactId>
 			<version>2.1.46-SNAPSHOT</version>
+			<type>pom</type>
 		</dependency>
 
 		<!-- ALM Third Parties -->
diff --git a/pom.xml b/pom.xml
index 0730f6de8..572796381 100644
--- a/pom.xml
+++ b/pom.xml
@@ -257,6 +257,9 @@ limitations under the License.
 						<distribution>argeo${argeo.rpm.release}</distribution>
 						<group>Applications/System</group>
 						<prefix>/usr</prefix>
+						<!-- <copyTo>${argeo.rpm.stagingRepository}</copyTo> -->
+						<defaultDirMode>755</defaultDirMode>
+						<defaultFileMode>644</defaultFileMode>
 					</configuration>
 				</plugin>
 				<plugin>
@@ -513,30 +516,6 @@ limitations under the License.
 							</execution>
 						</executions>
 					</plugin>
-<!-- 					<plugin> -->
-<!-- 						<groupId>org.apache.maven.plugins</groupId> -->
-<!-- 						<artifactId>maven-dependency-plugin</artifactId> -->
-<!-- 						<executions> -->
-<!-- 							<execution> -->
-<!-- 								<id>copy</id> -->
-<!-- 								<phase>package</phase> -->
-<!-- 								<goals> -->
-<!-- 									<goal>copy</goal> -->
-<!-- 								</goals> -->
-<!-- 								<configuration> -->
-<!-- 									<artifactItems> -->
-<!-- 										<artifactItem> -->
-<!-- 											<groupId>${project.groupId}</groupId> -->
-<!-- 											<artifactId>${project.artifactId}</artifactId> -->
-<!-- 											<version>${project.version}</version> -->
-<!-- 											<outputDirectory>${project.build.directory}/lib-argeo</outputDirectory> -->
-<!-- 										</artifactItem> -->
-<!-- 									</artifactItems> -->
-<!-- 									other configurations here -->
-<!-- 								</configuration> -->
-<!-- 							</execution> -->
-<!-- 						</executions> -->
-<!-- 					</plugin> -->
 				</plugins>
 			</build>
 		</profile>