X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=dist%2Fslc%2Fpom.xml;h=f38f22f30f578cd07e17976ef0978fff114c4731;hb=0fd031e3c6e7578aea85bec5b75f76d5415d0a64;hp=af3da3790597a12219edc31c6ef469f67b4a2555;hpb=166532a9db4e21987d3732c576efb74872eec210;p=gpl%2Fargeo-slc.git

diff --git a/dist/slc/pom.xml b/dist/slc/pom.xml
index af3da3790..f38f22f30 100644
--- a/dist/slc/pom.xml
+++ b/dist/slc/pom.xml
@@ -1,40 +1,39 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>dist</artifactId>
-		<version>0.13.1-SNAPSHOT</version>
+		<version>0.13.2-SNAPSHOT</version>
 	</parent>
 	<groupId>org.argeo.slc.dist</groupId>
 	<artifactId>slc</artifactId>
 	<packaging>pom</packaging>
 	<name>SLC Node (RPM)</name>
-	<build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-resources-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>filter-base</id>
-						<phase>process-resources</phase>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${basedir}/target/base</outputDirectory>
-							<resources>
-								<resource>
-									<directory>src/main/base</directory>
-									<filtering>true</filtering>
-								</resource>
-							</resources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
+<!-- 	<build> -->
+<!-- 		<plugins> -->
+<!-- 			<plugin> -->
+<!-- 				<artifactId>maven-resources-plugin</artifactId> -->
+<!-- 				<executions> -->
+<!-- 					<execution> -->
+<!-- 						<id>filter-base</id> -->
+<!-- 						<phase>process-resources</phase> -->
+<!-- 						<goals> -->
+<!-- 							<goal>copy-resources</goal> -->
+<!-- 						</goals> -->
+<!-- 						<configuration> -->
+<!-- 							<outputDirectory>${basedir}/target/base</outputDirectory> -->
+<!-- 							<resources> -->
+<!-- 								<resource> -->
+<!-- 									<directory>src/main/base</directory> -->
+<!-- 									<filtering>true</filtering> -->
+<!-- 								</resource> -->
+<!-- 							</resources> -->
+<!-- 						</configuration> -->
+<!-- 					</execution> -->
+<!-- 				</executions> -->
+<!-- 			</plugin> -->
+<!-- 		</plugins> -->
+<!-- 	</build> -->
 	<profiles>
 		<profile>
 			<id>rpmbuild</id>
@@ -103,15 +102,28 @@
 												</source>
 											</sources>
 										</mapping>
+										<!-- Maven (even if not installed) -->
+										<mapping>
+											<directory>/var/lib/slc/.m2</directory>
+											<username>slc</username>
+											<groupname>slc</groupname>
+											<filemode>600</filemode>
+											<directoryIncluded>false</directoryIncluded>
+											<sources>
+												<source>
+													<location>src/main/rpm/var/lib/slc/.m2</location>
+												</source>
+											</sources>
+										</mapping>
 									</mappings>
 									<preinstallScriptlet>
-										<scriptFile>src/main/scripts/preinstall</scriptFile>
+										<scriptFile>src/main/scripts/preinstall-${rpm.release}</scriptFile>
 									</preinstallScriptlet>
 									<postinstallScriptlet>
 										<scriptFile>src/main/scripts/postinstall</scriptFile>
 									</postinstallScriptlet>
 									<preremoveScriptlet>
-										<scriptFile>src/main/scripts/preremove</scriptFile>
+										<scriptFile>src/main/scripts/preremove-${rpm.release}</scriptFile>
 									</preremoveScriptlet>
 									<requires>
 										<require>slc-libs</require>
@@ -122,26 +134,6 @@
 							</execution>
 						</executions>
 					</plugin>
-					<plugin>
-						<artifactId>maven-antrun-plugin</artifactId>
-						<executions>
-							<execution>
-								<phase>install</phase>
-								<goals>
-									<goal>run</goal>
-								</goals>
-								<configuration>
-									<target>
-										<copy todir="${rpm.stagingRepository}" verbose="true">
-											<fileset dir="${project.build.directory}/rpm"
-												includes="*/RPMS/**/*.rpm" />
-											<flattenmapper />
-										</copy>
-									</target>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
 				</plugins>
 			</build>
 		</profile>