General cleanup

* Install NOTICE.txt file
* Fix javadir directory ownership
* Fix directory permissions
* Preserve timestamps
* Replace add_to_maven_depmap with add_maven_depmap
This commit is contained in:
Mikolaj Izdebski 2012-07-27 13:00:18 +02:00
parent 7390cef7bb
commit 67b6c592f5

View File

@ -3,7 +3,7 @@
Name: httpcomponents-client
Summary: HTTP agent implementation based on httpcomponents HttpCore
Version: 4.2.1
Release: 1%{?dist}
Release: 2%{?dist}
Group: Development/Libraries
License: ASL 2.0
URL: http://hc.apache.org/
@ -36,7 +36,7 @@ Group: Documentation
Requires: jpackage-utils
%description javadoc
API docs for %{name}.
%{summary}.
%prep
@ -101,19 +101,22 @@ mvn-rpmbuild -Dmaven.test.skip=true install javadoc:aggregate
%install
# jars
install -D -m 0644 httpclient/target/httpclient-%{version}.jar %{buildroot}%{_javadir}/%{base_name}/httpclient.jar
install -D -m 0644 httpmime/target/httpmime-%{version}.jar %{buildroot}%{_javadir}/%{base_name}/httpmime.jar
install -dm 755 %{buildroot}%{_javadir}/%{base_name}
install -m 644 httpclient/target/httpclient-%{version}.jar %{buildroot}%{_javadir}/%{base_name}/httpclient.jar
install -m 644 httpmime/target/httpmime-%{version}.jar %{buildroot}%{_javadir}/%{base_name}/httpmime.jar
# main pom
install -D -m 0644 pom.xml \
install -dm 755 %{buildroot}/%{_mavenpomdir}
install -pm 644 pom.xml \
%{buildroot}/%{_mavenpomdir}/JPP.%{base_name}-httpcomponents-client.pom
%add_to_maven_depmap org.apache.httpcomponents httpcomponents-client %{version} JPP/%{base_name} httpcomponents-client
%add_maven_depmap JPP.%{base_name}-httpcomponents-client.pom
# pom
install -D -m 0644 httpclient/pom.xml \
install -pm 644 httpclient/pom.xml \
%{buildroot}/%{_mavenpomdir}/JPP.%{base_name}-httpclient.pom
%add_maven_depmap JPP.%{base_name}-httpclient.pom %{base_name}/httpclient.jar
install -D -m 0644 httpmime/pom.xml \
install -pm 644 httpmime/pom.xml \
%{buildroot}/%{_mavenpomdir}/JPP.%{base_name}-httpmime.pom
%add_maven_depmap JPP.%{base_name}-httpmime.pom %{base_name}/httpmime.jar
@ -124,17 +127,24 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
%files
%doc README.txt LICENSE.txt RELEASE_NOTES.txt
%doc LICENSE.txt NOTICE.txt
%doc README.txt RELEASE_NOTES.txt
%{_mavendepmapfragdir}/%{name}
%{_mavenpomdir}/JPP.%{base_name}*.pom
%{_javadir}/%{basename}
%{_javadir}/%{base_name}
%files javadoc
%doc LICENSE.txt
%doc LICENSE.txt NOTICE.txt
%doc %{_javadocdir}/%{name}
%changelog
* Fri Jul 27 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.2.1-2
- Install NOTICE.txt file
- Fix javadir directory ownership
- Fix directory permissions
- Preserve timestamps
- Replace add_to_maven_depmap with add_maven_depmap
* Fri Jul 27 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.2.1-1
- Update to upstream version 4.2.1
- Convert patches to POM macros