From 7bb28a39059715a8638ac1002812c6e37a269e35 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Fri, 13 Sep 2013 10:20:49 +0000
Subject: [PATCH] OPENDJ-1133 RPM : wrong files under /usr/share/doc/opendj-*version*
---
opends/build.xml | 2 +-
opends/src/build-tools/org/opends/build/tools/ProcessFilesForPackages.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/opends/build.xml b/opends/build.xml
index 2592d3b..4cb62aa 100644
--- a/opends/build.xml
+++ b/opends/build.xml
@@ -1532,7 +1532,7 @@
prefix="${prefix}" filemode="755" dirmode="755" />
<tarfileset dir="${build.deb.dir}" includes="template/**/*"
prefix="${prefix}" filemode="444" dirmode="744" />
- <tarfileset dir="${build.deb.dir}" includes="legal-notices/**, copyright, README, example-plugin.zip, changelog.Debian.gz"
+ <tarfileset dir="${build.deb.dir}" includes="legal-notices/**, copyright, example-plugin.zip, changelog.Debian.gz"
prefix="${docprefix}" filemode="644" dirmode="755" />
<tarfileset dir="${build.deb.dir}" includes="opendj"
prefix="/etc/init.d" filemode="755" dirmode="755" />
diff --git a/opends/src/build-tools/org/opends/build/tools/ProcessFilesForPackages.java b/opends/src/build-tools/org/opends/build/tools/ProcessFilesForPackages.java
index 1fe9e0e..d4817d6 100644
--- a/opends/src/build-tools/org/opends/build/tools/ProcessFilesForPackages.java
+++ b/opends/src/build-tools/org/opends/build/tools/ProcessFilesForPackages.java
@@ -249,6 +249,7 @@
|| fileName.endsWith(".app")
|| fileName.endsWith(".bat")
|| fileName.endsWith(".exe")
+ || fileName.equals("readme")
|| file.getAbsolutePath().contains(".app"));
}
}
@@ -269,10 +270,10 @@
return (
!file.getAbsolutePath().contains("/template/")
&& !file.getAbsolutePath().contains("/legals/")
+ && !file.getAbsolutePath().contains("/snmp/")
&& (fileName.endsWith(".doc")
|| fileName.endsWith(".txt")
|| fileName.contains("example-plugin")
- || fileName.equals("readme")
|| fileName.equals("opends.license")));
}
}
--
Gitblit v1.10.0