Accepting request 52359 from Java:packages

Accepted submit request 52359 from user mvyskocil

OBS-URL: https://build.opensuse.org/request/show/52359
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/regexp?expand=0&rev=8
This commit is contained in:
Ruediger Oertel 2010-11-15 16:43:57 +00:00 committed by Git OBS Bridge
parent b7b15897a9
commit 6288999138
6 changed files with 156 additions and 69 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4cff646b26b258897bf0bafe64dfb6d1422611ecbfaf4787a78f2e042be1366e
size 127069

BIN
jakarta-regexp-1.5.tar.gz (Stored with Git LFS) Normal file

Binary file not shown.

6
regexp-1.5.pom Normal file
View File

@ -0,0 +1,6 @@
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>regexp</groupId>
<artifactId>regexp</artifactId>
<version>1.5</version>
</project>

View File

@ -1,14 +0,0 @@
diff -Naur ../jakarta-regexp-1.3.orig/build.xml ./build.xml
--- ../jakarta-regexp-1.3.orig/build.xml 2003-09-02 20:56:46.000000000 +0200
+++ ./build.xml 2006-09-27 15:26:20.000000000 +0200
@@ -89,7 +89,9 @@
excludes="**/package.html"
debug="${debug}"
deprecation="${deprecation}"
- optimize="${optimize}"/>
+ optimize="${optimize}"
+ source="1.4"
+ target="1.4" />
</target>
<!-- =================================================================== -->

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Nov 8 09:57:25 UTC 2010 - mvyskocil@suse.cz
- merge with regexp-1.5-1.jpp5.src.rpm
- update to 1.5 bugfix and optimization release
http://jakarta.apache.org/regexp/changes.html
- ignore also jaxp-1.3-apis
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Jul 27 13:32:47 CEST 2008 - coolo@suse.de Sun Jul 27 13:32:47 CEST 2008 - coolo@suse.de

View File

@ -1,42 +1,59 @@
# Copyright (c) 2000-2008, JPackage Project
# All rights reserved.
# #
# spec file for package regexp (Version 1.3) # Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
# #
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # 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.
# #
# All modifications and additions to the file contributed by third parties # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# remain the property of their copyright owners, unless otherwise agreed # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# upon. The license for this file, and modifications and additions to the # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# file, is the same license as for the pristine package itself (unless the # A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# license for the pristine package is not an Open Source License, in which # OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# case the license is the MIT License). An "Open Source License" is a # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# license that conforms to the Open Source Definition (Version 1.9) # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# published by the Open Source Initiative. # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# #
# norootforbuild # norootforbuild
# icecream 0 # icecream 0
%define full_name jakarta-%{name}
%define section free
Name: regexp Name: regexp
BuildRequires: ant java-1_5_0-gcj-compat-devel xml-commons-apis-bootstrap Version: 1.5
#!BuildIgnore: xml-commons-apis xml-commons-resolver xml-commons xerces-j2 Release: 1
%define name regexp
%define full_name jakarta-%{name}
%define version 1.3
%define release 2jpp
%define section free
Version: 1.3
Release: 256
Summary: Simple regular expressions API Summary: Simple regular expressions API
License: The Apache Software License License: The Apache Software License
Group: Development/Libraries/Java Group: Development/Libraries/Java
Url: http://jakarta.apache.org/regexp/ URL: http://jakarta.apache.org/%{name}/
Source0: http://www.apache.org/dist/jakarta/regexp/jakarta-regexp-%{version}.tar.gz Source0: http://www.apache.org/dist/jakarta/regexp/jakarta-regexp-%{version}.tar.gz
Patch: %{name}-java14compat.patch Source1: regexp-%{version}.pom
BuildRequires: jpackage-utils >= 1.6
Requires(pre): jpackage-utils >= 1.6
Requires(postun): jpackage-utils >= 1.6
BuildRequires: ant >= 1.6
BuildRequires: java-1_5_0-gcj-compat-devel
BuildRequires: xml-commons-apis-bootstrap
#!BuildIgnore: xml-commons-apis xml-commons-resolver xml-commons xerces-j2
#!BuildIgnore: xml-commons-jaxp-1.3-apis
BuildArch: noarch BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: ant java-1_5_0-gcj-compat-devel xml-commons-apis-bootstrap
%description %description
Regexp is a 100% Pure Java Regular Expression package that was Regexp is a 100% Pure Java Regular Expression package that was
@ -67,12 +84,13 @@ This package contains the javadoc documentation for regexp.
%prep %prep
%setup -n %{full_name}-%{version} %setup -q -n %{full_name}-%{version}
%patch
# remove all binary libs # remove all binary libs
find . -name "*.jar" -exec rm -f {} \; find . -type f -name "*.jar" | xargs -t rm
%build %build
export OPT_JAR_LIST=:
export CLASSPATH=
mkdir lib mkdir lib
ant -Djakarta-site2.dir=. jar javadocs ant -Djakarta-site2.dir=. jar javadocs
@ -84,42 +102,111 @@ install -m 644 build/*.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
# javadoc # javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -r docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} cp -r docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
rm -rf docs/api ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
[ -d docs/api ] && rm -rf docs/api
# depmap frags
%add_to_maven_depmap %{name} %{name} %{version} JPP %{name}
# pom
%{__mkdir_p} %{buildroot}%{_datadir}/maven2/poms
%{__install} -p -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}.pom
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%post javadoc
rm -f %{_javadocdir}/%{name}
ln -s %{name}-%{version} %{_javadocdir}/%{name}
%postun javadoc
if [ "$1" = "0" ]; then
rm -f %{_javadocdir}/%{name}
fi
%files %files
%defattr(0644,root,root,0755) %defattr(0644,root,root,0755)
%doc LICENSE.txt %doc LICENSE
%{_javadir}/*.jar %{_javadir}/*.jar
%{_datadir}/maven2/poms/*
%{_mavendepmapfragdir}/*
%files javadoc %files javadoc
%defattr(0644,root,root,0755) %defattr(0644,root,root,0755)
%{_javadocdir}/%{name}-%{version} %{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
%changelog %changelog
* Sun Jul 27 2008 coolo@suse.de * Tue Nov 11 2008 David Walluck <dwalluck@redhat.com> 0:1.5-1
- build with gcj to avoid bootstrapping problems with openjdk - 1.5
* Wed Sep 27 2006 skh@suse.de - add maven support
- don't use icecream - add unversioned javadoc symlink
- use source="1.4" and target="1.4" for build with java 1.5
* Wed Jan 25 2006 mls@suse.de * Thu Feb 8 2007 Vivek Lakshmanan <vivekl at redhat.com> 0:1.4-3jpp
- converted neededforbuild to BuildRequires - Use JPackage exception compliant naming scheme
* Fri Jul 29 2005 jsmeix@suse.de - Fix RPM lint issues
- Adjustments in the spec file. - Add Requires(X) on jpackage-utils
* Mon Jul 18 2005 jsmeix@suse.de
- Current version 1.3 from JPackage.org * Fri Aug 4 2006 Vivek Lakshmanan <vivekl@redhat.com> 0:1.4-2jpp
* Thu Sep 16 2004 skh@suse.de - Add conditional native compilation with GCJ.
- Fix prerequires of javadoc subpackage - Add appropriate entries in Requires(x).
* Thu Sep 02 2004 skh@suse.de
- Initial package created with version 1.3 (JPackage 1.5) * Tue Apr 11 2006 Ralph Apel <r.apel@r-apel.de> 0:1.4-1jpp
- First JPP-1.7 release
- Upgrade to 1.4
* Wed Aug 25 2004 Fernando Nasser <fnasser@redhat.com> 0:1.3-2jpp
- Require Ant > 1.6
- Rebuild with Ant 1.6.2
* Thu Oct 09 2003 Henri Gomez <hgomez at users.sourceforge.net> 0:1.3-1jpp
- regexp 1.3
* Fri May 09 2003 David Walluck <david@anti-microsoft.org> 0:1.2-14jpp
- update for JPackage 1.5
* Fri Mar 23 2003 Nicolas Mailhot <Nicolas.Mailhot (at) JPackage.org> 1.2-13jpp
- for jpackage-utils 1.5
* Tue Jul 02 2002 Guillaume Rousse <guillomovitch@users.sourceforge.net> 1.2-11jpp
- section marcro
- removed additional symlink
* Mon Jun 24 2002 Henri Gomez <hgomez@slib.fr> 1.2-10jpp
- add official jakarta jarname (jakarta-regexp-1.2.jar) symlink to real
jarname
* Mon Jun 10 2002 Henri Gomez <hgomez@slib.fr> 1.2-9jpp
- use sed instead of bash 2.x extension in link area to make spec compatible
with distro using bash 1.1x
- use official tarball
* Fri Jan 18 2002 Guillaume Rousse <guillomovitch@users.sourceforge.net> 1.2-8jpp
- versioned dir for javadoc
- no dependencies javadoc package
* Sat Dec 1 2001 Guillaume Rousse <guillomovitch@users.sourceforge.net> 1.2-7jpp
- javadoc in javadoc package
- official summary
* Wed Nov 21 2001 Christian Zoffoli <czoffoli@littlepenguin.org> 1.2-5jpp
- removed packager tag
- new jpp extension
* Sun Sep 30 2001 Guillaume Rousse <guillomovitch@users.sourceforge.net> 1.2-5jpp
- first unified release
- s/jPackage/JPackage
* Sun Aug 26 2001 Guillaume Rousse <guillomovitch@users.sourceforge.net> 1.2-4mdk
- vendor tag
- packager tag
- s/Copyright/License/
- truncated description to 72 columns in spec
- spec cleanup
- used versioned jar
- used new source packaging policy
* Sat Feb 17 2001 Guillaume Rousse <g.rousse@linux-mandrake.com> 1.2-3mdk
- spec cleanup
- changelog correction
* Sun Feb 04 2001 Guillaume Rousse <g.rousse@linux-mandrake.com> 1.2-2mdk
- merged with Henri Gomez <hgomez@slib.fr> specs:
- changed name to regexp
- changed javadir to /usr/share/java
- dropped jdk & jre requirement
- added Jikes support
- changed jar name to regexp.jar
- corrected doc
* Sun Jan 14 2001 Guillaume Rousse <g.rousse@linux-mandrake.com> 1.2-1mdk
- first Mandrake release