commit 4c7fbe5cde2135f65301009e5e0f1bbe41b014ed
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Fri Feb 18 18:02:38 2011 +0200
Don't use basename as an identifier.
httpcomponents-client.spec | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
---
diff --git a/httpcomponents-client.spec b/httpcomponents-client.spec
index bcade7f..7ab4896 100644
--- a/httpcomponents-client.spec
+++ b/httpcomponents-client.spec
@@ -1,9 +1,9 @@
-%global basename httpcomponents
+%global base_name httpcomponents
Name: httpcomponents-client
Summary: HTTP agent implementation based on httpcomponents HttpCore
Version: 4.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Group: Development/Libraries
License: ASL 2.0
URL:
http://hc.apache.org/
@@ -54,17 +54,17 @@ popd
%install
cd httpclient
# jars
-install -D -m 0644 target/httpclient-%{version}.jar
%{buildroot}%{_javadir}/%{basename}/httpclient.jar
+install -D -m 0644 target/httpclient-%{version}.jar
%{buildroot}%{_javadir}/%{base_name}/httpclient.jar
# pom
install -D -m 0644 pom.xml \
- %{buildroot}/%{_mavenpomdir}/JPP.%{basename}-httpclient.pom
-%add_to_maven_depmap org.apache.httpcomponents httpclient %{version} JPP/%{basename}
httpclient
+ %{buildroot}/%{_mavenpomdir}/JPP.%{base_name}-httpclient.pom
+%add_to_maven_depmap org.apache.httpcomponents httpclient %{version} JPP/%{base_name}
httpclient
# main pom
install -D -m 0644 ../pom.xml \
- %{buildroot}/%{_mavenpomdir}/JPP.%{basename}-httpcomponents-client.pom
-%add_to_maven_depmap org.apache.httpcomponents httpcomponents-client %{version}
JPP/%{basename} httpcomponents-client
+ %{buildroot}/%{_mavenpomdir}/JPP.%{base_name}-httpcomponents-client.pom
+%add_to_maven_depmap org.apache.httpcomponents httpcomponents-client %{version}
JPP/%{base_name} httpcomponents-client
# javadocs
install -dm 755 %{buildroot}%{_javadocdir}/%{name}
@@ -80,8 +80,8 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
%files
%defattr(-,root,root,-)
%doc README.txt LICENSE.txt RELEASE_NOTES.txt
-%{_mavendepmapfragdir}/%{basename}
-%{_mavenpomdir}/JPP.%{basename}*.pom
+%{_mavendepmapfragdir}/%{name}
+%{_mavenpomdir}/JPP.%{base_name}*.pom
%{_javadir}/%{basename}
%files javadoc
@@ -91,6 +91,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
%changelog
+* Fri Feb 18 2011 Alexander Kurtakov <akurtako(a)redhat.com> 4.1-3
+- Don't use basename as an identifier.
+
* Fri Feb 18 2011 Alexander Kurtakov <akurtako(a)redhat.com> 4.1-2
- OSGify properly.
- Install into %{_javadir}/%{basename}.