rpms/java_cup/F-12 java_cup-build.patch, NONE, 1.1 sources, 1.4, 1.5 java_cup.spec, 1.27, 1.28 .cvsignore, 1.6, 1.7 cup-ant-task.patch, 1.1, NONE
Alexander Kurtakov
akurtakov at fedoraproject.org
Wed Jan 20 11:49:10 UTC 2010
Author: akurtakov
Update of /cvs/pkgs/rpms/java_cup/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16115/F-12
Modified Files:
sources java_cup.spec .cvsignore
Added Files:
java_cup-build.patch
Removed Files:
cup-ant-task.patch
Log Message:
Update to 0.11a.
java_cup-build.patch:
build.xml | 15 +++++++++++++++
1 file changed, 15 insertions(+)
--- NEW FILE java_cup-build.patch ---
--- build.xml.sav 2006-03-28 14:34:52.000000000 +0300
+++ build.xml 2010-01-08 12:50:20.346608627 +0200
@@ -76,4 +76,19 @@
</java>
</target>
+
+ <target name="javadoc" >
+ <mkdir dir="${dist}/javadoc"/>
+ <javadoc
+ destdir="${dist}/javadoc"
+ author="true"
+ version="true"
+ use="true"
+ windowtitle="java_cup API">
+
+ <fileset dir="src" defaultexcludes="yes">
+ </fileset>
+ </javadoc>
+
+ </target>
</project>
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java_cup/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources 17 Feb 2008 21:33:16 -0000 1.4
+++ sources 20 Jan 2010 11:49:10 -0000 1.5
@@ -1 +1 @@
-8b11edfec13c590ea443d0f0ae0da479 java_cup_v10k.tar.gz
+686765898d356a6d3e780d83b3236f39 java_cup-0.11a.tar.bz2
Index: java_cup.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java_cup/F-12/java_cup.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- java_cup.spec 25 Jul 2009 03:55:20 -0000 1.27
+++ java_cup.spec 20 Jan 2010 11:49:10 -0000 1.28
@@ -28,46 +28,37 @@
# 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 pkg_version v10k
+%define pkg_version 11a
%define section free
+%define with_bootstrap 0
Name: java_cup
-Version: 0.10k
-Release: 3
+Version: 0.11a
+Release: 1%{?dist}
Epoch: 1
Summary: Java source interpreter
License: BSD and LGPLv2
-Url: http://www.cs.princeton.edu/%7Eappel/modern/java/CUP/
-Source0: http://www.cs.princeton.edu/%7Eappel/modern/java/CUP/%{name}_%{pkg_version}.tar.gz
-Source1: %{name}-build.xml
-Patch0: http://jflex.de/cup-ant-task.patch
+URL: http://www.cs.princeton.edu/%7Eappel/modern/java/CUP/
+#svn export -r 21 https://www2.in.tum.de/repos/cup/develop/ java_cup-0.11a
+#tar cjf java_cup-0.11a.tar.bz2 java_cup-0.11a/
+Source0: java_cup-0.11a.tar.bz2
+Patch0: %{name}-build.patch
BuildRequires: ant
BuildRequires: jpackage-utils >= 0:1.5
-Group: Development/Tools
-%if ! %{gcj_support}
-Buildarch: noarch
+BuildRequires: jflex
+%if ! %{with_bootstrap}
+BuildRequires: java_cup >= 1:0.11a
%endif
+Group: Development/Tools
+BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
-
%description
java_cup is a LALR Parser Generator for Java
%package javadoc
Summary: Javadoc for java_cup
Group: Documentation
-# For /bin/rm and /bin/ln
-Requires(post): coreutils
-Requires(postun): coreutils
%description javadoc
Javadoc for java_cup
@@ -80,14 +71,27 @@ Group: Documentation
Documentation for java_cup.
%prep
-%setup -q -c -n %{name}-%{version}
-%patch0 -p0
-install -m 644 %{SOURCE1} build.xml
+%setup -q
+%patch0 -b .sav
# remove all binary files
find . -name "*.class" -exec rm -f {} \;
+# remove prebuilt JFlex
+rm -rf java_cup-0.11a/bin/JFlex.jar
+
+# remove prebuilt java_cup, if not bootstrapping
+%if ! %{with_bootstrap}
+rm -rf java_cup-0.11a/bin/java-cup-11.jar
+%endif
+
%build
+%if ! %{with_bootstrap}
+export CLASSPATH=$(build-classpath java_cup java_cup-runtime jflex)
+%else
+export CLASSPATH=$(build-classpath jflex)
+%endif
+
ant
find . -name parser.cup -exec rm {} \;
ant javadoc
@@ -97,8 +101,8 @@ rm -rf $RPM_BUILD_ROOT
# jar
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -m 644 dist/lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-install -m 644 dist/lib/%{name}-runtime.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-runtime-%{version}.jar
+install -m 644 dist/java-cup-%{pkg_version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+install -m 644 dist/java-cup-%{pkg_version}-runtime.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-runtime-%{version}.jar
(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do \
ln -sf ${jar} ${jar/-%{version}/}; done)
@@ -107,59 +111,31 @@ install -d -m 755 $RPM_BUILD_ROOT%{_java
cp -pr dist/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
(cd $RPM_BUILD_ROOT%{_javadocdir} && ln -sf %{name}-%{version} %{name})
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
-
%clean
rm -rf $RPM_BUILD_ROOT
-%post javadoc
-rm -f %{_javadocdir}/%{name}
-ln -s %{name}-%{version} %{_javadocdir}/%{name}
-
-%postun javadoc
-if [ $1 -eq 0 ]; then
- rm -f %{_javadocdir}/%{name}
-fi
-
-%post
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%postun
-%if %{gcj_support}
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
%files
%defattr(0644,root,root,0755)
-%doc README LICENSE CHANGELOG
+%doc changelog.txt
%{_javadir}/*
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/java_cup-%{version}.jar.*
-%attr(-,root,root) %{_libdir}/gcj/%{name}/java_cup-runtime-%{version}.jar.*
-%endif
-
%files manual
%defattr(0644,root,root,0755)
-%doc cup_logo.gif manual.html
+%doc manual.html
%files javadoc
%defattr(0644,root,root,0755)
%doc %{_javadocdir}/%{name}-%{version}
-%ghost %doc %{_javadocdir}/%{name}
+%doc %{_javadocdir}/%{name}
%changelog
+* Fri Jan 20 2010 Alexander Kurtakov <akurtako at redhat.com> 1:0.11a-1
+- Rebuilt in non-bootstrap mode (removed all prebuilt jars).
+- Added BR: jflex and java_cup >= 1:0.11a for non-bootstrap mode
+- Remove unnecessary R(post,postun): coreutils
+- Update to 0.11a.
+- Drop gcj_support.
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.10k-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/java_cup/F-12/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore 17 Feb 2008 21:33:16 -0000 1.6
+++ .cvsignore 20 Jan 2010 11:49:10 -0000 1.7
@@ -1 +1,2 @@
java_cup_v10k.tar.gz
+java_cup-0.11a.tar.bz2
--- cup-ant-task.patch DELETED ---
More information about the scm-commits
mailing list