Compare commits

..

No commits in common. "stream-javapackages-tools-201801-rhel-8.9.0" and "c8-stream-201902" have entirely different histories.

4 changed files with 24 additions and 23 deletions

4
.gitignore vendored
View File

@ -1,3 +1 @@
jaxen-1.1.1-src.tar.gz
jaxen-1.1.3-src.tar.gz
/jaxen-1.1.6-src.tar.gz
SOURCES/jaxen-1.2.0-src.tar.gz

View File

@ -1 +1 @@
c78c976dfe9a803a3c2af07f66ea727aaa95be29 jaxen-1.1.6-src.tar.gz
e01c94b23eba01f1efebe2dc12243e9a4389ecb1 SOURCES/jaxen-1.2.0-src.tar.gz

View File

@ -1,28 +1,19 @@
%bcond_without dom4j
Name: jaxen
Epoch: 0
Version: 1.1.6
Release: 18%{?dist}
Version: 1.2.0
Release: 2%{?dist}
Summary: An XPath engine written in Java
# src/java/main/org/w3c/dom/UserDataHandler.java is W3C
# rest is BSD
License: BSD and W3C
URL: http://jaxen.codehaus.org/
License: BSD
URL: http://www.cafeconleche.org/jaxen/
BuildArch: noarch
Source0: http://dist.codehaus.org/jaxen/distributions/%{name}-%{version}-src.tar.gz
Source0: https://repo1.maven.org/maven2/jaxen/jaxen/%{version}/jaxen-%{version}-src.tar.gz
BuildRequires: maven-local
BuildRequires: mvn(jdom:jdom)
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-assembly-plugin)
BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:)
BuildRequires: mvn(xerces:xercesImpl)
BuildRequires: mvn(xml-apis:xml-apis)
%if %{with dom4j}
BuildRequires: mvn(dom4j:dom4j)
%endif
%description
Jaxen is an open source XPath library written in Java. It is adaptable
@ -47,14 +38,18 @@ Summary: Javadoc for %{name}
%prep
%setup -q
%if %{without dom4j}
%pom_xpath_set "pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration/pom:source" 1.6
%pom_xpath_set "pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration/pom:target" 1.6
rm -rf src/java/main/org/jaxen/dom4j
%pom_remove_dep dom4j:dom4j
%endif
rm -rf src/java/main/org/jaxen/xom
%pom_remove_dep xom:xom
%pom_remove_plugin :maven-source-plugin
%pom_remove_plugin :maven-javadoc-plugin
%mvn_file : %{name}
%build
@ -68,7 +63,7 @@ install -d -m 755 %{buildroot}%{_datadir}/%{name}/samples
cp -pr src/java/samples/* %{buildroot}%{_datadir}/%{name}/samples
%files -f .mfiles
%doc LICENSE.txt
%doc LICENSE.txt README.md
%files javadoc -f .mfiles-javadoc
%doc LICENSE.txt
@ -77,6 +72,15 @@ cp -pr src/java/samples/* %{buildroot}%{_datadir}/%{name}/samples
%{_datadir}/%{name}
%changelog
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2.0-2
- Mass rebuild for javapackages-tools 201902
* Thu Jul 18 2019 Marian Koncek <mkoncek@redhat.com> - 1.2.0-1
- Update to upstream version 1.2.0
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1.6-19
- Mass rebuild for javapackages-tools 201901
* Tue Jul 31 2018 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.1.6-18
- Allow conditionally building with dom4j

View File

@ -1 +0,0 @@
SHA512 (jaxen-1.1.6-src.tar.gz) = 84a3beb521c8729d7ad9bcb76a252e12d624614277eee9d5e844f79fcdfc58f5f49eac902256b17c0af6563d4c255249d9124a47c3b02827189a7489f3172309