[java-sig-commits] [httpcomponents-core] on't use basename it's part of coreutils.

[Alexander Kurtakov]

commit c0d9c7c67b8623abd1e7cedf781cb82f1997c034
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Fri Feb 18 17:55:57 2011 +0200

    on't use basename it's part of coreutils.

 httpcomponents-core.spec |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)
---
diff --git a/httpcomponents-core.spec b/httpcomponents-core.spec
index 7087657..e4dba5f 100644
--- a/httpcomponents-core.spec
+++ b/httpcomponents-core.spec
@@ -1,9 +1,9 @@
-%global basename httpcomponents
+%global base_name httpcomponents
 
 Name:              httpcomponents-core
 Summary:           Set of low level Java HTTP transport components for HTTP services
 Version:           4.1
-Release:           4%{?dist}
+Release:           2%{?dist}
 Group:             Development/Libraries
 License:           ASL 2.0
 URL:               http://hc.apache.org/
@@ -56,23 +56,23 @@ mvn-rpmbuild package javadoc:aggregate
 
 %install
 install -d %{buildroot}/%{_mavenpomdir}
-install -d %{buildroot}/%{_javadir}/%{basename}
+install -d %{buildroot}/%{_javadir}/%{base_name}
 
 for m in httpcore httpcore-nio; do
     # 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
     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
 
-    %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
 
 # parent
-install -D -m 0644 pom.xml %{buildroot}/%{_mavenpomdir}/JPP.%{basename}-%{name}.pom
-%add_to_maven_depmap org.apache.httpcomponents %{name} %{version} JPP/%{basename} %{name}
+install -D -m 0644 pom.xml %{buildroot}/%{_mavenpomdir}/JPP.%{base_name}-%{name}.pom
+%add_to_maven_depmap org.apache.httpcomponents %{name} %{version} JPP/%{base_name} %{name}
 
 # javadocs
 install -dm 755 %{buildroot}%{_javadocdir}/%{name}
@@ -97,6 +97,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
 %doc %{_javadocdir}/*
 
 %changelog
+* Fri Feb 18 2011 Alexander Kurtakov <akurtako at redhat.com> 4.1-2
+- Don't use basename it's part of coreutils. 
+
 * Fri Feb 18 2011 Alexander Kurtakov <akurtako at redhat.com> 4.1-4
 - Install into %{_javadir}/httpcomponents. We will use it for client libs too.
 - Proper osgi info.