packages: antlr3/antlr3.spec - added bcond without ant - rel 1

pawelz pawelz at pld-linux.org
Tue Oct 13 15:34:09 CEST 2009


Author: pawelz                       Date: Tue Oct 13 13:34:09 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added bcond without ant
- rel 1

---- Files affected:
packages/antlr3:
   antlr3.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/antlr3/antlr3.spec
diff -u packages/antlr3/antlr3.spec:1.2 packages/antlr3/antlr3.spec:1.3
--- packages/antlr3/antlr3.spec:1.2	Tue Oct 13 12:53:18 2009
+++ packages/antlr3/antlr3.spec	Tue Oct 13 15:34:04 2009
@@ -12,14 +12,16 @@
 %else
 %bcond_with	java_sun	# build with java-sun
 %endif
-#
+
+%bcond_without	ant		# don't build ant task
+
 %include	/usr/lib/rpm/macros.java
 
 %include	/usr/lib/rpm/macros.java
 Summary:	ANother Tool for Language Recognition
 Name:		antlr3
 Version:	3.2
-Release:	0.1
+Release:	1
 License:	Public Domain
 Group:		Development/Languages/Java
 Source0:	http://antlr.org/download/antlr-%{version}.jar
@@ -28,9 +30,11 @@
 Source2:	antlib.xml
 # Source0-md5:	ee7dc3fb20cf3e9efd871e297c0d532b
 URL:		http://antlr.org/
+%if %{with ant}
 BuildRequires:	ant
 %{!?with_java_sun:BuildRequires:	java-gcj-compat-devel}
 %{?with_java_sun:BuildRequires:	java-sun}
+%endif
 BuildRequires:	jpackage-utils
 BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpm-javaprov
@@ -57,6 +61,7 @@
 %description -n ant-antlr3
 Ant task for antlr3.
 
+%if %{with ant}
 %prep
 %setup -q -T -c
 mkdir -p org/apache/tools/ant/antlr
@@ -73,6 +78,7 @@
 cp org/apache/tools/ant/antlr/antlib.xml build/org/apache/tools/ant/antlr/antlib.xml
 
 jar cf ant-antlr3.jar -C build org
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -81,7 +87,10 @@
 # jars
 cp -a %{SOURCE0} $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
 ln -sf %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+
+%if %{with ant}
 cp -a ant-antlr3.jar $RPM_BUILD_ROOT%{_javadir}/ant/ant-antlr3.jar
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -90,9 +99,11 @@
 %defattr(644,root,root,755)
 %{_javadir}/*.jar
 
+%if %{with ant}
 %files -n ant-antlr3
 %defattr(644,root,root,755)
 %{_javadir}/ant/*.jar
+%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -100,6 +111,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2009/10/13 13:34:04  pawelz
+- added bcond without ant
+- rel 1
+
 Revision 1.2  2009/10/13 10:53:18  pawelz
 - ant task
 - better Group
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/antlr3/antlr3.spec?r1=1.2&r2=1.3&f=u



More information about the pld-cvs-commit mailing list