Alon Bar-Lev has uploaded a new change for review.
Change subject: Inhibit writing into /usr
......................................................................
Inhibit writing into /usr
Change-Id: I51ef687a72840cd1f56aa551695a99b6eff20318
Signed-off-by: Alon Bar-Lev <alo...@redhat.com>
---
A jasperreports-server-5.5.0-write-own.patch
M jasperreports-server.spec
2 files changed, 42 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/jasperreports-server-rpm
refs/changes/74/23774/1
diff --git a/jasperreports-server-5.5.0-write-own.patch
b/jasperreports-server-5.5.0-write-own.patch
new file mode 100644
index 0000000..3e9f293
--- /dev/null
+++ b/jasperreports-server-5.5.0-write-own.patch
@@ -0,0 +1,36 @@
+build: do not write into own files
+
+js.quartz.properties is modified in-place instead of using
+temp file or file within configuration.
+
+luckily, the default within js.quartz.properties is already
+PostgreSQLDelegate, so we can just avoid this workaround for.
+
+Signed-off-by: Alon Bar-Lev <alo...@redhat.com>
+
+diff -urNp
a/jasperreports-server-cp-5.5.0-bin/buildomatic/bin/import-export.xml
b/jasperreports-server-cp-5.5.0-bin/buildomatic/bin/import-export.xml
+--- a/jasperreports-server-cp-5.5.0-bin/buildomatic/bin/import-export.xml
2013-10-24 20:04:05.000000000 +0300
++++ b/jasperreports-server-cp-5.5.0-bin/buildomatic/bin/import-export.xml
2014-01-26 20:24:57.069301474 +0200
+@@ -120,22 +120,6 @@ Make sure you have compiled the jasperse
+ <echo> importExportConfig = ${importExportConfig}</echo>
+ <echo> </echo>
+
+- <!-- todo: fixed bug 15479 - postgresql fails on export on
scheduled report -->
+- <!-- todo: better fix would be to pull in the
js.quartz.properties file from the -->
+- <!-- buildomatic/build_conf dir in the run-import-export
macrodef -->
+- <!-- tweaking
conf_source/import_export_config*/js.quartz.properties for quartz delegate if
postgresql -->
+- <if>
+- <equals arg1="${dbType}" arg2="postgresql" />
+- <then>
+- <replace file="${importExportConfig}/js.quartz.properties"
+- token="StdJDBCDelegate"
value="PostgreSQLDelegate"/>
+- </then>
+- <else>
+- <replace file="${importExportConfig}/js.quartz.properties"
+- token="PostgreSQLDelegate"
value="StdJDBCDelegate"/>
+- </else>
+- </if>
+-
+ <set-import-export-lib-dir
importExportConfig="${importExportConfig}"/>
+
+ <if>
diff --git a/jasperreports-server.spec b/jasperreports-server.spec
index 72ebaeb..63e0921 100644
--- a/jasperreports-server.spec
+++ b/jasperreports-server.spec
@@ -2,7 +2,7 @@
Name: jasperreports-server
Version: 5.5.0
-Release: 4%{?dist}
+Release: 5%{?dist}
License: AGPLv3
Summary: JasperReports Server
URL: http://community.jaspersoft.com
@@ -10,6 +10,7 @@
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
+Patch2: %{name}-%{version}-write-own.patch
AutoReqProv: no
BuildRequires: java-1.7.0-openjdk-devel
@@ -27,6 +28,7 @@
%setup -c -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
@@ -39,6 +41,9 @@
%{_datadir}/%{name}
%changelog
+* Tue Jan 28 2014 Alon Bar-Lev <alo...@redhat.com> - 5.5.0-5
+- Prevent jasper build to modify files at /usr.
+
* Thu Jan 16 2014 Sandro Bonazzola <sbona...@redhat.com> - 5.5.0-4
- Dropped application server and db dependencies as we are just repackaging the
Jasper .zip distribution, which is application server independent.
--
To view, visit http://gerrit.ovirt.org/23774
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I51ef687a72840cd1f56aa551695a99b6eff20318
Gerrit-PatchSet: 1
Gerrit-Project: jasperreports-server-rpm
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
