From c963dae71184b5bbf5693a3fd2675e646737a2ed Mon Sep 17 00:00:00 2001 From: Deepak Bhole Date: Jul 20 2006 16:13:57 +0000 Subject: - From gbenson@redhat: - Omit the jedit subpackage to fix dependencies. --- diff --git a/antlr.spec b/antlr.spec index 16174e4..42156ca 100644 --- a/antlr.spec +++ b/antlr.spec @@ -31,6 +31,7 @@ %define _with_gcj_support 1 %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}} +%define build_jedit %{?_with_jedit:1}%{!?_without_jedit:0} %define section free %define native %{?_with_native:1}%{!?_without_native:0} @@ -38,7 +39,7 @@ Summary: ANother Tool for Language Recognition Name: antlr Version: 2.7.6 -Release: 3jpp_1fc +Release: 3jpp_2fc Epoch: 0 License: Public Domain URL: http://www.antlr.org/ @@ -111,6 +112,7 @@ Summary: Javadoc for %{name} %description javadoc Javadoc for %{name}. +%if %{build_jedit} %package jedit Group: Text Editors Summary: ANTLR mode for jEdit @@ -121,7 +123,7 @@ ANTLR mode for jEdit. To enable this mode, insert the following into your %{_datadir}/jedit/modes/catalog: - +%endif %prep %setup -q @@ -170,9 +172,11 @@ cp -pr work/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # jedit mode +%if %{build_jedit} mkdir -p $RPM_BUILD_ROOT%{_datadir}/jedit/modes cp -p extras/antlr-jedit.xml $RPM_BUILD_ROOT%{_datadir}/jedit/modes/antlr.xml %endif +%endif %if %{gcj_support} @@ -266,13 +270,19 @@ ln -s %{name}-%{version} %{_javadocdir}/%{name} %doc %{_javadocdir}/%{name}-%{version} %ghost %doc %{_javadocdir}/%{name} +%if %{build_jedit} %files jedit %defattr(0644,root,root,0755) %{_datadir}/jedit/modes/* %endif +%endif %changelog +* Wed Jul 19 2006 Deepak Bhole = 0:2.7.6-3jpp_2fc +- From gbenson@redhat: +- Omit the jedit subpackage to fix dependencies. + * Wed Jul 19 2006 Deepak Bhole = 0:2.7.6-3jpp_1fc - Added conditional native compilation.