rpms/ant
5
0
Fork 0
Code Issues Pull Requests Releases Activity

- Install javadocs into unversioned dir (#657879).

Browse Source
This commit is contained in:
Ville Skyttä 2010-11-28 17:00:18 +02:00
parent c1261e81b1
commit 0504803787
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ant.spec
View File

@ -50,7 +50,7 @@
Name: ant Name: ant
Version: 1.8.1 Version: 1.8.1
Release: 8%{?dist} Release: 9%{?dist}
Epoch: 0 Epoch: 0
Summary: Build tool for java Summary: Build tool for java
Summary(it): Tool per la compilazione di programmi java Summary(it): Tool per la compilazione di programmi java
@ -622,12 +622,12 @@ echo "testutil ant/ant-testutil" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/testu
%if %{build_javadoc} %if %{build_javadoc}
# javadoc # javadoc
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%endif %endif
# fix link between manual and javadoc # fix link between manual and javadoc
(cd docs/manual; ln -sf %{_javadocdir}/%{name}-%{version} api) (cd docs/manual; ln -sf %{_javadocdir}/%{name} api)
%if %with bootstrap %if %with bootstrap
find $RPM_BUILD_ROOT%{_datadir}/ant/etc -type f -name "*.xsl" \ find $RPM_BUILD_ROOT%{_datadir}/ant/etc -type f -name "*.xsl" \
@ -861,13 +861,16 @@ rm -rf $RPM_BUILD_ROOT
%if %{build_javadoc} %if %{build_javadoc}
%files javadoc %files javadoc
%defattr(0644,root,root,0755) %defattr(0644,root,root,0755)
%{_javadocdir}/%{name}-%{version} %{_javadocdir}/%{name}
%endif %endif
%endif %endif
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
%changelog %changelog
* Sun Nov 28 2010 Ville Skyttä <ville.skytta@iki.fi> - 0:1.8.1-9
- Install javadocs into unversioned dir (#657879).
* Tue Nov 23 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.8.1-8 * Tue Nov 23 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.8.1-8
- Fix pom filename (Resolves rhbz#655787) - Fix pom filename (Resolves rhbz#655787)
@ -1036,10 +1039,10 @@ rm -rf $RPM_BUILD_ROOT
- Update to 1.5.4 - Update to 1.5.4
- JavaCC task fixed using merged upstream patches from ant HEAD - JavaCC task fixed using merged upstream patches from ant HEAD
* Mon May 5 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:1.5.3-2jpp * Mon May 5 2003 Ville Skyttä <ville.skytta@iki.fi> - 0:1.5.3-2jpp
- Fix non-versioned javadoc symlinking. - Fix non-versioned javadoc symlinking.
* Tue Apr 22 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:1.5.3-1jpp * Tue Apr 22 2003 Ville Skyttä <ville.skytta@iki.fi> - 0:1.5.3-1jpp
- Update to 1.5.3. - Update to 1.5.3.
- Remove runtime java-devel dependency. - Remove runtime java-devel dependency.
- Add Epochs in all Provides and Requires. - Add Epochs in all Provides and Requires.
@ -1062,7 +1065,7 @@ rm -rf $RPM_BUILD_ROOT
* Tue Mar 18 2003 Nicolas Mailhot <Nicolas.Mailhot at JPackage.org> - 1.5.2-7jpp * Tue Mar 18 2003 Nicolas Mailhot <Nicolas.Mailhot at JPackage.org> - 1.5.2-7jpp
- for JPackage-utils 1.5 - for JPackage-utils 1.5
* Wed Mar 12 2003 Ville Skyttä <ville.skytta at iki.fi> - 1.5.2-5jpp * Wed Mar 12 2003 Ville Skyttä <ville.skytta@iki.fi> - 1.5.2-5jpp
- Move ANT_HOME to /usr/share/ant. - Move ANT_HOME to /usr/share/ant.
- Don't special-case the lib dir for RPM layout any more, use ANT_HOME/lib. - Don't special-case the lib dir for RPM layout any more, use ANT_HOME/lib.
- Install XSLs into ANT_HOME/etc. - Install XSLs into ANT_HOME/etc.
@ -1092,7 +1095,7 @@ rm -rf $RPM_BUILD_ROOT
ant optional jars) ant optional jars)
- Built with jikes 1.18 and IBM SDK 1.4 - Built with jikes 1.18 and IBM SDK 1.4
* Sat Feb 1 2003 Ville Skyttä <ville.skytta at iki.fi> - 1.5.1-8jpp * Sat Feb 1 2003 Ville Skyttä <ville.skytta@iki.fi> - 1.5.1-8jpp
- Symlink a transformer into ANT_LIB for smoother experience on Java 1.3. - Symlink a transformer into ANT_LIB for smoother experience on Java 1.3.
- Requires jaxp_transform_impl. - Requires jaxp_transform_impl.
- Don't remove optional.jar symlinks on optional-full upgrade. - Don't remove optional.jar symlinks on optional-full upgrade.
@ -1104,14 +1107,14 @@ rm -rf $RPM_BUILD_ROOT
* Mon Jan 20 2003 David Walluck <david@anti-microsoft.org> 1.5.1-7jpp * Mon Jan 20 2003 David Walluck <david@anti-microsoft.org> 1.5.1-7jpp
- oldbsf - oldbsf
* Fri Dec 20 2002 Ville Skyttä <ville.skytta at iki.fi> - 1.5.1-6jpp * Fri Dec 20 2002 Ville Skyttä <ville.skytta@iki.fi> - 1.5.1-6jpp
- Really get rid of automatic dependencies for the -scripts package. - Really get rid of automatic dependencies for the -scripts package.
* Wed Dec 18 2002 Guillaume Rousse <guillomovitch@users.sourceforge.net> 1.5.1-5jpp * Wed Dec 18 2002 Guillaume Rousse <guillomovitch@users.sourceforge.net> 1.5.1-5jpp
- scripts subpackages - scripts subpackages
- file-based manual dependencies, as packages doesn't have the same name on RedHat and Mandrake - file-based manual dependencies, as packages doesn't have the same name on RedHat and Mandrake
* Wed Dec 11 2002 Ville Skyttä <ville.skytta at iki.fi> - 1.5.1-4jpp * Wed Dec 11 2002 Ville Skyttä <ville.skytta@iki.fi> - 1.5.1-4jpp
- Patched to allow easier use with Jikes and IBM's 1.4.0, see - Patched to allow easier use with Jikes and IBM's 1.4.0, see
<http://nagoya.apache.org/bugzilla/show_bug.cgi?id=15289> for details. <http://nagoya.apache.org/bugzilla/show_bug.cgi?id=15289> for details.
@ -1143,7 +1146,7 @@ rm -rf $RPM_BUILD_ROOT
* Thu Jul 11 2002 Henri Gomez <hgomez@users.sourceforge.net> 1.5-3jpp * Thu Jul 11 2002 Henri Gomez <hgomez@users.sourceforge.net> 1.5-3jpp
- add missing symlink between optional-full.jar and optional.jar - add missing symlink between optional-full.jar and optional.jar
* Wed Jul 10 2002 Ville Skyttä <ville.skytta at iki.fi> 1.5-2jpp * Wed Jul 10 2002 Ville Skyttä <ville.skytta@iki.fi> 1.5-2jpp
- Requires jaxp_parser_impl, no longer jaxp_parser2 - Requires jaxp_parser_impl, no longer jaxp_parser2
(jaxp_parser_impl already requires xml-commons-apis). (jaxp_parser_impl already requires xml-commons-apis).
- Use sed instead of bash 2 extension when symlinking. - Use sed instead of bash 2 extension when symlinking.