rpms/javacc/devel .cvsignore, 1.5, 1.6 javacc.spec, 1.23, 1.24 sources, 1.3, 1.4
Matt Wringe
mwringe at fedoraproject.org
Thu Dec 4 00:46:23 UTC 2008
Author: mwringe
Update of /cvs/pkgs/rpms/javacc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17498
Modified Files:
.cvsignore javacc.spec sources
Log Message:
Update to 4.1
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/javacc/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 18 Jul 2006 16:12:15 -0000 1.5
+++ .cvsignore 4 Dec 2008 00:45:53 -0000 1.6
@@ -1 +1,2 @@
-javacc-4.0src-RHCLEAN.tar.gz
+javacc-4.1src.tar.gz
+javacc.jar
Index: javacc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/javacc/devel/javacc.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- javacc.spec 9 Jul 2008 19:56:03 -0000 1.23
+++ javacc.spec 4 Dec 2008 00:45:53 -0000 1.24
@@ -28,36 +28,36 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-%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 with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
%define section free
Name: javacc
-Version: 4.0
-Release: 4.5%{?dist}
+Version: 4.1
+Release: 0.2%{?dist}
Epoch: 0
Summary: A parser/scanner generator for java
License: BSD
-Source0: javacc-4.0src-RHCLEAN.tar.gz
-Source1: javacc.sh
-Source2: jjdoc
-Source3: jjtree
+Source0: https://javacc.dev.java.net/files/documents/17/108015/%{name}-%{version}src.tar.gz
+Source1: javacc.sh
+Source2: jjdoc
+Source3: jjtree
+#Jar used for bootstrapping
+Source4: javacc.jar
URL: https://javacc.dev.java.net/
Group: Development/Code Generators
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-%if ! %{gcj_support}
+Requires: java, jpackage-utils >= 0:1.5
+BuildRequires: ant, ant-junit, junit >= 0:3.8.1
+BuildRequires: java-devel, jpackage-utils >= 0:1.5
+
+%if %{with_gcj}
+BuildRequires: java-gcj-compat-devel >= 1.0.31
+Requires(post): java-gcj-compat >= 1.0.31
+Requires(postun): java-gcj-compat >= 1.0.31
+%else
BuildArch: noarch
%endif
-Requires: jpackage-utils >= 0:1.5
-BuildRequires: ant, /bin/bash, ant-junit, junit >= 0:3.8.1
-
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
%description
Java Compiler Compiler (JavaCC) is the most popular parser generator for use
@@ -70,6 +70,7 @@
%package manual
Summary: Manual for %{name}
Group: Development/Documentation
+Requires: %{name} = %{version}-%{release}
%description manual
Manual for %{name}.
@@ -77,21 +78,32 @@
%package demo
Summary: Examples for %{name}
Group: Development/Documentation
+Requires: %{name} = %{version}-%{release}
%description demo
Examples for %{name}.
%prep
%setup -q -n %{name}
-cp %{SOURCE1} javacc
-cp %{SOURCE2} jjdoc
-cp %{SOURCE3} jjtree
-mv www/doc .
+
+# Remove binary information in the source tar
+find . -name "*.jar" -exec rm {} \;
+find . -name "*.class" -exec rm {} \;
+
+cp -p %{SOURCE1} bin/javacc
+cp -p %{SOURCE2} bin/jjdoc
+cp -p %{SOURCE3} bin/jjtree
+
+cp -p %{SOURCE4} bootstrap/javacc.jar
%build
-ant \
- -Dversion=%{version} \
- jar
+# Use the bootstrap javacc.jar to generate some required
+# source java files. After these source files are generated we
+# remove the bootstrap jar and build the binary from source.
+ant -f src/org/javacc/parser/build.xml parser-files
+ant -f src/org/javacc/jjtree/build.xml tree-files
+find . -name "*.jar" -exec rm {} \;
+ant jar
%install
rm -fr $RPM_BUILD_ROOT
@@ -99,11 +111,11 @@
install -m 644 bin/lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
install -d -m 755 $RPM_BUILD_ROOT/%{_bindir}
-install -m 755 javacc jjdoc jjtree $RPM_BUILD_ROOT/%{_bindir}
+install -m 755 bin/javacc bin/jjdoc bin/jjrun bin/jjtree $RPM_BUILD_ROOT/%{_bindir}
install -d -m 755 $RPM_BUILD_ROOT/%{_datadir}/%{name}
cp -pr examples $RPM_BUILD_ROOT/%{_datadir}/%{name}
-%if %{gcj_support}
+%if %{with_gcj}
%{_bindir}/aot-compile-rpm
%endif
@@ -111,7 +123,7 @@
rm -rf $RPM_BUILD_ROOT
%post
-%if %{gcj_support}
+%if %{with_gcj}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
@@ -119,7 +131,7 @@
%endif
%postun
-%if %{gcj_support}
+%if %{with_gcj}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
@@ -133,19 +145,31 @@
%defattr(0755,root,root,0755)
/usr/bin/*
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/javacc-4.0.jar.*
+%if %{with_gcj}
+%attr(-,root,root) %{_libdir}/gcj/%{name}
%endif
%files manual
%defattr(0644,root,root,0755)
-%doc doc/*
+%doc www/*
%files demo
%defattr(0644,root,root,0755)
%{_datadir}/%{name}/*
%changelog
+* Wed Dec 03 2008 Matt Wringe <mwringe at redhat.com> - 0:4.1-0.2
+- Update to remove packaged jars in source tar
+- Build with bootstrap jar so that required java source
+ files get generated
+
+* Wed Oct 22 2008 Jerry James <loganjerry at gmail.com> - 0:4.1-0.1
+- Update to 4.1
+- Also ship the jjrun script
+- Own the appropriate gcj directory
+- Minor spec file changes to comply with latest Fedora guidelines
+- Include the top-level index.html file in the manual
+
* Wed Jul 9 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0:4.0-4.5
- drop repotag
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/javacc/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 18 Jul 2006 16:03:28 -0000 1.3
+++ sources 4 Dec 2008 00:45:53 -0000 1.4
@@ -1 +1,2 @@
-62910e742042d491c7b2f443c8399213 javacc-4.0src-RHCLEAN.tar.gz
+84ed7416d71e4a9e156d16218dfa2b3e javacc-4.1src.tar.gz
+de7a77c72002e81965aaa408145644bb javacc.jar
More information about the fedora-extras-commits
mailing list