- Fix the pom providing on 13.2
OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-cli?expand=0&rev=3
This commit is contained in:
parent
6b14a03c6c
commit
f60699a6f4
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Jun 27 11:14:46 UTC 2014 - tchvatal@suse.com
|
||||
|
||||
- Fix the pom providing on 13.2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Mar 8 18:22:40 UTC 2014 - badshah400@gmail.com
|
||||
|
||||
|
@ -18,7 +18,6 @@
|
||||
|
||||
%global base_name cli
|
||||
%global short_name commons-%{base_name}
|
||||
%global _mavenpomdir %{_datadir}/maven2/poms
|
||||
%global with_maven 0
|
||||
|
||||
Name: apache-commons-cli
|
||||
@ -34,13 +33,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildArch: noarch
|
||||
BuildRequires: ant
|
||||
BuildRequires: java-devel >= 1.6.0
|
||||
BuildRequires: jpackage-utils
|
||||
BuildRequires: javapackages-tools
|
||||
Requires: java >= 1.6.0
|
||||
Requires: jpackage-utils
|
||||
Requires(post): jpackage-utils
|
||||
Requires(postun): jpackage-utils
|
||||
|
||||
# This should go away with F-17
|
||||
Requires: javapackages-tools
|
||||
Requires(post): javapackages-tools
|
||||
Requires(postun): javapackages-tools
|
||||
Provides: jakarta-%{short_name} = %{version}-%{release}
|
||||
Obsoletes: jakarta-%{short_name} < 1.1-6
|
||||
Provides: apache-cli
|
||||
@ -54,8 +51,7 @@ command line arguments and options.
|
||||
%package javadoc
|
||||
Summary: Javadoc for %{name}
|
||||
Group: Development/Libraries/Java
|
||||
Requires: jpackage-utils
|
||||
# This should go away with F-17
|
||||
Requires: javapackages-tools
|
||||
Obsoletes: jakarta-%{short_name}-javadoc < 1.1-6
|
||||
|
||||
%description javadoc
|
||||
@ -80,37 +76,22 @@ install -Dpm 644 target/%{short_name}-%{version}.jar %{buildroot}%{_javadir}/%{n
|
||||
(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|apache-||g"`; done)
|
||||
(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
|
||||
|
||||
%if 0%{?suse_version} < 1310
|
||||
# pom
|
||||
install -d -m 755 %{buildroot}%{_mavenpomdir}
|
||||
install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom
|
||||
%add_to_maven_depmap org.apache.commons %{short_name} %{version} JPP %{short_name}
|
||||
# following line is only for backwards compatibility. New packages
|
||||
# should use proper groupid org.apache.commons and also artifactid
|
||||
%add_to_maven_depmap %{short_name} %{short_name} %{version} JPP %{short_name}
|
||||
%endif
|
||||
%add_maven_depmap JPP-%{short_name}.pom %{short_name}.jar
|
||||
|
||||
# javadoc
|
||||
install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
|
||||
cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
|
||||
ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
|
||||
|
||||
%if 0%{?suse_version} < 1310
|
||||
%post
|
||||
%update_maven_depmap
|
||||
|
||||
%postun
|
||||
%update_maven_depmap
|
||||
%endif
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%doc LICENSE.txt NOTICE.txt README.txt RELEASE-NOTES.txt
|
||||
%{_javadir}/*
|
||||
%if 0%{?suse_version} < 1310
|
||||
%{_mavenpomdir}/*
|
||||
%config %{_mavendepmapfragdir}/*
|
||||
%endif
|
||||
|
||||
%files javadoc
|
||||
%defattr(-,root,root)
|
||||
|
Loading…
x
Reference in New Issue
Block a user