Djam/dom4j
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/dom4j.git synced 2025-02-23 23:22:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Automatic import for version 1.6.1

Browse source
This commit is contained in:
Rosa 2012-02-02 00:05:15 +04:00
parent e6f2d77b02
commit 4f7eb70c41
2 changed files with 34 additions and 112 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
dom4j-bug1618750.patch
View file

@ -1,12 +0,0 @@
--- dom4j-1.6.1/src/java/org/dom4j/util/SimpleSingleton.java~ 2005-05-16 15:28:30.000000000 +0200
+++ dom4j-1.6.1/src/java/org/dom4j/util/SimpleSingleton.java 2007-07-06 10:09:03.000000000 +0200
@@ -35,8 +35,7 @@
if (singletonClassName != null) {
Class clazz = null;
try {
- clazz = Thread.currentThread().getContextClassLoader().loadClass(
- singletonClassName);
+ clazz = Class.forName(singletonClassName);
singletonInstance = clazz.newInstance();
} catch (Exception ignore) {
try {

134
dom4j.spec
View file

@ -1,10 +1,37 @@
%define gcj_support 1
# Copyright (c) 2000-2007, 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.
#
Summary: Open Source XML framework for Java
Name: dom4j
Version: 1.6.1
Release: %mkrel 2.2.7
Epoch: 0
Summary: Open Source XML framework for Java
Release: 6
License: BSD
URL: http://www.dom4j.org/
Group: Development/Java
@ -12,8 +39,7 @@ Source0: http://downloads.sourceforge.net/dom4j/dom4j-1.6.1.tar.gz
Source1: dom4j_rundemo.sh
Patch0: dom4j-1.6.1-build_xml.patch
Patch1: dom4j-gjdoc.patch
Patch2: dom4j-bug1618750.patch
BuildRequires: java-rpmbuild >= 0:1.6
BuildRequires: jpackage-utils >= 0:1.6
BuildRequires: ant >= 0:1.6
BuildRequires: junit
BuildRequires: jtidy
@ -51,13 +77,8 @@ Requires: jaxp = 1.2
# package needs this specific version of jaxp.
# newer jaxp versions will not work
Requires: jaxp = 1.2
%if %{gcj_support}
BuildRequires: java-gcj-compat-devel
%else
BuildArch: noarch
BuildRequires: java-devel
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
dom4j is an Open Source XML framework for Java. dom4j allows you to read,
@ -104,7 +125,6 @@ sed -e '/unjar/d' -e 's|,cookbook/\*\*,|,|' build.xml.orig > build.xml
%patch0 -b .sav
%patch1 -b .sav1
%patch2 -p1 -b .sav2
%build
pushd lib
@ -136,7 +156,7 @@ popd
popd
# FIXME: test needs to be fixed
%{ant} all samples # test
ant all samples # test
%install
rm -rf $RPM_BUILD_ROOT
@ -176,31 +196,15 @@ cp -pr src/samples $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/src
cp -pr build/classes/org/dom4j/samples $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/classes/org/dom4j
install -m 755 run.sh $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
%if %{gcj_support}
%{_bindir}/aot-compile-rpm
%endif
%clean
rm -rf $RPM_BUILD_ROOT
%if %{gcj_support}
%post
%{update_gcjdb}
%postun
%{clean_gcjdb}
%endif
%files
%defattr(0644,root,root,0755)
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/LICENSE.txt
%{_javadir}/%{name}.jar
%{_javadir}/%{name}-%{version}.jar
%if %{gcj_support}
%dir %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/*
%endif
%files javadoc
%defattr(0644,root,root,0755)
@ -215,73 +219,3 @@ rm -rf $RPM_BUILD_ROOT
%attr(0755,root,root) %{_datadir}/%{name}-%{version}/run.sh
%{_datadir}/%{name}-%{version}
%changelog
* Tue Apr 26 2011 Paulo Andrade <pcpa@mandriva.com.br> 0:1.6.1-2.2.7mdv2011.0
+ Revision: 659461
- Rebuild
+ Oden Eriksson <oeriksson@mandriva.com>
- rebuild
* Sat Mar 07 2009 Antoine Ginies <aginies@mandriva.com> 0:1.6.1-2.2.5mdv2009.1
+ Revision: 350834
- rebuild
* Fri Dec 21 2007 Olivier Blin <oblin@mandriva.com> 0:1.6.1-2.2.4mdv2008.1
+ Revision: 136373
- restore BuildRoot
+ Thierry Vignaud <tv@mandriva.org>
- kill re-definition of %%buildroot on Pixel's request
+ Anssi Hannula <anssi@mandriva.org>
- buildrequire java-rpmbuild, i.e. build with icedtea on x86(_64)
* Sat Sep 15 2007 Anssi Hannula <anssi@mandriva.org> 0:1.6.1-2.2.3mdv2008.0
+ Revision: 87332
- rebuild to filter out autorequires of GCJ AOT objects
- remove unnecessary Requires(post) on java-gcj-compat
* Fri Jul 06 2007 David Walluck <walluck@mandriva.org> 0:1.6.1-2.2.2mdv2008.0
+ Revision: 48920
- workaround dom4j bug #1618750
* Wed Jul 04 2007 David Walluck <walluck@mandriva.org> 0:1.6.1-2.2.1mdv2008.0
+ Revision: 47796
- Import dom4j
* Mon Mar 26 2007 Nuno Santos <nsantos@redhat.com> - 0:1.6.1-2jpp.2
- fix unowned directory
* Wed Feb 14 2007 Jeff Johnston <jjohnstn@redhat.com> - 0:1.6.1-2jpp.1
- Resolves: #227049
- Updated per Fedora package review process
- Modified dom4j-1.6.1-build_xml.patch to include jaxp 1.2 apis on
boot classpath
- Added new patch for javadocs
- Add buildrequires for jaxp = 1.2
* Mon Jan 30 2006 Ralph Apel <r.apel@r-apel.de> - 0:1.6.1-2jpp
- Change STAX dependency to free bea-stax and bea-stax-api
* Wed Aug 17 2005 Ralph Apel <r.apel@r-apel.de> - 0:1.6.1-1jpp
- Upgrade to 1.6.1
- Now requires xpp3 additionally to xpp2
* Thu Sep 09 2004 Ralph Apel <r.apel@r-apel.de> - 0:1.5-1jpp
- Upgrade to 1.5
- Drop saxpath requirement as this is now included in jaxen
* Fri Aug 20 2004 Ralph Apel <r.apel@r-apel.de> - 0:1.4-3jpp
- Upgrade to Ant 1.6.X
- Build with ant-1.6.2
* Tue Jul 06 2004 Ralph Apel <r.apel@r-apel.de> - 0:1.4-2jpp
- Replace non-free msv with free relaxngDatatype xsdlib isorelax msv-strict
- Relax some versioned dependencies
* Mon Jan 19 2004 Ralph Apel <r.apel@r-apel.de> - 0:1.4-1jpp
- First JPackage release