Attachment 653753 Details for Bug 881395 – Update to 1.5.2

[patch] Update to 1.5.2

0001-update-to-1.5.2.patch (text/plain), 7.55 KB, created by gil cattaneo on 2012-11-28 21:02:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: gil cattaneo

Created: 2012-11-28 21:02:51 UTC

Size: 7.55 KB

patch

obsolete

>From 7baefb900582ec617f43ee72a1e5ff02cf84ab22 Mon Sep 17 00:00:00 2001
>From: gil <puntogil@libero.it>
>Date: Wed, 28 Nov 2012 22:02:02 +0100
>Subject: [PATCH] update to 1.5.2
>
>---
> .gitignore                                    |    1 +
> sources                                       |    2 +-
> vecmath-1.5.2-fix-incorrect-fsf-address.patch |   22 +++++
> vecmath-1.5.2-javadoc-link.patch              |   10 ++
> vecmath-1.5.2.pom                             |    8 ++
> vecmath.spec                                  |  122 +++++++++++++++++--------
> 6 files changed, 126 insertions(+), 39 deletions(-)
> create mode 100644 vecmath-1.5.2-fix-incorrect-fsf-address.patch
> create mode 100644 vecmath-1.5.2-javadoc-link.patch
> create mode 100644 vecmath-1.5.2.pom
>
>diff --git a/.gitignore b/.gitignore
>index 3741b63..cf38cfd 100644
>--- a/.gitignore
>+++ b/.gitignore
>@@ -1 +1,2 @@
> vecmath-20090922.tar.bz2
>+/vecmath-1.5.2-clean-src-svn.tar.gz
>diff --git a/sources b/sources
>index 6b6bd4f..fb8f86a 100644
>--- a/sources
>+++ b/sources
>@@ -1 +1 @@
>-0bf68079840358b3606f7b8833d26857  vecmath-20090922.tar.bz2
>+3c14389a28ee4e297a4bfe44cfdc5b90  vecmath-1.5.2-clean-src-svn.tar.gz
>diff --git a/vecmath-1.5.2-fix-incorrect-fsf-address.patch b/vecmath-1.5.2-fix-incorrect-fsf-address.patch
>new file mode 100644
>index 0000000..cf861dc
>--- /dev/null
>+++ b/vecmath-1.5.2-fix-incorrect-fsf-address.patch
>@@ -0,0 +1,22 @@
>+--- vecmath/LICENSE.txt	2008-02-28 21:18:51.000000000 +0100
>++++ vecmath/LICENSE.txt-gil	2012-11-28 21:06:34.586611326 +0100
>+@@ -3,7 +3,7 @@
>+ Version 2, June 1991
>+ 
>+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
>+-59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
>++51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
>+ 
>+ Everyone is permitted to copy and distribute verbatim copies of this license
>+ document, but changing it is not allowed.
>+@@ -287,8 +287,8 @@
>+     more details.
>+ 
>+     You should have received a copy of the GNU General Public License along
>+-    with this program; if not, write to the Free Software Foundation, Inc., 59
>+-    Temple Place, Suite 330, Boston, MA 02111-1307 USA
>++    with this program; if not, write to the Free Software Foundation, Inc., 51
>++    Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
>+ 
>+ Also add information on how to contact you by electronic and paper mail.
>+ 
>diff --git a/vecmath-1.5.2-javadoc-link.patch b/vecmath-1.5.2-javadoc-link.patch
>new file mode 100644
>index 0000000..acfca07
>--- /dev/null
>+++ b/vecmath-1.5.2-javadoc-link.patch
>@@ -0,0 +1,10 @@
>+--- vecmath/build.xml	2008-02-28 21:18:51.000000000 +0100
>++++ vecmath/build.xml-gil	2012-11-28 20:53:54.171726954 +0100
>+@@ -185,6 +185,7 @@
>+ 	     maxmemory="128m"
>+              destdir="${build}/javadocs"
>+              windowtitle="Vecmath ${version}">
>++             <link href="/usr/share/javadoc/java/" />
>+     </javadoc>
>+ 
>+     
>diff --git a/vecmath-1.5.2.pom b/vecmath-1.5.2.pom
>new file mode 100644
>index 0000000..50bf5e2
>--- /dev/null
>+++ b/vecmath-1.5.2.pom
>@@ -0,0 +1,8 @@
>+<project>
>+  <modelVersion>4.0.0</modelVersion>
>+  <groupId>java3d</groupId>
>+  <artifactId>vecmath</artifactId>
>+  <name>vecmath</name>
>+  <version>1.5.2</version>
>+  <url>http://java.sun.com/products/java-media/3D/</url>
>+</project>
>\ No newline at end of file
>diff --git a/vecmath.spec b/vecmath.spec
>index e8ec62f..20991c5 100644
>--- a/vecmath.spec
>+++ b/vecmath.spec
>@@ -1,56 +1,102 @@
>-%global tardate 20090922
>-
>-Name:		vecmath
>-Version:	0
>-Release:	5.%{tardate}cvs%{?dist}
>-Summary:	The 3D vector math Java package, javax.vecmath
>-Group:		Development/Libraries
>+Name:          vecmath
>+Version:       1.5.2
>+Release:       1%{?dist}
>+Summary:       The 3D vector math Java package, javax.vecmath
>+Group:         Development/Libraries
> # License is GNU General Public License, version 2, with the Classpath Exception
>-License:	GPLv2 with exceptions
>-URL:		https://vecmath.dev.java.net/
>-## Source pulled from upstream CVS.
>-# https://vecmath.dev.java.net/servlets/ProjectSource
>-## Tarball created with
>-## (you need to create a username)
>-# cvs -d :pserver:username@cvs.dev.java.net:/cvs login
>-# cvs -d :pserver:username@cvs.dev.java.net:/cvs checkout vecmath
>-# tar cf vecmath-%{tardate}.tar vecmath
>-# xz vecmath-%{tardate}.tar
>-Source0:	%{name}-%{tardate}.tar.bz2
>-BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
>-BuildArch:	noarch
>-
>-BuildRequires:	ant
>-BuildRequires:	java-devel >= 1:1.6.0
>-BuildRequires:	jpackage-utils
>-
>-Requires:	java >= 1:1.6.0
>-Requires:	jpackage-utils
>+License:       GPLv2 with exceptions
>+URL:           http://java.net/projects/vecmath
>+# svn export https://svn.java.net/svn/vecmath~svn/tags/rel-1_5_2-fcs vecmath-1.5.2/vecmath
>+# svn export https://svn.java.net/svn/vecmath-test~svn/tags/rel-1_5_2-fcs vecmath-1.5.2/vecmath-test
>+# find vecmath-1.5.2 -name "*.class" -delete
>+# find vecmath-1.5.2 -name "*.jar" -delete
>+# find vecmath-1.5.2 -name "*.so" -delete
>+# find vecmath-1.5.2 -name "unzip*" -delete
>+# tar czf vecmath-1.5.2-clean-src-svn.tar.gz vecmath-1.5.2
>+Source0:       %{name}-%{version}-clean-src-svn.tar.gz
>+# originally taken from http://repo1.maven.org/maven2/java3d/
>+Source1:       %{name}-%{version}.pom
>+Patch0:        %{name}-%{version}-javadoc-link.patch
>+Patch1:        %{name}-%{version}-fix-incorrect-fsf-address.patch
>+
>+BuildArch:     noarch
>+
>+BuildRequires: ant
>+BuildRequires: ant-junit
>+BuildRequires: junit
>+BuildRequires: java-devel >= 1:1.6.0
>+BuildRequires: java-javadoc
>+BuildRequires: jpackage-utils
>+
>+Requires:      java >= 1:1.6.0
>+Requires:      jpackage-utils
> 
> %description
> The 3D vector math Java package, javax.vecmath.
> 
>+%package javadoc
>+Group:         Documentation
>+Summary:       Javadoc for %{name}
>+Requires:      jpackage-utils
>+
>+%description javadoc
>+This package contains javadoc for %{name}.
>+
> %prep
>-%setup -q -n %{name}
>-find -name '*.class' -exec rm -f '{}' \;
>-find -name '*.jar' -exec rm -f '{}' \;
>+%setup -q
>+%patch0 -p0
>+%patch1 -p0
>+
>+iconv -f iso8859-1 -t utf-8 vecmath/COPYRIGHT.txt > vecmath/COPYRIGHT.txt.conv && mv -f vecmath/COPYRIGHT.txt.conv vecmath/COPYRIGHT.txt
>+sed -i 's/\r//' vecmath/COPYRIGHT.txt vecmath/LICENSE.txt
>+
>+cp -pr vecmath/docs .
>+cp -p vecmath/COPYRIGHT.txt .
>+cp -p vecmath/LICENSE.txt .
>+cp -p vecmath/LICENSE-SPEC.html .
> 
> %build
>-ant
>+
>+(
>+  cd %{name}
>+  %ant jar docs
>+)
> 
> %install
>-rm -rf %{buildroot}
>-install -D -p -m 644 build/debug/lib/ext/vecmath.jar %{buildroot}%{_javadir}/vecmath.jar
> 
>-%clean
>-rm -rf %{buildroot} 
>+install -D -p -m 644 %{name}/build/opt/lib/ext/%{name}.jar %{buildroot}%{_javadir}/%{name}.jar
>+
>+mkdir -p %{buildroot}%{_mavenpomdir}
>+install -pm 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
>+%add_maven_depmap
>+
>+mkdir -p %{buildroot}%{_javadocdir}/%{name}
>+cp -a %{name}/build/javadocs/* %{buildroot}%{_javadocdir}/%{name}
>+
>+%check
>+(
>+  cd %{name}-test
>+  export CLASSPATH=$(build-classpath junit)
>+  %ant test
>+)
> 
> %files
>-%defattr(-,root,root,-)
>-%doc docs/api-changes* LICENSE.txt LICENSE-SPEC.html
>-%{_javadir}/vecmath.jar
>+%doc docs/api-changes* COPYRIGHT.txt LICENSE.txt LICENSE-SPEC.html
>+%{_javadir}/%{name}.jar
>+%{_mavenpomdir}/JPP-%{name}.pom
>+%{_mavendepmapfragdir}/%{name}
>+
>+%files javadoc
>+%doc COPYRIGHT.txt LICENSE.txt LICENSE-SPEC.html
>+%{_javadocdir}/%{name}
> 
> %changelog
>+* Fri Sep 07 2012 gil cattaneo <puntogil@libero.it> 1.5.2-1
>+- Update to 1.5.2
>+- Added maven pom
>+- Adapt to current guideline
>+- Added javadoc sub package
>+
> * Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0-5.20090922cvs
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
> 
>-- 
>1.7.7.6
>

Actions: View | Diff

Attachments on bug 881395: 653739 | 653753