Attachment 660747 Details for Bug 885675 – update to 7.2.1

[patch] update to 7.2.1

0001-update-to-7.2.1.patch (text/plain), 25.49 KB, created by gil cattaneo on 2012-12-10 11:41:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: gil cattaneo

Created: 2012-12-10 11:41:45 UTC

Size: 25.49 KB

patch

obsolete

>From 6aaab055f5024cf702a4d0c1da0768b6b4ca9c68 Mon Sep 17 00:00:00 2001
>From: gil <puntogil@libero.it>
>Date: Mon, 10 Dec 2012 12:01:10 +0100
>Subject: [PATCH] update to 7.2.1
>
>---
> .gitignore                                         |  13 ++
> netbeans-platform-7.2.1-00-disable-netbinox.patch  |  33 +++++
> ...atform-7.2.1-remove-binaries-from-release.patch |  17 +++
> ...ns-platform-7.2.1-remove-docs-libs-testng.patch |  13 ++
> ...-platform-7.2.1-remove-non-linux-jna-bits.patch |  21 +++
> ...-platform-7.2.1-remove-non-linux-jni-libs.patch |  41 ++++++
> netbeans-platform.spec                             | 152 ++++++++++++++++-----
> sources                                            |  14 +-
> 8 files changed, 272 insertions(+), 32 deletions(-)
> create mode 100644 netbeans-platform-7.2.1-00-disable-netbinox.patch
> create mode 100644 netbeans-platform-7.2.1-remove-binaries-from-release.patch
> create mode 100644 netbeans-platform-7.2.1-remove-docs-libs-testng.patch
> create mode 100644 netbeans-platform-7.2.1-remove-non-linux-jna-bits.patch
> create mode 100644 netbeans-platform-7.2.1-remove-non-linux-jni-libs.patch
>
>diff --git a/.gitignore b/.gitignore
>index 410a217..5b8f38e 100644
>--- a/.gitignore
>+++ b/.gitignore
>@@ -2,3 +2,16 @@ netbeans-6.9-201006101454-platform-src.zip
> /netbeans-6.9.1-201007282301-platform-src.zip
> /netbeans-7.0-201104080000-platform-src.zip
> /netbeans-7.0.1-201107282000-platform-src.zip
>+/netbeans-7.2.1-201210100934-platform-src.zip
>+/org-netbeans-api-annotations-common-RELEASE721.pom
>+/org-netbeans-api-progress-RELEASE721.pom
>+/org-netbeans-swing-outline-RELEASE721.pom
>+/org-netbeans-swing-plaf-RELEASE721.pom
>+/org-netbeans-swing-tabcontrol-RELEASE721.pom
>+/org-openide-awt-RELEASE721.pom
>+/org-openide-dialogs-RELEASE721.pom
>+/org-openide-filesystems-RELEASE721.pom
>+/org-openide-nodes-RELEASE721.pom
>+/org-openide-util-lookup-RELEASE721.pom
>+/org-openide-util-RELEASE721.pom
>+/org-openide-windows-RELEASE721.pom
>diff --git a/netbeans-platform-7.2.1-00-disable-netbinox.patch b/netbeans-platform-7.2.1-00-disable-netbinox.patch
>new file mode 100644
>index 0000000..8b89b83
>--- /dev/null
>+++ b/netbeans-platform-7.2.1-00-disable-netbinox.patch
>@@ -0,0 +1,33 @@
>+diff -Nru netbeans-platform-7.2.1/nbbuild/antsrc/org/netbeans/nbbuild/MakeOSGi.java netbeans-platform-7.2.1-gil/nbbuild/antsrc/org/netbeans/nbbuild/MakeOSGi.java
>+--- netbeans-platform-7.2.1/nbbuild/antsrc/org/netbeans/nbbuild/MakeOSGi.java	2012-10-10 11:02:28.000000000 +0200
>++++ netbeans-platform-7.2.1-gil/nbbuild/antsrc/org/netbeans/nbbuild/MakeOSGi.java	2012-12-10 09:16:01.206767558 +0100
>+@@ -937,7 +937,6 @@
>+     private static final Set<String> SKIPPED_PSEUDO_MODULES = new HashSet<String>(Arrays.asList(
>+             "org.eclipse.osgi",
>+             "org.netbeans.core.netigso",
>+-            "org.netbeans.modules.netbinox",
>+             "org.netbeans.libs.osgi",
>+             "org.netbeans.libs.felix"
>+     ));
>+diff -Nru netbeans-platform-7.2.1/nbbuild/cluster.properties netbeans-platform-7.2.1-gil/nbbuild/cluster.properties
>+--- netbeans-platform-7.2.1/nbbuild/cluster.properties	2012-10-10 11:02:28.000000000 +0200
>++++ netbeans-platform-7.2.1-gil/nbbuild/cluster.properties	2012-12-10 09:16:01.202767767 +0100
>+@@ -184,7 +184,6 @@
>+         masterfs.macosx,\
>+         masterfs.solaris,\
>+         masterfs.windows,\
>+-        netbinox,\
>+         o.jdesktop.layout,\
>+         o.n.bootstrap,\
>+         o.n.core,\
>+diff -Nru netbeans-platform-7.2.1/nbbuild/hudson/core-main netbeans-platform-7.2.1-gil/nbbuild/hudson/core-main
>+--- netbeans-platform-7.2.1/nbbuild/hudson/core-main	2012-10-10 11:02:28.000000000 +0200
>++++ netbeans-platform-7.2.1-gil/nbbuild/hudson/core-main	2012-12-10 09:16:01.210767346 +0100
>+@@ -62,7 +62,6 @@
>+ maven.model,\
>+ maven.osgi,\
>+ nbjunit,\
>+-netbinox,\
>+ o.apache.tools.ant.module,\
>+ o.n.bootstrap,\
>+ o.n.core,\
>diff --git a/netbeans-platform-7.2.1-remove-binaries-from-release.patch b/netbeans-platform-7.2.1-remove-binaries-from-release.patch
>new file mode 100644
>index 0000000..b503905
>--- /dev/null
>+++ b/netbeans-platform-7.2.1-remove-binaries-from-release.patch
>@@ -0,0 +1,17 @@
>+--- o.n.bootstrap/nbproject/project.properties	2012-10-10 11:02:34.000000000 +0200
>++++ o.n.bootstrap/nbproject/project.properties-gil	2012-12-10 07:16:17.077030224 +0100
>+@@ -45,10 +45,10 @@
>+ module.jar.dir=lib
>+ module.jar.basename=boot.jar
>+ release.launcher/unix/nbexec=lib/nbexec
>+-release.launcher/windows/nbexec.exe=lib/nbexec.exe
>+-release.launcher/windows/nbexec64.exe=lib/nbexec64.exe
>+-release.launcher/windows/nbexec.dll=lib/nbexec.dll
>+-release.launcher/windows/nbexec64.dll=lib/nbexec64.dll
>++# release.launcher/windows/nbexec.exe=lib/nbexec.exe
>++# release.launcher/windows/nbexec64.exe=lib/nbexec64.exe
>++# release.launcher/windows/nbexec.dll=lib/nbexec.dll
>++# release.launcher/windows/nbexec64.dll=lib/nbexec64.dll
>+ nbm.executable.files=lib/nbexec
>+ 
>+ javadoc.arch=${basedir}/arch.xml
>diff --git a/netbeans-platform-7.2.1-remove-docs-libs-testng.patch b/netbeans-platform-7.2.1-remove-docs-libs-testng.patch
>new file mode 100644
>index 0000000..07fb2a7
>--- /dev/null
>+++ b/netbeans-platform-7.2.1-remove-docs-libs-testng.patch
>@@ -0,0 +1,13 @@
>+--- libs.testng/nbproject/project.properties	2012-10-10 11:02:18.000000000 +0200
>++++ libs.testng/nbproject/project.properties-gil	2012-12-10 07:59:24.649728400 +0100
>+@@ -42,9 +42,8 @@
>+ 
>+ is.autoload=true
>+ release.external/testng-6.5.1-dist.jar=modules/ext/testng-6.5.1-dist.jar
>+-release.external/testng-6.5.1-javadoc.zip=docs/testng-6.5.1-javadoc.zip
>++# release.external/testng-6.5.1-javadoc.zip=docs/testng-6.5.1-javadoc.zip
>+ sigtest.skip.check=true
>+ sigtest.fail.on.error=false
>+ jnlp.indirect.jars=\
>+-    docs/testng-6.5.1-javadoc.zip,\
>+     modules/ext/testng-6.5.1-dist.jar
>diff --git a/netbeans-platform-7.2.1-remove-non-linux-jna-bits.patch b/netbeans-platform-7.2.1-remove-non-linux-jna-bits.patch
>new file mode 100644
>index 0000000..e5afecc
>--- /dev/null
>+++ b/netbeans-platform-7.2.1-remove-non-linux-jna-bits.patch
>@@ -0,0 +1,21 @@
>+--- libs.jna/nbproject/project.properties	2012-10-10 11:02:18.000000000 +0200
>++++ libs.jna/nbproject/project.properties-gil	2012-12-10 07:28:32.069396262 +0100
>+@@ -43,11 +43,13 @@
>+ javac.source=1.6
>+ release.external/jna-3.4.0.jar=modules/ext/jna-3.4.0.jar
>+ # Do not forget to rename native libs being extracted from the JAR when upgrading the JNA library, and patch org.netbeans.libs.jna.Installer as well.
>+-release.external/jna-3.4.0.jar!/com/sun/jna/darwin/libjnidispatch.jnilib=modules/lib/libjnidispatch-340.jnilib
>+-release.external/jna-3.4.0.jar!/com/sun/jna/linux-amd64/libjnidispatch.so=modules/lib/amd64/linux/libjnidispatch-340.so
>+-release.external/jna-3.4.0.jar!/com/sun/jna/linux-i386/libjnidispatch.so=modules/lib/i386/linux/libjnidispatch-340.so
>+-release.external/jna-3.4.0.jar!/com/sun/jna/win32-amd64/jnidispatch.dll=modules/lib/amd64/jnidispatch-340.dll
>+-release.external/jna-3.4.0.jar!/com/sun/jna/win32-x86/jnidispatch.dll=modules/lib/x86/jnidispatch-340.dll
>++# release.external/jna-3.4.0.jar!/com/sun/jna/darwin/libjnidispatch.jnilib=modules/lib/libjnidispatch-340.jnilib
>++# release.external/jna-3.4.0.jar!/com/sun/jna/linux-amd64/libjnidispatch.so=modules/lib/amd64/linux/libjnidispatch-340.so
>++# release.external/jna-3.4.0.jar!/com/sun/jna/linux-i386/libjnidispatch.so=modules/lib/i386/linux/libjnidispatch-340.so
>++# release.external/jna-3.4.0.jar!/com/sun/jna/win32-amd64/jnidispatch.dll=modules/lib/amd64/jnidispatch-340.dll
>++# release.external/jna-3.4.0.jar!/com/sun/jna/win32-x86/jnidispatch.dll=modules/lib/x86/jnidispatch-340.dll
>++release.external/linux-amd64/libjnidispatch.so=modules/lib/amd64/Linux/libjnidispatch.so
>++release.external/linux-i386/libjnidispatch.so=modules/lib/i386/Linux/libjnidispatch.so
>+ jnlp.verify.excludes=\
>+     modules/lib/amd64/jnidispatch-340.dll,\
>+     modules/lib/amd64/linux/libjnidispatch-340.so,\
>diff --git a/netbeans-platform-7.2.1-remove-non-linux-jni-libs.patch b/netbeans-platform-7.2.1-remove-non-linux-jni-libs.patch
>new file mode 100644
>index 0000000..c6aa780
>--- /dev/null
>+++ b/netbeans-platform-7.2.1-remove-non-linux-jni-libs.patch
>@@ -0,0 +1,41 @@
>+--- nbi/engine/build.xml	2012-10-10 11:02:28.000000000 +0200
>++++ nbi/engine/build.xml-gil	2012-12-10 07:32:15.568323713 +0100
>+@@ -111,37 +111,14 @@
>+ 
>+     <target name="copy-jnilibs">
>+ 	<mkdir dir="${build.classes.dir}/${native.dirname}/${native.jnilib.dir}"/>
>+-	<mkdir dir="${build.classes.dir}/${native.dirname}/${native.jnilib.dir.windows}"/>
>+ 	<mkdir dir="${build.classes.dir}/${native.dirname}/${native.jnilib.dir.linux}"/>
>+-	<mkdir dir="${build.classes.dir}/${native.dirname}/${native.jnilib.dir.solaris-sparc}"/>
>+-	<mkdir dir="${build.classes.dir}/${native.dirname}/${native.jnilib.dir.solaris-x86}"/>
>+-	<mkdir dir="${build.classes.dir}/${native.dirname}/${native.jnilib.dir.macosx}"/>
>+ 
>+-        <copy file="${native.dirname}/${native.jnilib.dir.windows}/${native.dist.dir}/${native.jnilib.file.windows.i386}" 
>+-              todir="${build.classes.dir}/${native.dirname}/${native.jnilib.dir.windows}"/>
>+-        <copy file="${native.dirname}/${native.jnilib.dir.windows}/${native.dist.dir}/${native.jnilib.file.windows.amd64}" 
>+-              todir="${build.classes.dir}/${native.dirname}/${native.jnilib.dir.windows}"/>
>+-        <copy file="${native.dirname}/${native.jnilib.dir.windows}/${native.dist.dir}/${native.jnilib.file.windows.ia64}" 
>+-              todir="${build.classes.dir}/${native.dirname}/${native.jnilib.dir.windows}"/>
>+         <copy file="${native.dirname}/${native.jnilib.dir.linux}/${native.dist.dir}/${native.jnilib.file.linux.i386}" 
>+               todir="${build.classes.dir}/${native.dirname}/${native.jnilib.dir.linux}"/>
>+-	<copy file="${native.dirname}/${native.jnilib.dir.linux}/${native.dist.dir}/${native.jnilib.file.linux.amd64}" 
>+-              todir="${build.classes.dir}/${native.dirname}/${native.jnilib.dir.linux}"/>
>+-        <copy file="${native.dirname}/${native.jnilib.dir.solaris-x86}/${native.dist.dir}/${native.jnilib.file.solaris-x86}" 
>+-              todir="${build.classes.dir}/${native.dirname}/${native.jnilib.dir.solaris-x86}"/>
>+-	<copy file="${native.dirname}/${native.jnilib.dir.solaris-x86}/${native.dist.dir}/${native.jnilib.file.solaris-amd64}" 
>+-              todir="${build.classes.dir}/${native.dirname}/${native.jnilib.dir.solaris-x86}"/>
>+-        <copy file="${native.dirname}/${native.jnilib.dir.solaris-sparc}/${native.dist.dir}/${native.jnilib.file.solaris-sparc}" 
>+-              todir="${build.classes.dir}/${native.dirname}/${native.jnilib.dir.solaris-sparc}"/>
>+-	<copy file="${native.dirname}/${native.jnilib.dir.solaris-sparc}/${native.dist.dir}/${native.jnilib.file.solaris-sparcv9}" 
>+-              todir="${build.classes.dir}/${native.dirname}/${native.jnilib.dir.solaris-sparc}"/>
>+-        <copy file="${native.dirname}/${native.jnilib.dir.macosx}/${native.dist.dir}/${native.jnilib.file.macosx}" 
>+-              todir="${build.classes.dir}/${native.dirname}/${native.jnilib.dir.macosx}"/>
>+     </target>
>+ 
>+     <target name="copy-launchers">
>+-	
>+-	<antcall target="copy-windows-launcher"/>	
>++		
>+         <antcall target="copy-unix-launcher"/>
>+ 	
>+     </target>
>diff --git a/netbeans-platform.spec b/netbeans-platform.spec
>index 6667687..5ae516f 100644
>--- a/netbeans-platform.spec
>+++ b/netbeans-platform.spec
>@@ -2,15 +2,15 @@
> %define __jar_repack %{nil}
> 
> %define nb_             netbeans
>-%define nb_major_ver    7.0
>+%define nb_major_ver    7.2
> %define nb_minor_ver    1
> %define nb_ver          %{nb_major_ver}.%{nb_minor_ver}
> 
>-%define nb_release_time 201107282000
>+%define nb_release_time 201210100934
> %define nb_home         %{_datadir}/%{nb_}
> %define nb_dir          %{nb_home}/%{nb_major_ver}
> 
>-%define nb_platform_ver  13
>+%define nb_platform_ver  16
> %define nb_platform      platform
> %define nb_platform_dir  %{nb_home}/%{nb_platform}%{nb_platform_ver}
> %define nb_platform_pkg  %{nb_}-platform
>@@ -67,24 +67,38 @@
> Name:         netbeans-platform
> Epoch:        1
> Version:      %{nb_ver}
>-Release:      6%{?dist}
>+Release:      1%{?dist}
> Summary:      NetBeans Platform
> Group:        Development/Libraries
> License:      GPLv2 with exceptions or CDDL
> URL:          http://platform.netbeans.org
> 
>-Source0: http://download.netbeans.org/%{nb_}/%{version}/final/zip/%{nb_}-%{version}-%{nb_release_time}-platform-src.zip
>+Source0: http://dlc.sun.com.edgesuite.net/%{nb_}/%{version}/final/zip/%{nb_}-%{version}-%{nb_release_time}-platform-src.zip
>+Source1: http://bits.netbeans.org/maven2/org/netbeans/api/org-openide-util-lookup/RELEASE721/org-openide-util-lookup-RELEASE721.pom
>+Source2: http://bits.netbeans.org/maven2/org/netbeans/api/org-netbeans-swing-outline/RELEASE721/org-netbeans-swing-outline-RELEASE721.pom
>+Source3: http://bits.netbeans.org/maven2/org/netbeans/api/org-netbeans-swing-plaf/RELEASE721/org-netbeans-swing-plaf-RELEASE721.pom
>+# org-netbeans-swing-tabcontrol RELEASE721 dependencies:
>+Source4: http://bits.netbeans.org/maven2/org/netbeans/api/org-openide-awt/RELEASE721/org-openide-awt-RELEASE721.pom
>+Source5: http://bits.netbeans.org/maven2/org/netbeans/api/org-openide-util/RELEASE721/org-openide-util-RELEASE721.pom
>+Source6: http://bits.netbeans.org/maven2/org/netbeans/api/org-openide-filesystems/RELEASE721/org-openide-filesystems-RELEASE721.pom
>+Source7: http://bits.netbeans.org/maven2/org/netbeans/api/org-openide-nodes/RELEASE721/org-openide-nodes-RELEASE721.pom
>+Source8: http://bits.netbeans.org/maven2/org/netbeans/api/org-openide-dialogs/RELEASE721/org-openide-dialogs-RELEASE721.pom
>+Source9: http://bits.netbeans.org/maven2/org/netbeans/api/org-netbeans-api-progress/RELEASE721/org-netbeans-api-progress-RELEASE721.pom
>+Source10: http://bits.netbeans.org/maven2/org/netbeans/api/org-openide-windows/RELEASE721/org-openide-windows-RELEASE721.pom
>+Source11: http://bits.netbeans.org/maven2/org/netbeans/api/org-netbeans-swing-tabcontrol/RELEASE721/org-netbeans-swing-tabcontrol-RELEASE721.pom
>+Source12: http://bits.netbeans.org/maven2/org/netbeans/api/org-netbeans-api-annotations-common/RELEASE721/org-netbeans-api-annotations-common-RELEASE721.pom
>+
> 
> # Avoids copying the external binaries
> # (*.exe *.dll) from the o.n.bootstrup/build.xml
>-Patch0: remove-binaries-from-release.patch
>+Patch0: netbeans-platform-7.2.1-remove-binaries-from-release.patch
> # Avoid looking for non-linux jna bits
>-Patch1: remove-non-linux-jna-bits.patch
>+Patch1: netbeans-platform-7.2.1-remove-non-linux-jna-bits.patch
> # Prevents from releasing zip files (swing-layout-1.0.4-doc.zip,
> # swing-layout-1.0.4-src.zip) in the o.jdesktop.layout module
> Patch2: remove-swing-layout-src.patch
> # Do not copy non-linux jni libaries
>-Patch3: remove-non-linux-jni-libs.patch
>+Patch3: netbeans-platform-7.2.1-remove-non-linux-jni-libs.patch
> # Build native libraries
> Patch4: build-native-code.patch
> # Fix path to native build dir
>@@ -96,6 +110,9 @@ Patch6: jnilib-build-uniformly-across-archs.patch
> Patch7: do-not-name-sos-based-on-arch.patch
> # Do not build windows cleaners
> Patch8: no-windows-cleaners.patch
>+Patch9: netbeans-platform-7.2.1-remove-docs-libs-testng.patch
>+
>+Patch10: netbeans-platform-7.2.1-00-disable-netbinox.patch
> 
> BuildRequires: jpackage-utils
> BuildRequires: java-devel >= 1:1.6.0
>@@ -117,6 +134,9 @@ BuildRequires: jakarta-oro >= 2.0.8
> BuildRequires: jemmy >= 2.3.0.0
> BuildRequires: swing-layout >= 1.0
> BuildRequires: stringtemplate
>+#BuildRequires: eclipse-equinox-osgi
>+BuildRequires: testng
>+BuildRequires: gcc
> 
> Requires: jpackage-utils
> Requires: java >= 1:1.6.0
>@@ -129,6 +149,8 @@ Requires: felix-osgi-core >= 1.4.0
> Requires: felix-osgi-compendium >= 1.4.0
> Requires: felix-main >= 2.0.5
> Requires: felix-framework >= 2.0.5
>+#Requires: eclipse-equinox-osgi
>+Requires: testng
> 
> Provides: %{nb_platform_vpkg} = %{epoch}:%{version}-%{release}
> 
>@@ -183,13 +205,13 @@ build an application on top of NetBeans Platform
> # To build the netbeans modules the system JARs will be used instead of pre-packaged ones
> %lnSys %{_javadir}/javahelp2.jar     javahelp/external/jhall-2.0_05.jar
> %lnSys %{_javadir}/jemmy.jar         jemmy/external/jemmy-2.3.0.0.jar
>-%lnSys %{_javadir}/jna.jar           libs.jna/external/jna-3.2.7.jar
>+%lnSys %{_javadir}/jna.jar           libs.jna/external/jna-3.4.0.jar
> mkdir -p libs.jna/external/linux-amd64
> mkdir -p libs.jna/external/linux-i386
> %lnSys %{_libdir}/jna/libjnidispatch.so libs.jna/external/linux-amd64/libjnidispatch.so
> %lnSys %{_libdir}/jna/libjnidispatch.so libs.jna/external/linux-i386/libjnidispatch.so         
> 
>-%lnSys %{_javadir}/junit4.jar        libs.junit4/external/junit-4.8.2.jar
>+%lnSys %{_javadir}/junit4.jar        libs.junit4/external/junit-4.10.jar
> %lnSys %{_javadir}/swing-layout.jar  o.jdesktop.layout/external/swing-layout-1.0.4.jar
> 
> pushd apisupport.harness/external
>@@ -197,31 +219,39 @@ pushd apisupport.harness/external
>   %lnSys %{_javadir}/bindex.jar bindex-2.2.jar
> popd
> pushd core.nativeaccess/external
>-  #%lnSys %{_javadir}/jna.jar platform-3.2.7.jar
>-  %lnSys %{_javadir}/jna/platform.jar platform-3.2.7.jar 
>+  %lnSys %{_javadir}/jna/platform.jar platform-3.4.0.jar 
> popd
> pushd libs.antlr3.devel/external
>-  %lnSys %{_javadir}/antlr3-runtime.jar antlr-3.1.3.jar
>+  %lnSys %{_javadir}/antlr3-runtime.jar antlr-3.3.jar
>   %lnSys %{_javadir}/stringtemplate.jar stringtemplate-3.2.jar
> popd
> pushd libs.felix/external
>-  %lnSys %{_javadir}/felix/org.apache.felix.framework.jar felix-2.0.3.jar
>-  %lnSys %{_javadir}/felix/org.apache.felix.main.jar felix-main-2.0.2.jar
>+  %lnSys %{_javadir}/felix/org.apache.felix.framework.jar felix-4.0.2.jar
>+  %lnSys %{_javadir}/felix/org.apache.felix.main.jar felix-main-4.0.2.jar
> popd
> pushd libs.osgi/external
>-  %lnSys %{_javadir}/felix/org.osgi.core.jar osgi.core-4.2.jar
>+  %lnSys %{_javadir}/felix/org.osgi.core.jar osgi.core-4.3.jar
>   %lnSys %{_javadir}/felix/org.osgi.compendium.jar osgi.cmpn-4.2.jar
> popd
> 
>-%patch0 -p1
>-%patch1 -p1
>+pushd libs.testng/external
>+  %lnSys %{_javadir}/testng.jar testng-6.5.1-dist.jar
>+popd
>+#pushd netbinox/external
>+#  %%lnSys %%{_javadir}/eclipse/osgi.jar org.eclipse.osgi_3.7.1.R37x_v20110808-1106.jar
>+#popd
>+
>+%patch0 -p0
>+%patch1 -p0
> %patch2 -p1
>-%patch3 -p1
>+%patch3 -p0
> %patch4 -p1
> %patch5 -p1
> %patch6 -p1
> %patch7 -p1
> %patch8 -p1
>+%patch9 -p0
>+%patch10 -p1
> 
> %build
> 
>@@ -255,15 +285,17 @@ sendopts,options.api,editor.mimelookup \
> 
> # linking the platform to the system JARs
> pushd %{buildroot}%{nb_platform_dir}/modules/ext
>-  %lnSys %{_javadir}/felix/org.apache.felix.framework.jar felix-2.0.3.jar
>-  %lnSys %{_javadir}/felix/org.apache.felix.main.jar felix-main-2.0.2.jar
>+  %lnSys %{_javadir}/felix/org.apache.felix.framework.jar felix-4.0.2.jar
>+  %lnSys %{_javadir}/felix/org.apache.felix.main.jar felix-main-4.0.2.jar
>   %lnSys %{_javadir}/javahelp2.jar    jhall-2.0_05.jar
>-  %lnSys %{_javadir}/jna.jar          jna-3.2.7.jar
>-  %lnSys %{_javadir}/jna/platform.jar platform-3.2.7.jar
>-  %lnSys %{_javadir}/junit4.jar       junit-4.5.jar
>+  %lnSys %{_javadir}/jna.jar          jna-3.4.0.jar
>+  %lnSys %{_javadir}/jna/platform.jar platform-3.4.0.jar
>+  %lnSys %{_javadir}/junit4.jar       junit-4.10.jar
>   %lnSys %{_javadir}/felix/org.osgi.compendium.jar osgi.cmpn-4.2.jar
>-  %lnSys %{_javadir}/felix/org.osgi.core.jar osgi.core-4.2.jar
>+  %lnSys %{_javadir}/felix/org.osgi.core.jar osgi.core-4.3.jar
>   %lnSys %{_javadir}/swing-layout.jar swing-layout-1.0.4.jar
>+#  %%lnSys %%{_javadir}/eclipse/osgi.jar org.eclipse.osgi_3.7.1.R37x_v20110808-1106.jar
>+  %lnSys %{_javadir}/testng.jar testng-6.5.1-dist.jar
> popd
> pushd %{buildroot}%{nb_platform_dir}/modules/lib
>   %lnSys %{_libdir}/jna/libjnidispatch.so amd64/Linux/libjnidispatch.so
>@@ -272,12 +304,20 @@ popd
> 
> # link system jars to platform
> %{__mkdir_p} %{buildroot}%{_javadir}/netbeans
>-%{__ln_s} %{nb_platform_dir}/modules/org-netbeans-swing-outline.jar \
>-  %{buildroot}%{_javadir}/netbeans/swing-outline.jar
>-%{__ln_s} %{nb_platform_dir}/modules/org-netbeans-swing-plaf.jar \
>-  %{buildroot}%{_javadir}/netbeans/swing-plaf.jar
>-%{__ln_s} %{nb_platform_dir}/modules/org-netbeans-swing-tabcontrol.jar \
>-  %{buildroot}%{_javadir}/netbeans/swing-tabcontrol.jar
>+pushd %{buildroot}%{_javadir}/netbeans
>+  %{__ln_s} ../../../../%{nb_platform_dir}/core/org-openide-filesystems.jar openide-filesystems.jar
>+  %{__ln_s} ../../../../%{nb_platform_dir}/modules/org-netbeans-api-annotations-common.jar api-annotations-common.jar
>+  %{__ln_s} ../../../../%{nb_platform_dir}/modules/org-netbeans-api-progress.jar api-progress.jar
>+  %{__ln_s} ../../../../%{nb_platform_dir}/modules/org-netbeans-swing-outline.jar swing-outline.jar
>+  %{__ln_s} ../../../../%{nb_platform_dir}/modules/org-netbeans-swing-plaf.jar swing-plaf.jar
>+  %{__ln_s} ../../../../%{nb_platform_dir}/modules/org-netbeans-swing-tabcontrol.jar swing-tabcontrol.jar
>+  %{__ln_s} ../../../../%{nb_platform_dir}/modules/org-openide-awt.jar openide-awt.jar
>+  %{__ln_s} ../../../../%{nb_platform_dir}/modules/org-openide-dialogs.jar openide-dialogs.jar
>+  %{__ln_s} ../../../../%{nb_platform_dir}/modules/org-openide-nodes.jar openide-nodes.jar
>+  %{__ln_s} ../../../../%{nb_platform_dir}/modules/org-openide-windows.jar openide-windows.jar
>+  %{__ln_s} ../../../../%{nb_platform_dir}/lib/org-openide-util.jar openide-util.jar
>+  %{__ln_s} ../../../../%{nb_platform_dir}/lib/org-openide-util-lookup.jar openide-util-lookup.jar
>+popd
> 
> # install harness
> %__mkdir_p %{buildroot}%{nb_harness_dir}
>@@ -298,6 +338,42 @@ popd
> %__mkdir_p %{buildroot}%{nb_javadoc_dir}
> %__cp -pr nbbuild/build/javadoc/* %{buildroot}%{nb_javadoc_dir}
> 
>+%__mkdir_p %{buildroot}%{_mavenpomdir}
>+install -pm 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP.netbeans-openide-util-lookup.pom
>+%add_maven_depmap JPP.netbeans-openide-util-lookup.pom netbeans/openide-util-lookup.jar -a "org.netbeans:openide-lookup"
>+
>+install -pm 644 %{SOURCE2} %{buildroot}%{_mavenpomdir}/JPP.netbeans-swing-outline.pom
>+%add_maven_depmap JPP.netbeans-swing-outline.pom netbeans/swing-outline.jar
>+
>+install -pm 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP.netbeans-swing-plaf.pom
>+%add_maven_depmap JPP.netbeans-swing-plaf.pom netbeans/swing-plaf.jar
>+
>+install -pm 644 %{SOURCE4} %{buildroot}%{_mavenpomdir}/JPP.netbeans-openide-awt.pom
>+%add_maven_depmap JPP.netbeans-openide-awt.pom netbeans/openide-awt.jar
>+
>+install -pm 644 %{SOURCE5} %{buildroot}%{_mavenpomdir}/JPP.netbeans-openide-util.pom
>+%add_maven_depmap JPP.netbeans-openide-util.pom netbeans/openide-util.jar
>+
>+install -pm 644 %{SOURCE6} %{buildroot}%{_mavenpomdir}/JPP.netbeans-openide-filesystems.pom
>+%add_maven_depmap JPP.netbeans-openide-filesystems.pom netbeans/openide-filesystems.jar
>+
>+install -pm 644 %{SOURCE7} %{buildroot}%{_mavenpomdir}/JPP.netbeans-openide-nodes.pom
>+%add_maven_depmap JPP.netbeans-openide-nodes.pom netbeans/openide-nodes.jar
>+
>+install -pm 644 %{SOURCE8} %{buildroot}%{_mavenpomdir}/JPP.netbeans-openide-dialogs.pom
>+%add_maven_depmap JPP.netbeans-openide-dialogs.pom netbeans/openide-dialogs.jar
>+
>+install -pm 644 %{SOURCE9} %{buildroot}%{_mavenpomdir}/JPP.netbeans-api-progress.pom
>+%add_maven_depmap JPP.netbeans-api-progress.pom netbeans/api-progress.jar
>+
>+install -pm 644 %{SOURCE10} %{buildroot}%{_mavenpomdir}/JPP.netbeans-openide-windows.pom
>+%add_maven_depmap JPP.netbeans-openide-windows.pom netbeans/openide-windows.jar
>+
>+install -pm 644 %{SOURCE11} %{buildroot}%{_mavenpomdir}/JPP.netbeans-swing-tabcontrol.pom
>+%add_maven_depmap JPP.netbeans-swing-tabcontrol.pom netbeans/swing-tabcontrol.jar
>+
>+install -pm 644 %{SOURCE12} %{buildroot}%{_mavenpomdir}/JPP.netbeans-api-annotations-common.pom
>+%add_maven_depmap JPP.netbeans-api-annotations-common.pom netbeans/api-annotations-common.jar
> 
> %files
> %defattr(-,root,root,-)
>@@ -317,9 +393,20 @@ popd
> %{nb_platform_dir}/VERSION.txt
> %{nb_platform_dir}/.noautoupdate
> %{nb_platform_dir}/.lastModified
>+%{_javadir}/netbeans/api-annotations-common.jar
>+%{_javadir}/netbeans/api-progress.jar
>+%{_javadir}/netbeans/openide-awt.jar
>+%{_javadir}/netbeans/openide-dialogs.jar
>+%{_javadir}/netbeans/openide-filesystems.jar
>+%{_javadir}/netbeans/openide-nodes.jar
>+%{_javadir}/netbeans/openide-util.jar
>+%{_javadir}/netbeans/openide-util-lookup.jar
>+%{_javadir}/netbeans/openide-windows.jar
> %{_javadir}/netbeans/swing-outline.jar
> %{_javadir}/netbeans/swing-plaf.jar
> %{_javadir}/netbeans/swing-tabcontrol.jar
>+%{_mavenpomdir}/*
>+%{_mavendepmapfragdir}/*
> 
> %files %{nb_harness}
> %defattr(-,root,root,-)
>@@ -352,6 +439,9 @@ popd
> %doc nbbuild/licenses/CDDL-GPL-2-CP
> 
> %changelog
>+* Mon Dec 10 2012 gil cattaneo <puntogil@libero.it> - 1:7.2.1-1
>+- Update to 7.2.1
>+
> * Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:7.0.1-6
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
> 
>diff --git a/sources b/sources
>index 01038c1..443004d 100644
>--- a/sources
>+++ b/sources
>@@ -1 +1,13 @@
>-6ebf5145b3abb59f0b1567dd42a00a14  netbeans-7.0.1-201107282000-platform-src.zip
>+078d5d58a2e86db766b4b7d201169aa4  netbeans-7.2.1-201210100934-platform-src.zip
>+f6aeb0fa41e84ef494906a8228bd55bb  org-netbeans-api-annotations-common-RELEASE721.pom
>+a5780e7c353e3c5735bfa61d553037eb  org-netbeans-api-progress-RELEASE721.pom
>+7749f9d9ba7b4c1b3d74b8804c3059c6  org-netbeans-swing-outline-RELEASE721.pom
>+627c19ca025e899bfbf14cb057b0f67f  org-netbeans-swing-plaf-RELEASE721.pom
>+6eb12d55abd1c33b624347de3e804b02  org-netbeans-swing-tabcontrol-RELEASE721.pom
>+f864759bdf2423b9d58437a37f9b6664  org-openide-awt-RELEASE721.pom
>+60213e8a4b721058844335dec72c7d5b  org-openide-dialogs-RELEASE721.pom
>+ba81d7b0b335e6200b2c7168c21c4f3f  org-openide-filesystems-RELEASE721.pom
>+9666180197db66c8ffc66f1bc242506f  org-openide-nodes-RELEASE721.pom
>+e00796f2fa84b48c5400f7cc209ad8d4  org-openide-util-lookup-RELEASE721.pom
>+a081e2deeb5c326502c014c57aabf41f  org-openide-util-RELEASE721.pom
>+5d13d1a5a2f07d5b430c32312a6ddda0  org-openide-windows-RELEASE721.pom
>-- 
>1.8.0.1
>

Actions: View | Diff

Attachments on bug 885675: 660747 | 675065