diff --git a/.gitignore b/.gitignore index b831267..f8b8ed1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ ecj-gcj.tar.bz2 ecjsrc-4.2.1.jar +/ecj.1 diff --git a/ecj.spec b/ecj.spec index 6daf8ce..e261674 100644 --- a/ecj.spec +++ b/ecj.spec @@ -22,6 +22,7 @@ Source2: %{name}-gcj.tar.bz2 #Patched from http://repo2.maven.org/maven2/org/eclipse/jdt/core/3.3.0-v_771/core-3.3.0-v_771.pom # No dependencies are needed for ecj, dependencies are for using of jdt.core which makes no sense outside of eclipse Source3: core-3.3.0-v_771.pom +Source4: ecj.1 # Always generate debug info when building RPMs (Andrew Haley) Patch0: %{name}-rpmdebuginfo.patch Patch1: %{name}-defaultto1.5.patch @@ -35,6 +36,7 @@ Patch5: eclipse-gcj-nodummysymbol.patch BuildRequires: gcc-java >= 4.0.0 BuildRequires: /usr/bin/aot-compile-rpm BuildRequires: java-gcj-compat +BuildRequires: gzip %if ! %{with_gcjbootstrap} BuildRequires: ant @@ -85,6 +87,7 @@ rm -f org/eclipse/jdt/core/BuildJarIndex.java # JDTCompilerAdapter isn't used by the batch compiler rm -f org/eclipse/jdt/core/JDTCompilerAdapter.java +cp %{SOURCE4} ecj.1 %build %if %{with_gcjbootstrap} @@ -97,6 +100,7 @@ rm -f org/eclipse/jdt/core/JDTCompilerAdapter.java %else ant %endif +gzip ecj.1 %install mkdir -p $RPM_BUILD_ROOT%{_javadir} @@ -110,6 +114,10 @@ popd install -p -D -m0755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/ecj sed --in-place "s:@JAVADIR@:%{_javadir}:" $RPM_BUILD_ROOT%{_bindir}/ecj +# Install manpage +mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 +install -m 644 -p ecj.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/ecj.1.gz + aot-compile-rpm # poms @@ -139,11 +147,16 @@ fi %{_javadir}/%{name}.jar %{_javadir}/eclipse-%{name}.jar %{_javadir}/jdtcore.jar +%{_mandir}/man1/ecj.1.gz %files native %{_libdir}/gcj/%{name} %changelog +* Wed May 21 2013 Jon VanAlten - 4.2.1-7 +- Add manpage for ecj executable +- Resolves: rhbz#948442 + * Tue Apr 9 2013 Mikolaj Izdebski - 4.2.1-6 - Add depmap for org.eclipse.jdt.core.compiler:ecj - Resolves: rhbz#949938 diff --git a/sources b/sources index f8ed1dc..3bca097 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ f603934950639ed6ac2b2527705a69f0 ecjsrc-4.2.1.jar 0af236868ba699f2e55c654b8aca1258 ecj-gcj.tar.bz2 +96d507a301eeb8454299a325a9aca31d ecj.1