[Jpackage-commits] dist/javahelp2/devel .cvsignore, 1.1, 1.2 javahelp-2.0.05.pom, NONE, 1.1 javahelp2-jhindexer.sh, NONE, 1.1 javahelp2-jhsearch.sh, NONE, 1.1 javahelp2.spec, NONE, 1.1 sources, 1.1, 1.2

jpackage jpackage at ryu.zarb.org
Wed May 28 20:32:24 CEST 2008


Update of /home/projects/jpackage/cvs/dist/javahelp2/devel
In directory ryu.zarb.org:/tmp/cvs-serv27991/devel

Modified Files:
	.cvsignore sources 
Added Files:
	javahelp-2.0.05.pom javahelp2-jhindexer.sh 
	javahelp2-jhsearch.sh javahelp2.spec 
Log Message:
Import from JPP 5.0

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/javahelp2/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** .cvsignore	28 May 2008 18:31:59 -0000	1.1
--- .cvsignore	28 May 2008 18:32:22 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ javahelp2-2.0.05.tar.gz

--- NEW FILE: javahelp2-jhindexer.sh ---
#!/bin/sh
# 
# jhindexer script
# JPackage project (http://jpackage.sourceforge.net)
# $Id$

# Source functions library
. /usr/share/java-utils/java-functions

# Allow system prefs
if [ -f /etc/jhindexer.conf ] ; then 
  . /etc/jhindexer.conf
fi

# Allow user-defined prefs
if [ -f $HOME/.jhindexerrc ] ; then 
  . $HOME/.jhindexerrc
fi

# Configuration
MAIN_CLASS=com.sun.java.help.search.Indexer
BASE_JARS=javahelp

# Set parameters
set_jvm
set_classpath $BASE_JARS
set_flags $BASE_FLAGS
set_options $BASE_OPTIONS

# Let's start
run "$@"

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/javahelp2/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** sources	28 May 2008 18:31:59 -0000	1.1
--- sources	28 May 2008 18:32:22 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ 8cf4a7d6855293a673da591ce3560c52  javahelp2-2.0.05.tar.gz

--- NEW FILE: javahelp-2.0.05.pom ---
<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>javax.help</groupId>
  <artifactId>javahelp</artifactId>
  <version>2.0.05</version>
  <name>JavaHelp API</name>
  <url>http://java.sun.com/products/javahelp/index.jsp</url>
  <description>The JavaHelp API provides a platform-independent help framework.</description>
  <distributionManagement>
    <downloadUrl>http://java.sun.com/products/javahelp/downloads/index.html</downloadUrl>
  </distributionManagement>
</project>

--- NEW FILE: javahelp2-jhsearch.sh ---
#!/bin/sh
# 
# jhsearch script
# JPackage project (http://jpackage.sourceforge.net)
# $Id$

# Source functions library
. /usr/share/java-utils/java-functions

# Allow system prefs
if [ -f /etc/jhsearch.conf ] ; then 
  . /etc/jhsearch.conf
fi

# Allow user-defined prefs
if [ -f $HOME/.jhsearchrc ] ; then 
  . $HOME/.jhsearch
fi

# Configuration
MAIN_CLASS=com.sun.java.help.search.QueryEngine
BASE_JARS=javahelp

# Set parameters
set_jvm
set_classpath $BASE_JARS
set_flags $BASE_FLAGS
set_options $BASE_OPTIONS

# Let's start
run "$@"

--- NEW FILE: javahelp2.spec ---
# Copyright (c) 2000-2008, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the
#    distribution.
# 3. Neither the name of the JPackage Project nor the names of its
#    contributors may be used to endorse or promote products derived
#    from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#

%define oname			javahelp
%define section			free

Name:		javahelp2
Version:	2.0.05
Release:	1jpp
Epoch:		0
Summary:	JavaHelp
License:	GNU General Public License - Version 2 with the classpath exception
Url:		https://javahelp.dev.java.net/
Group:		Development/Libraries/Java
Vendor:		JPackage Project
Distribution:	JPackage
#
# To get the source, build it from svn repository of 
# https://javahelp.dev.java.net/ 
# using following steps:
# svn checkout https://javahelp.dev.java.net/svn/javahelp/trunk javahelp --username guest -r 46
# cd javahelp
# ant -f javahelp_nbproject/build.xml release-source -Dversion=2.0.02_svn46
# the source file will be generated into 
# javahelp_nbproject/dist/javahelp2-src-2.0.02_svn46.zip
#
Source0:	%{name}-%{version}.tar.gz
# svn export -r 59 https://javahelp.dev.java.net/svn/javahelp/trunk javahelp2-2.0.05 --username guest
Source1:	%{name}-jhindexer.sh
Source2:	%{name}-jhsearch.sh
Source3:	%{oname}-%{version}.pom
BuildArch:	noarch
Requires:	jpackage-utils >= 0:1.7.4
Requires:	jsp_api >= 0:2.0
Requires:	servlet_api >= 0:2.4
BuildRequires:	jpackage-utils >= 0:1.7.4
BuildRequires:	java-devel = 0:1.5.0
BuildRequires:	ant >= 0:1.6.5
BuildRequires:	ant-nodeps
BuildRequires:  jsp_2_0_api
BuildRequires:  servlet_2_4_api
BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot

Requires(post):    jpackage-utils >= 0:1.7.4
Requires(postun):  jpackage-utils >= 0:1.7.4


%description
JavaHelp software is a full-featured, platform-independent, extensible
help system that enables developers and authors to incorporate online
help in applets, components, applications, operating systems, and
devices. Authors can also use the JavaHelp software to deliver online
documentation for the Web and corporate Intranet.

%package manual
Summary:	Manual for %{name}
Group:		Development/Libraries/Java

%description manual
Documentation for %{name}.

%package javadoc
Summary:	Javadoc for %{name}
Group:		Development/Documentation

%description javadoc
Javadoc for %{name}.

%package demo
Summary:        Demo for %{name}
Group:          Development/Libraries/Java
Requires:       %{name} = %{version}-%{release}

%description demo
Demonstrations and samples for %{name}.

%prep
#%setup -q -n %{name}-%{svn_version}
%setup -q 
# fix files perms
chmod -R go=u-w *
# remove windows files
for file in `find . -type f -name .bat`; do rm -f $file; done

#
# This class provides native browser integration and would require
# JDIC project to be present. Currently there is no such jpackage.org
# package, so deleting the class. When JDIC package is created,
# add BuildProvides and remove the "rm" call.
#
rm jhMaster/JavaHelp/src/new/javax/help/plaf/basic/BasicNativeContentViewerUI.java

mkdir javahelp_nbproject/lib
ln -s %{_javadir}/jsp_2_0_api.jar javahelp_nbproject/lib/jsp-api.jar
ln -s %{_javadir}/servlet_2_4_api.jar javahelp_nbproject/lib/servlet-api.jar

%build
export JAVA_HOME=%{_jvmdir}/java-1.5.0
ant \
    -f javahelp_nbproject/build.xml \
    -Djdic-jar-present=true \
    -Djdic-zip-present=true \
    -Dservlet-jar-present=true \
    -Dtomcat-zip-present=true \
    release javadoc

%install
rm -rf $RPM_BUILD_ROOT
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
install -d -m 755 $RPM_BUILD_ROOT%{_bindir}
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/jh2indexer
install -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/jh2search

install -m 644 javahelp_nbproject/dist/lib/jhall.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
cp -pr jhMaster/JavaHelp/doc/public-spec/dtd $RPM_BUILD_ROOT%{_datadir}/%{name}
cp -pr jhMaster/JavaHelp/demos $RPM_BUILD_ROOT%{_datadir}/%{name}
cp -pr javahelp_nbproject/dist/lib/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
# create unversioned symlinks
(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} ${jar/-%{version}/}; done)

%add_to_maven_depmap javax.help %{oname} %{version} JPP %{name}

# pom
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
install -pm 644 %{SOURCE3} \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom


%clean
rm -rf $RPM_BUILD_ROOT

%post
%update_maven_depmap

%postun
%update_maven_depmap

%post javadoc
rm -f %{_javadocdir}/%{name}
ln -s %{name}-%{version} %{_javadocdir}/%{name}

%postun javadoc
if [ "$1" = "0" ]; then
    rm -f %{_javadocdir}/%{name}
fi

%files
%defattr(0644,root,root,0755)
%doc jhMaster/JavaHelp/README jhMaster/JavaHelp/README.html jhMaster/JavaHelp/LICENSE.html
%attr(0755,root,root) %{_bindir}/*
%{_javadir}/%{name}-%{version}.jar
%{_javadir}/%{name}.jar
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/dtd
%{_datadir}/maven2/poms/*
%{_mavendepmapfragdir}

%files manual
%defattr(0644,root,root,0755)
%doc jhMaster/JavaHelp/doc/public-spec/*

%files javadoc
%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}-%{version}

%files demo
%defattr(0644,root,root,0755)
%{_datadir}/%{name}/demos

%changelog
* Tue Jan 29 2008 Ralph Apel <r.apel at r-apel.de> 0:2.0.05-1jpp
- Thanks Jaroslav
- Add pom and depmap frag

* Wed Dec 20 2006 Jaroslav Tulach <Jaroslav.Tulach at Sun.COM> 0:2.0.02-2jpp
- Change License
- Include Sources
- Build from source
- Move to Free Section
- Temporarely remove the JDIC support (until we have a jdic package)

* Sat Dec 04 2004 Paolo Dona' <vik at 3jv.com> 0:2.0.02-1jpp
- upgrade to 2.0_02

* Thu Feb 12 2004 Ralph Apel <r.apel at r-apel.de> 0:2.0.01-1jpp
- change pkg name to javahelp2
- change version notation to 2.0.01
- install scripts as jh2indexer and jh2search

* Wed Jan 14 2004 Ralph Apel <r.apel at r-apel.de> 0:2.0_01-1jpp
- upgrade to 2.0_01

* Mon Mar 24 2003 David Walluck <david at anti-microsoft.org> 0:1.1.3-2jpp
- update for JPackage 1.5

* Mon Mar 24 2003 David Walluck <david at anti-microsoft.org> 1.1.3-1jpp
- 1.1.3
- no more bzip2 on scripts
- fix Id tag in scripts

* Sat May 11 2002 Guillaume Rousse <guillomovitch at users.sourceforge.net> 1.1.2-8jpp
- 1.1.2.01
- vendor, distribution, group tags
- updated scripts

* Fri Apr 05 2002 Guillaume Rousse <guillomovitch at users.sourceforge.net> 1.1.2-7jpp 
- nosrc package
- section macro

* Thu Jan 17 2002 Guillaume Rousse <guillomovitch at users.sourceforge.net> 1.1.2-6jpp
- javadoc in %{_javadocdir} again 
- additional sources in individual archives

* Fri Jan 4 2002 Guillaume Rousse <guillomovitch at users.sourceforge.net> 1.1.2-5jpp
- javadoc back to /usr/share/doc
- no dependencies for manual and javadoc packages
- stricter dependency for demo package
- removed redundant jh.jar, jhbasic.jar and jsearch.jar
- changed jhall.jar name to javasearch.jar
- changed jhtools.jar name to javasearch-tools.jar
- javasearch-tools.jar in javasearch-tools package
- used jpackage scripts
- removed windows files from demo
- standardised summary

* Fri Dec 7 2001 Guillaume Rousse <guillomovitch at users.sourceforge.net> 1.1.2-4jpp
- javadoc into javadoc package

* Sun Oct 28 2001 Guillaume Rousse <guillomovitch at users.sourceforge.net> 1.1.2-3jpp
- first unified release
- fixed perm problems

* Tue Oct 09 2001 Guillaume Rousse <guillomovitch at users.sourceforge.net> 1.1.2-2mdk
- split demo package 
- demo files in %{_datadir}/%{name}
- s/jPackage/JPackage/
- spec cleanup

* Tue Jul 24 2001 Guillaume Rousse <guillomovitch at users.sourceforge.net> 1.1.2-1mdk
- used original archives
- s/Copyright/License
- truncated despcription length to 72 columns
- versionning
- no more source package
- merged demo and manual packages

* Sat Mar 10 2001 Guillaume Rousse <g.rousse at linux-mandrake.com> 1.1.1-2mdk
- vendor tag
- packager tag
- sources in /usr/src/java

* Sun Feb 04 2001 Guillaume Rousse <g.rousse at linux-mandrake.com> 1.1.1-1mdk
- first Mandrake release




More information about the JPackage-commits mailing list