forked from pool/apache-commons-beanutils
Accepting request 1121382 from Java:packages
cleanup OBS-URL: https://build.opensuse.org/request/show/1121382 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache-commons-beanutils?expand=0&rev=15
This commit is contained in:
commit
4632b7999b
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Oct 31 08:36:54 UTC 2023 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
- Clean and simplify the spec file
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Oct 7 07:22:44 UTC 2019 - Fridrich Strba <fstrba@suse.com>
|
Mon Oct 7 07:22:44 UTC 2019 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package apache-commons-beanutils
|
# spec file for package apache-commons-beanutils
|
||||||
#
|
#
|
||||||
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
|
# Copyright (c) 2023 SUSE LLC
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -32,11 +32,8 @@ BuildRequires: ant
|
|||||||
BuildRequires: commons-collections
|
BuildRequires: commons-collections
|
||||||
BuildRequires: commons-logging
|
BuildRequires: commons-logging
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
BuildRequires: javapackages-local
|
BuildRequires: javapackages-local >= 6
|
||||||
BuildRequires: javapackages-tools
|
|
||||||
BuildRequires: xml-commons-apis
|
BuildRequires: xml-commons-apis
|
||||||
Requires: commons-collections >= 2.0
|
|
||||||
Requires: commons-logging >= 1.0
|
|
||||||
Provides: %{short_name} = %{version}-%{release}
|
Provides: %{short_name} = %{version}-%{release}
|
||||||
Obsoletes: %{short_name} < %{version}-%{release}
|
Obsoletes: %{short_name} < %{version}-%{release}
|
||||||
Provides: jakarta-%{short_name} = %{version}-%{release}
|
Provides: jakarta-%{short_name} = %{version}-%{release}
|
||||||
@ -69,48 +66,32 @@ sed -i 's/\r//' *.txt
|
|||||||
# bug in ant build
|
# bug in ant build
|
||||||
touch README.txt
|
touch README.txt
|
||||||
|
|
||||||
%{pom_remove_parent}
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
export CLASSPATH=%(build-classpath commons-collections commons-logging)
|
export CLASSPATH=%(build-classpath commons-collections commons-logging)
|
||||||
%ant -Dbuild.sysclasspath=first dist
|
%{ant} -Dbuild.sysclasspath=first dist
|
||||||
|
|
||||||
%install
|
%install
|
||||||
# jars
|
# jars
|
||||||
install -d -m 755 %{buildroot}%{_javadir}
|
install -d -m 755 %{buildroot}%{_javadir}
|
||||||
install -m 644 dist/%{short_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
|
install -m 644 dist/%{short_name}-%{version}.jar %{buildroot}%{_javadir}/%{short_name}.jar
|
||||||
|
ln -sf %{short_name}.jar %{buildroot}%{_javadir}/%{name}.jar
|
||||||
pushd %{buildroot}%{_javadir}
|
|
||||||
ln -s %{name}-%{version}.jar %{name}.jar
|
|
||||||
for jar in *.jar; do
|
|
||||||
ln -sf ${jar} `echo $jar| sed "s|apache-||g"`
|
|
||||||
done
|
|
||||||
popd # come back from javadir
|
|
||||||
|
|
||||||
# poms
|
# poms
|
||||||
install -d -m 755 %{buildroot}%{_mavenpomdir}
|
install -d -m 755 %{buildroot}%{_mavenpomdir}
|
||||||
install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}-%{version}.pom
|
%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}.pom
|
||||||
%add_maven_depmap %{name}-%{version}.pom %{name}-%{version}.jar -a "%{short_name}:%{short_name}-core,%{short_name}:%{short_name}-bean-collections"
|
%add_maven_depmap %{short_name}.pom %{short_name}.jar -a "%{short_name}:%{short_name}-core,%{short_name}:%{short_name}-bean-collections"
|
||||||
|
|
||||||
# javadoc
|
# javadoc
|
||||||
install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
|
install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
|
||||||
cp -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name}
|
cp -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name}
|
||||||
%fdupes -s %{buildroot}%{_javadocdir}/%{name}
|
%fdupes -s %{buildroot}%{_javadocdir}/%{name}
|
||||||
|
|
||||||
%files
|
%files -f .mfiles
|
||||||
%defattr(0644,root,root,0755)
|
%{_javadir}/%{name}.jar
|
||||||
%license LICENSE.txt
|
%license LICENSE.txt NOTICE.txt
|
||||||
%doc NOTICE.txt RELEASE-NOTES.txt
|
%doc RELEASE-NOTES.txt
|
||||||
%{_javadir}/*
|
|
||||||
%{_mavenpomdir}/*
|
|
||||||
%if %{defined _maven_repository}
|
|
||||||
%{_mavendepmapfragdir}/%{name}
|
|
||||||
%else
|
|
||||||
%{_datadir}/maven-metadata/%{name}.xml*
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%files javadoc
|
%files javadoc
|
||||||
%defattr(0644,root,root,0755)
|
|
||||||
%{_javadocdir}/%{name}
|
%{_javadocdir}/%{name}
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
Loading…
Reference in New Issue
Block a user