3 Commits

2 changed files with 16 additions and 19 deletions

View File

@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Oct 2 16:00:24 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Spec file cleanup
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Mar 18 16:43:40 UTC 2022 - Fridrich Strba <fstrba@suse.com> Fri Mar 18 16:43:40 UTC 2022 - Fridrich Strba <fstrba@suse.com>

View File

@@ -1,7 +1,7 @@
# #
# spec file for package regexp # spec file for package regexp
# #
# Copyright (c) 2022 SUSE LLC # Copyright (c) 2024 SUSE LLC
# Copyright (c) 2000-2008, JPackage Project # Copyright (c) 2000-2008, JPackage Project
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
@@ -18,7 +18,6 @@
%define full_name jakarta-%{name} %define full_name jakarta-%{name}
%define section free
Name: regexp Name: regexp
Version: 1.5 Version: 1.5
Release: 0 Release: 0
@@ -28,15 +27,15 @@ Group: Development/Libraries/Java
URL: http://jakarta.apache.org/%{name}/ 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
Source1: regexp-%{version}.pom Source1: regexp-%{version}.pom
BuildRequires: ant
BuildRequires: ant >= 1.6 BuildRequires: ant >= 1.6
BuildRequires: java-devel BuildRequires: java-devel
BuildRequires: javapackages-local BuildRequires: javapackages-local >= 6
BuildRequires: javapackages-tools
BuildRequires: xml-commons-apis-bootstrap BuildRequires: xml-commons-apis-bootstrap
BuildRoot: %{_tmppath}/%{name}-%{version}-build #!BuildIgnore: xerces-j2
#!BuildIgnore: xml-commons-apis xml-commons-resolver xml-commons xerces-j2 #!BuildIgnore: xml-commons
#!BuildIgnore: xml-commons-apis
#!BuildIgnore: xml-commons-jaxp-1.3-apis #!BuildIgnore: xml-commons-jaxp-1.3-apis
#!BuildIgnore: xml-commons-resolver
BuildArch: noarch BuildArch: noarch
%description %description
@@ -53,27 +52,20 @@ testing suite for compatibility.
find . -type f -name "*.jar" | xargs -t rm find . -type f -name "*.jar" | xargs -t rm
%build %build
export OPT_JAR_LIST=:
export CLASSPATH=
mkdir lib mkdir lib
ant -Djakarta-site2.dir=. -Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8 jar ant -Djakarta-site2.dir=. -Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8 jar
%install %install
# jars # jars
install -d -m 755 %{buildroot}%{_javadir} install -dm 0755 %{buildroot}%{_javadir}
install -m 644 build/*.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar install -pm 0644 build/*.jar %{buildroot}%{_javadir}/%{name}.jar
(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
[ -d docs/api ] && rm -rf docs/api [ -d docs/api ] && rm -rf docs/api
# pom # pom
mkdir -p %{buildroot}%{_mavenpomdir} mkdir -p %{buildroot}%{_mavenpomdir}
install -p -m 0644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %{mvn_install_pom} %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
%add_maven_depmap JPP-%{name}.pom %{name}.jar -a %{full_name}:%{full_name} %add_maven_depmap JPP-%{name}.pom %{name}.jar -a %{full_name}:%{full_name}
%files %files -f .mfiles
%defattr(0644,root,root,0755) %license LICENSE
%doc LICENSE
%{_javadir}/*.jar
%{_mavenpomdir}/*
%{_datadir}/maven-metadata/%{name}.xml*
%changelog %changelog