on't use basename it's part of coreutils.
This commit is contained in:
parent
d514c44d60
commit
c0d9c7c67b
@ -1,9 +1,9 @@
|
|||||||
%global basename httpcomponents
|
%global base_name httpcomponents
|
||||||
|
|
||||||
Name: httpcomponents-core
|
Name: httpcomponents-core
|
||||||
Summary: Set of low level Java HTTP transport components for HTTP services
|
Summary: Set of low level Java HTTP transport components for HTTP services
|
||||||
Version: 4.1
|
Version: 4.1
|
||||||
Release: 4%{?dist}
|
Release: 2%{?dist}
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
URL: http://hc.apache.org/
|
URL: http://hc.apache.org/
|
||||||
@ -56,23 +56,23 @@ mvn-rpmbuild package javadoc:aggregate
|
|||||||
|
|
||||||
%install
|
%install
|
||||||
install -d %{buildroot}/%{_mavenpomdir}
|
install -d %{buildroot}/%{_mavenpomdir}
|
||||||
install -d %{buildroot}/%{_javadir}/%{basename}
|
install -d %{buildroot}/%{_javadir}/%{base_name}
|
||||||
|
|
||||||
for m in httpcore httpcore-nio; do
|
for m in httpcore httpcore-nio; do
|
||||||
# poms
|
# poms
|
||||||
install -m 0644 $m/pom.xml %{buildroot}/%{_mavenpomdir}/JPP.%{basename}-$m.pom
|
install -m 0644 $m/pom.xml %{buildroot}/%{_mavenpomdir}/JPP.%{base_name}-$m.pom
|
||||||
|
|
||||||
# jars - osgi doesn't have one
|
# jars - osgi doesn't have one
|
||||||
if [ -f $m/target/$m-%{version}.jar ];then
|
if [ -f $m/target/$m-%{version}.jar ];then
|
||||||
install -m 0644 $m/target/$m-%{version}.jar %{buildroot}%{_javadir}/%{basename}/$m.jar
|
install -m 0644 $m/target/$m-%{version}.jar %{buildroot}%{_javadir}/%{base_name}/$m.jar
|
||||||
fi
|
fi
|
||||||
|
|
||||||
%add_to_maven_depmap org.apache.httpcomponents $m %{version} JPP/%{basename} $m
|
%add_to_maven_depmap org.apache.httpcomponents $m %{version} JPP/%{base_name} $m
|
||||||
done
|
done
|
||||||
|
|
||||||
# parent
|
# parent
|
||||||
install -D -m 0644 pom.xml %{buildroot}/%{_mavenpomdir}/JPP.%{basename}-%{name}.pom
|
install -D -m 0644 pom.xml %{buildroot}/%{_mavenpomdir}/JPP.%{base_name}-%{name}.pom
|
||||||
%add_to_maven_depmap org.apache.httpcomponents %{name} %{version} JPP/%{basename} %{name}
|
%add_to_maven_depmap org.apache.httpcomponents %{name} %{version} JPP/%{base_name} %{name}
|
||||||
|
|
||||||
# javadocs
|
# javadocs
|
||||||
install -dm 755 %{buildroot}%{_javadocdir}/%{name}
|
install -dm 755 %{buildroot}%{_javadocdir}/%{name}
|
||||||
@ -97,6 +97,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
|
|||||||
%doc %{_javadocdir}/*
|
%doc %{_javadocdir}/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Feb 18 2011 Alexander Kurtakov <akurtako@redhat.com> 4.1-2
|
||||||
|
- Don't use basename it's part of coreutils.
|
||||||
|
|
||||||
* Fri Feb 18 2011 Alexander Kurtakov <akurtako@redhat.com> 4.1-4
|
* Fri Feb 18 2011 Alexander Kurtakov <akurtako@redhat.com> 4.1-4
|
||||||
- Install into %{_javadir}/httpcomponents. We will use it for client libs too.
|
- Install into %{_javadir}/httpcomponents. We will use it for client libs too.
|
||||||
- Proper osgi info.
|
- Proper osgi info.
|
||||||
|
Loading…
Reference in New Issue
Block a user