Attachment 825068 Details for Bug 1027609 – update to 2.3.1.1

[patch] update to 2.3.1.1

0001-update-to-2.3.1.1.patch (text/plain), 6.17 KB, created by gil cattaneo on 2013-11-17 06:22:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: gil cattaneo

Created: 2013-11-17 06:22:59 UTC

Size: 6.17 KB

patch

obsolete

>From bc4ea707a6548acb91bbf3ee20f73d1d4eed8a69 Mon Sep 17 00:00:00 2001
>From: gil <puntogil@libero.it>
>Date: Sun, 17 Nov 2013 07:22:02 +0100
>Subject: [PATCH] update to 2.3.1.1
>
>---
> .gitignore                  |  1 +
> jemmy-2.3.1.1-RELEASE74.pom | 10 ++++++++
> jemmy.spec                  | 62 +++++++++++++++++++++++++--------------------
> sources                     |  2 +-
> 4 files changed, 47 insertions(+), 28 deletions(-)
> create mode 100644 jemmy-2.3.1.1-RELEASE74.pom
>
>diff --git a/.gitignore b/.gitignore
>index 9379d47..0867e69 100644
>--- a/.gitignore
>+++ b/.gitignore
>@@ -1 +1,2 @@
> jemmy-2.3.0.0.tar.gz
>+/jemmy-2.3.1.1-clean.tar.xz
>diff --git a/jemmy-2.3.1.1-RELEASE74.pom b/jemmy-2.3.1.1-RELEASE74.pom
>new file mode 100644
>index 0000000..824a1fa
>--- /dev/null
>+++ b/jemmy-2.3.1.1-RELEASE74.pom
>@@ -0,0 +1,10 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
>+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
>+  <modelVersion>4.0.0</modelVersion>
>+  <groupId>org.netbeans.external</groupId>
>+  <artifactId>jemmy-2.3.1.1</artifactId>
>+  <version>RELEASE74</version>
>+  <name>Maven definition for jemmy-2.3.1.1.jar - external part of NetBeans module.</name>
>+  <description>POM and identification for artifact that was not possible to uniquely identify as a maven dependency.</description>
>+</project>
>diff --git a/jemmy.spec b/jemmy.spec
>index 38efcbc..752a994 100644
>--- a/jemmy.spec
>+++ b/jemmy.spec
>@@ -1,32 +1,32 @@
> # Prevent brp-java-repack-jars from being run.
> %global __jar_repack %{nil}
> 
>+%global namedtag RELEASE74
>+%global namedreltag -%{namedtag}
>+%global namedversion %{version}%{?namedreltag}
>+
> # Install time macros
> %global target_jar build/%{name}.jar
> %global target_javadoc build/javadoc/*
> 
> 
> Name:           jemmy
>-Version:        2.3.0.0
>-Release:        10%{?dist}
>+Version:        2.3.1.1
>+Release:        1%{?dist}
> Summary:        Java UI testing library
>-
>-Group:          Development/Libraries
>-License:        CDDL
>-URL:            https://jemmy.dev.java.net
>+License:        CDDL or GPLv2 with exceptions
>+URL:            https://jemmy.java.net/
> 
> # The source for this package was pulled from upstream's vcs.  Use the
> # following commands to generate the tarball:
>-#
>-# svn export https://jemmy.dev.java.net/svn/jemmy/trunk/Jemmy2 jemmy-2.3.0.0 --username <username>
>-# tar -czvf jemmy-2.3.0.0.tar.gz jemmy-2.3.0.0
>-#
>-# where <username> is a name of the user registered here: https://www.dev.java.net/servlets/Join
>-Source0:        jemmy-2.3.0.0.tar.gz
>-
>-# POM based on one from maven.org, with version and license info modified:
>-# http://central.maven.org/maven2/org/netbeans/jemmy/2.2.7.5/jemmy-2.2.7.5.pom
>-Source1:        %{name}.pom
>+# see src/org/netbeans/jemmy/version_info
>+# svn export https://svn.java.net/svn/jemmy~jemmy2/trunk/Jemmy2 jemmy-2.3.1.1
>+# find jemmy-2.3.1.1 -name "*.class" -delete
>+# find jemmy-2.3.1.1 -name "*.jar" -delete
>+# find jemmy-2.3.1.1 -name "*.zip" -delete
>+# tar cJf jemmy-2.3.1.1-clean.tar.xz jemmy-2.3.1.1
>+Source0:        %{name}-%{version}-clean.tar.xz
>+Source1:        http://bits.netbeans.org/nexus/content/groups/netbeans/org/netbeans/external/%{name}-%{version}/%{namedtag}/%{name}-%{namedversion}.pom
> 
> BuildRequires:  ant >= 1.6.5
> BuildRequires:  java-devel >= 1:1.6.0
>@@ -46,18 +46,20 @@ to use all the flexibility of high level language to capture test logic and
> also do any other operations needed to be done from test.
> 
> %package javadoc
>-Summary:        Javadocs for %{name}
>-Group:          Documentation
>-Requires:       jpackage-utils
>+Summary:        Javadoc for %{name}
> 
> %description javadoc
> This package contains the API documentation for %{name}.
> 
> %prep
> %setup -q
>-find . -type f -name '*.jar' | xargs -t rm
>+
> echo "Please, visit http://jemmy.java.net for more info about Jemmy." > README.txt
> 
>+cp -p %{SOURCE1} pom.xml
>+sed -i "s|<artifactId>%{name}-%{version}</artifactId>|<artifactId>%{name}</artifactId>|" pom.xml
>+sed -i "s|<version>%{namedtag}</version>|<version>%{version}</version>|" pom.xml
>+
> %build
> %ant jar javadoc
> 
>@@ -67,9 +69,9 @@ echo "Please, visit http://jemmy.java.net for more info about Jemmy." > README.t
> %__cp -a %{target_jar} %{buildroot}%{_javadir}/%{name}.jar
> 
> # POM
>-install -d -m 0755 $RPM_BUILD_ROOT%{_mavenpomdir}
>-install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
>-%add_maven_depmap JPP-%{name}.pom %{name}.jar
>+install -d -m 0755 %{buildroot}%{_mavenpomdir}
>+install -p -m 0644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
>+%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "org.netbeans:%{name}"
> 
> # javadoc
> %__mkdir_p %{buildroot}%{_javadocdir}/%{name}
>@@ -77,17 +79,20 @@ install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
> 
> 
> %files
>-%defattr(-,root,root,-)
> %doc README.txt
> %{_javadir}/*.jar
> %{_mavenpomdir}/*
> %{_mavendepmapfragdir}/*
> 
> %files javadoc
>-%defattr(-,root,root,-)
> %{_javadocdir}/%{name}
> 
> %changelog
>+* Fri Nov 08 2013 gil cattaneo <puntogil@libero.it> 2.3.1.1-1
>+- 2.3.1.1
>+- adapt to current guideline
>+- fix rpmlint problems
>+
> * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.0.0-10
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
> 
>@@ -111,10 +116,13 @@ install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
> * Sun Aug 02 2009 Victor Vasilyev <victor.vasilyev@sun.com> 2.3.0.0-4
> - adjust macro defs
> - svn export instead of checkout
>-* Wed Jul 30 2009 Victor Vasilyev <victor.vasilyev@sun.com> 2.3.0.0-3
>+
>+* Thu Jul 30 2009 Victor Vasilyev <victor.vasilyev@sun.com> 2.3.0.0-3
> - javadoc subpackage is added
>-* Wed Jul 30 2009 Victor Vasilyev <victor.vasilyev@sun.com> 2.3.0.0-2
>+
>+* Thu Jul 30 2009 Victor Vasilyev <victor.vasilyev@sun.com> 2.3.0.0-2
> - (B)R jpackage-utils
> - 'define' macro -> 'global' macro
>+
> * Wed Jul 29 2009 Victor Vasilyev <victor.vasilyev@sun.com> 2.3.0.0-1
> - release 2.3.0.0
>diff --git a/sources b/sources
>index f77ec2e..84173dd 100644
>--- a/sources
>+++ b/sources
>@@ -1 +1 @@
>-5175a212ed86fde706f84e1d3d256810  jemmy-2.3.0.0.tar.gz
>+7df3a9df70060f8f2be55d7b72b2d5ee  jemmy-2.3.1.1-clean.tar.xz
>-- 
>1.8.3.1
>

Actions: View | Diff

Attachments on bug 1027609: 821707 | 825056 | 825068