Alon Bar-Lev has uploaded a new change for review. Change subject: spec: add build patches ......................................................................
spec: add build patches Change-Id: Ia1619b341638f3644892f0905c9c6372500c06b8 Signed-off-by: Alon Bar-Lev <[email protected]> --- A jasperreports-server-5.5.0-additional-config.patch A jasperreports-server-5.5.0-install_resources.patch M jasperreports-server.spec 3 files changed, 62 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/jasperreports-server-rpm refs/changes/03/23303/1 diff --git a/jasperreports-server-5.5.0-additional-config.patch b/jasperreports-server-5.5.0-additional-config.patch new file mode 100644 index 0000000..3270da9 --- /dev/null +++ b/jasperreports-server-5.5.0-additional-config.patch @@ -0,0 +1,20 @@ +utils: support additional config within different location + +the build support that, so allow overriding configuration +location also in import/export. + +Signed-off-by: Alon Bar-Lev <[email protected]> + +--- + +--- a/jasperreports-server-cp-5.5.0-bin/buildomatic/bin/js-import-export.sh 2014-01-16 01:41:57.058840500 +0200 ++++ b/jasperreports-server-cp-5.5.0-bin/buildomatic/bin/js-import-export.sh 2014-01-16 01:42:13.853845937 +0200 +@@ -34,7 +34,7 @@ fi + + # Additional config folder. This will be used to + # get js.jdbc.properties from buildomatic setup +-export ADDITIONAL_CONFIG_DIR=$BASEDIR/build_conf/default ++export ADDITIONAL_CONFIG_DIR=${ADDITIONAL_CONFIG_DIR:-$BASEDIR/build_conf/default} + + + # Locate the java binary bundled with installer diff --git a/jasperreports-server-5.5.0-install_resources.patch b/jasperreports-server-5.5.0-install_resources.patch new file mode 100644 index 0000000..2b34bf2 --- /dev/null +++ b/jasperreports-server-5.5.0-install_resources.patch @@ -0,0 +1,35 @@ +build: install_resources are releative to base and not to the configuration + +Signed-off-by: Alon Bar-Lev <[email protected]> + +--- + +--- a/jasperreports-server-cp-5.5.0-bin/buildomatic/bin/app-server.xml 2014-01-16 01:42:56.247859589 +0200 ++++ b/jasperreports-server-cp-5.5.0-bin/buildomatic/bin/app-server.xml 2014-01-16 01:43:41.345874121 +0200 +@@ -830,7 +830,7 @@ tomcat copies to this location from the + <if> + <equals arg1="${app-server_AppServer}" arg2="jboss_EAP6orAS7" /> + <then> +- <copy file="${currentConf}/../../install_resources/jboss7/jboss-deployment-structure.xml" toDir="${warTargetDir}/META-INF" overwrite="true"/> ++ <copy file="${basedir}/install_resources/jboss7/jboss-deployment-structure.xml" toDir="${warTargetDir}/META-INF" overwrite="true"/> + <copy file="${currentConf}/js-jboss7-ds.xml" toDir="${warTargetDir}/WEB-INF" overwrite="true"/> + <touch file="${jbossDeployDir}/${webAppName}.war.dodeploy"/> + </then> +@@ -973,7 +973,7 @@ tomcat copies to this location from the + </if> + + +- <copy file="${currentConf}/../../install_resources/jboss7/module_descriptors/module_org_apache_batik.xml" ++ <copy file="${basedir}/install_resources/jboss7/module_descriptors/module_org_apache_batik.xml" + tofile="${fixedAppServerDir}/modules/jaspersoft/org/apache/batik/main/module.xml" + overwrite="true"/> + <copy toDir="${fixedAppServerDir}/modules/jaspersoft/org/apache/batik/main"> +@@ -1286,7 +1286,7 @@ tomcat copies to this location from the + + <mkdir dir="${fixedAppServerDir}/modules/${MOD_DIR}"/> + +- <copy file="${currentConf}/../../install_resources/jboss7/module_descriptors/${CONFIG_NAME}" ++ <copy file="${basedir}/install_resources/jboss7/module_descriptors/${CONFIG_NAME}" + tofile="${fixedAppServerDir}/modules/${MOD_DIR}" + overwrite="true"/> + diff --git a/jasperreports-server.spec b/jasperreports-server.spec index 0a3ba56..65d1508 100644 --- a/jasperreports-server.spec +++ b/jasperreports-server.spec @@ -2,12 +2,14 @@ Name: jasperreports-server Version: 5.5.0 -Release: 2%{?dist} +Release: 3%{?dist} License: AGPLv3 Summary: JasperReports Server URL: http://community.jaspersoft.com BuildArch: noarch Source: http://downloads.sourceforge.net/project/jasperserver/JasperServer/JasperReports%20Server%20Community%20Edition%20%{version}/%{name}-cp-%{version}-bin.zip +Patch0: %{name}-%{version}-additional-config.patch +Patch1: %{name}-%{version}-install_resources.patch AutoReqProv: no BuildRequires: java-1.7.0-openjdk-devel @@ -34,6 +36,8 @@ %prep %setup -c -q +%patch0 -p1 +%patch1 -p1 %build @@ -46,6 +50,8 @@ %{_datadir}/%{name} %changelog +* Thu Jan 16 2014 Alon Bar-Lev <[email protected]> - 5.5.0-3 +- Fix bugs in jasper build system. * Fri Dec 20 2013 Sandro Bonazzola <[email protected]> - 5.5.0-2 - Fixed W: no-build-section -- To view, visit http://gerrit.ovirt.org/23303 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia1619b341638f3644892f0905c9c6372500c06b8 Gerrit-PatchSet: 1 Gerrit-Project: jasperreports-server-rpm Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
