[eclipse-ptp] Add patch and sed to fix doc.isv build
Orion Poplawski
orion at fedoraproject.org
Mon May 6 21:32:21 UTC 2013
commit addfc0c8e245fad0f88c709521ff60f73018e190
Author: Orion Poplawski <orion at nwra.com>
Date: Mon May 6 15:32:13 2013 -0600
Add patch and sed to fix doc.isv build
eclipse-ptp-docbuild.patch | 17 +++++++++++++++++
eclipse-ptp.spec | 8 ++++++++
2 files changed, 25 insertions(+), 0 deletions(-)
---
diff --git a/eclipse-ptp-docbuild.patch b/eclipse-ptp-docbuild.patch
new file mode 100644
index 0000000..b2f4671
--- /dev/null
+++ b/eclipse-ptp-docbuild.patch
@@ -0,0 +1,17 @@
+diff -up org.eclipse.ptp-bd8fbd1ef122a3ff350ddeed85173ba81ae56d95/core/org.eclipse.ptp.doc.isv/buildDoc.xml.docbuild org.eclipse.ptp-bd8fbd1ef122a3ff350ddeed85173ba81ae56d95/core/org.eclipse.ptp.doc.isv/buildDoc.xml
+--- org.eclipse.ptp-bd8fbd1ef122a3ff350ddeed85173ba81ae56d95/core/org.eclipse.ptp.doc.isv/buildDoc.xml.docbuild 2013-05-02 12:13:47.000000000 -0600
++++ org.eclipse.ptp-bd8fbd1ef122a3ff350ddeed85173ba81ae56d95/core/org.eclipse.ptp.doc.isv/buildDoc.xml 2013-05-06 11:01:52.723192691 -0600
+@@ -56,13 +56,6 @@
+ <include name="**/com.jcraft.jsch*.jar"/>
+ </patternset>
+
+- <pathconvert property="javadoc.classpath">
+- <path>
+- <fileset dir="${baseLocation}">
+- <patternset refid="platform.classpath.pattern"/>
+- </fileset>
+- </path>
+- </pathconvert>
+ <echo level="info" message="Done computing classpath."/>
+ <echo level="info" message="Bootclasspath is: ${bootclasspath}"/>
+ <echo level="debug" message="Classpath is: ${javadoc.classpath}"/>
diff --git a/eclipse-ptp.spec b/eclipse-ptp.spec
index 426d227..1ecbe44 100644
--- a/eclipse-ptp.spec
+++ b/eclipse-ptp.spec
@@ -48,6 +48,8 @@ Patch3: eclipse-ptp-tycho-build.patch
Patch4: eclipse-ptp-parentpath.patch
# Add <repository> for tycho-eclipserun-plugin
Patch5: eclipse-ptp-repository.patch
+# Fix doc build
+Patch6: eclipse-ptp-docbuild.patch
# Remove some unneeded dependencies
BuildRequires: java-devel >= 1.5.0
@@ -325,7 +327,11 @@ sed -i -e "/tycho-version/s/>[0-9].*</>${tychover}</" pom.xml
%patch3 -p2 -b .tycho-build
%patch4 -p1 -b .parentpath
%patch5 -p1 -b .repository
+%patch6 -p1 -b .docbuild
sed -i -e 's/<arch>x86<\/arch>/<arch>%{eclipse_arch}<\/arch>/g' pom.xml
+# Point the tycho-eclipserun-plugin repository to our build repo
+sed -i -e "s,<url>.*</url>,<url>file://$PWD/.m2/p2/repo</url>," \
+ core/org.eclipse.ptp.doc.isv/pom.xml
# Remove bundled binaries
rm -r releng/org.eclipse.ptp.linux/os/linux
# We don't want to build a full product
@@ -353,6 +359,7 @@ sh BUILD
popd
mkdir -p releng/org.eclipse.ptp.linux/os/linux/%{_arch}
cp -p debug/org.eclipse.ptp.debug.sdm/bin/sdm releng/org.eclipse.ptp.linux/os/linux/%{_arch}/sdm
+# Build the project
mvn-rpmbuild -DforceContextQualifier=%{ptp_build_id} install
@@ -468,6 +475,7 @@ cp -p debug/org.eclipse.ptp.debug.sdm/bin/sdm %{buildroot}%{_libdir}/ptp/
%changelog
* Mon May 6 2013 Orion Poplawski <orion at cora.nwra.com> - 7.0.0-0.3.20130502gitbd8fbd1
- Add patch to add repository info for tycho-eclipserun-plugin
+- Add patch and sed to fix doc.isv build
* Thu May 2 2013 Orion Poplawski <orion at cora.nwra.com> - 7.0.0-0.3.20130502gitbd8fbd1
- Update to latest git
More information about the scm-commits
mailing list