[Jpackage-commits] rpms/free/javacc3 javacc-3.2.pom, NONE, 1.1 javacc-component-info.xml, 1.1, 1.2 javacc3-build.patch, NONE, 1.1 javacc3.spec, 1.2, 1.3

jpackage jpackage at ryu.zarb.org
Wed Dec 15 13:09:49 CET 2010


Update of /home/projects/jpackage/cvs/rpms/free/javacc3
In directory ryu.zarb.org:/tmp/P1mJQI_0MO/rpms/free/javacc3

Modified Files:
	javacc-component-info.xml javacc3.spec 
Added Files:
	javacc-3.2.pom javacc3-build.patch 
Log Message:
3.2-6.jpp6

Index: javacc-component-info.xml
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/javacc3/javacc-component-info.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** javacc-component-info.xml	21 Jun 2008 04:17:38 -0000	1.1
--- javacc-component-info.xml	15 Dec 2010 12:09:46 -0000	1.2
***************
*** 2,12 ****
  
     <component id="sun-javacc"
!               version="3.2-brew"
                licenseType="bsd"
                projectHome="https://javacc.dev.java.net/"
                description="JavaCC is a parser/scanner generator for java"
                scm=":ext:cvs.devel.redhat.com:/cvs/dist/javacc3"
!               tag="javacc3-3_2-2jpp_ep1_4_el4">
!       <!-- Built using JDK 1.4 --> 
        <artifact id="javacc.jar"/>
        <export>
--- 2,11 ----
  
     <component id="sun-javacc"
!               version="@VERSION@"
                licenseType="bsd"
                projectHome="https://javacc.dev.java.net/"
                description="JavaCC is a parser/scanner generator for java"
                scm=":ext:cvs.devel.redhat.com:/cvs/dist/javacc3"
!               tag="@TAG@">
        <artifact id="javacc.jar"/>
        <export>

--- NEW FILE: javacc-3.2.pom ---
<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>javacc</groupId>
  <artifactId>javacc</artifactId>
  <version>3.2</version>

  <distributionManagement>
    <relocation>
      <groupId>net.java.dev.javacc</groupId>
    </relocation>
  </distributionManagement>

</project>
--- NEW FILE: javacc3-build.patch ---
--- build.xml.sav	2010-12-15 12:38:21.000000000 +0100
+++ build.xml	2010-12-15 12:45:59.000000000 +0100
@@ -149,4 +149,16 @@
   </exec>
   </target>
 
+  <target name="javadoc" depends="compile">
+    <javadoc sourcepath="src"
+             packagenames="org.javacc.parser.*,
+                           org.javacc.*,
+                           org.javacc.jjdoc.*,
+                           org.javacc.jjtree.*"
+             maxmemory="128m"
+             destdir="dist/javadoc"
+             windowtitle="JavaCC 3.2 API">
+    </javadoc>
+  </target>
+
 </project>

Index: javacc3.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/javacc3/javacc3.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** javacc3.spec	21 Jun 2008 04:17:38 -0000	1.2
--- javacc3.spec	15 Dec 2010 12:09:46 -0000	1.3
***************
*** 1,3 ****
! # Copyright (c) 2000-2008, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2010, JPackage Project
  # All rights reserved.
  #
***************
*** 36,40 ****
  %define without_repolib %{!?_with_repolib:1}%{?_with_repolib:0}
  
! %define repodir %{_javadir}/repository.jboss.com/sun-javacc/3.2-brew
  %define repodirlib %{repodir}/lib
  %define repodirsrc %{repodir}/src
--- 36,40 ----
  %define without_repolib %{!?_with_repolib:1}%{?_with_repolib:0}
  
! %define repodir %{_javadir}/repository.jboss.com/sun-javacc/%{version}-brew
  %define repodirlib %{repodir}/lib
  %define repodirsrc %{repodir}/src
***************
*** 45,63 ****
  Name:           javacc3
  Version:        3.2
! Release:        3%{?dist}
  Epoch:          0
  Summary:        A parser/scanner generator for java
  License:        BSD
! Source0:	javacc-3.2-src.tar.gz
! Source1:	javacc
! Source2:	jjdoc
! Source3:	jjtree
! Source4:	javacc-component-info.xml
  URL:            https://javacc.dev.java.net/
  Group:          Development/Code Generators
  BuildRoot:      %{_tmppath}/%{_basename}-%{version}-%{release}-buildroot
  BuildArch:      noarch
! Requires:	jpackage-utils >= 0:1.5
! BuildRequires:	ant
  
  %description 
--- 45,70 ----
  Name:           javacc3
  Version:        3.2
! Release:        6%{?dist}
  Epoch:          0
  Summary:        A parser/scanner generator for java
  License:        BSD
! Source0:        javacc-3.2-src.tar.gz
! Source1:        javacc
! Source2:        jjdoc
! Source3:        jjtree
! Source4:        javacc-component-info.xml
! Source5:        http://repo1.maven.org/maven2/javacc/javacc/3.2/javacc-3.2.pom
! Patch0:         javacc3-build.patch
  URL:            https://javacc.dev.java.net/
  Group:          Development/Code Generators
  BuildRoot:      %{_tmppath}/%{_basename}-%{version}-%{release}-buildroot
  BuildArch:      noarch
! Requires:       java >= 0:1.6.0
! Requires:       jpackage-utils >= 0:1.7.5
! BuildRequires:  jpackage-utils >= 0:1.7.5
! BuildRequires:  java-devel >= 0:1.6.0
! BuildRequires:  ant >= 0:1.7.1
! Requires(post):    jpackage-utils >= 0:1.7.5
! Requires(postun):  jpackage-utils >= 0:1.7.5
  
  %description 
***************
*** 70,78 ****
  
  %if %{with_repolib}
! %package	 repolib
! Summary:	 Artifacts to be uploaded to a repository library
! Group:	Development/Libraries/Java
  
! %description	 repolib
  Artifacts to be uploaded to a repository library.
  This package is not meant to be installed but so its contents
--- 77,85 ----
  
  %if %{with_repolib}
! %package        repolib
! Summary:        Artifacts to be uploaded to a repository library
! Group:  Development/Libraries/Java
  
! %description    repolib
  Artifacts to be uploaded to a repository library.
  This package is not meant to be installed but so its contents
***************
*** 85,89 ****
  
  %description manual
! Manual for %{_basename}.
  
  %package demo
--- 92,96 ----
  
  %description manual
! %{summary}.
  
  %package demo
***************
*** 92,112 ****
  
  %description demo
! Examples for %{_basename}.
  
  %prep
  %setup -q -n %{_basename}-%{version}
! cp %{SOURCE1} javacc3
! cp %{SOURCE2} jjdoc3
! cp %{SOURCE3} jjtree3
  mv www/doc .
  
- tag=`echo %{name}-%{version}-%{release} | sed 's|\.|_|g'`
- sed -i "s/@TAG@/$tag/g" %{SOURCE4}
- 
  %build
  ant \
    -Dant.build.javac.source=1.4 \
    -Dversion=%{version} \
!   jar
  
  %install
--- 99,126 ----
  
  %description demo
! %{summary}.
! 
! %package javadoc
! Summary:        Javadocs for %{_basename}
! Group:          Development/Documentation
! 
! %description javadoc
! %{summary}.
  
  %prep
  %setup -q -n %{_basename}-%{version}
! %patch0 -b .sav0
! cp -p %{SOURCE1} javacc3
! cp -p %{SOURCE2} jjdoc3
! cp -p %{SOURCE3} jjtree3
  mv www/doc .
  
  %build
+ export CLASSPATH=
+ export OPT_JAR_LIST=:
  ant \
    -Dant.build.javac.source=1.4 \
    -Dversion=%{version} \
!   jar javadoc
  
  %install
***************
*** 115,131 ****
  install -m 644 bin/lib/%{_basename}.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/usr/bin
  install -m 755 javacc3 jjdoc3 jjtree3 $RPM_BUILD_ROOT/usr/bin
! install -d -m 755 $RPM_BUILD_ROOT/usr/share/%{name}
! cp -pr examples $RPM_BUILD_ROOT/usr/share/%{name}
! 
  
  %if %{with_repolib}
! 	install -d -m 755 $RPM_BUILD_ROOT%{repodir}
! 	install -d -m 755 $RPM_BUILD_ROOT%{repodirlib}
! 	install -m 755 %{SOURCE4} $RPM_BUILD_ROOT%{repodir}/component-info.xml
! 	install -d -m 755 $RPM_BUILD_ROOT%{repodirsrc}
! 	install -m 755 %{SOURCE0} $RPM_BUILD_ROOT%{repodirsrc}
! 	cp $RPM_BUILD_ROOT%{_javadir}/javacc3.jar $RPM_BUILD_ROOT%{repodirlib}/javacc.jar
  %endif
  
--- 129,154 ----
  install -m 644 bin/lib/%{_basename}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
  ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+ %add_to_maven_depmap %{_basename} %{_basename} %{version} JPP %{name}
+ install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms/
+ install -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-javacc3.pom
+ 
  install -d -m 755 $RPM_BUILD_ROOT/usr/bin
  install -m 755 javacc3 jjdoc3 jjtree3 $RPM_BUILD_ROOT/usr/bin
! install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
! cp -pr examples $RPM_BUILD_ROOT%{_datadir}/%{name}
! install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! cp -pr dist/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
  
  %if %{with_repolib}
! install -d -m 755 $RPM_BUILD_ROOT%{repodir}
! install -d -m 755 $RPM_BUILD_ROOT%{repodirlib}
! install -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{repodir}/component-info.xml
! tag=`echo %{name}-%{version}-%{release} | sed 's|\.|_|g'`
! sed -i "s/@TAG@/$tag/g" $RPM_BUILD_ROOT%{repodir}/component-info.xml
! sed -i "s/@VERSION@/%{version}-brew/g" $RPM_BUILD_ROOT%{repodir}/component-info.xml
! install -d -m 755 $RPM_BUILD_ROOT%{repodirsrc}
! install -p -m 644 %{SOURCE0} $RPM_BUILD_ROOT%{repodirsrc}
! cp -p $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar $RPM_BUILD_ROOT%{repodirlib}/javacc.jar
  %endif
  
***************
*** 133,139 ****
--- 156,170 ----
  rm -rf $RPM_BUILD_ROOT
  
+ %post
+ %update_maven_depmap
+ 
+ %postun
+ %update_maven_depmap
+ 
  %files
  %defattr(0644,root,root,0755)
  %{_javadir}/*.jar
+ %{_datadir}/maven2/poms/*
+ %{_mavendepmapfragdir}/*
  %doc LICENSE README
  %defattr(0755,root,root,0755)
***************
*** 144,147 ****
--- 175,182 ----
  %doc doc/*
  
+ %files javadoc
+ %defattr(0644,root,root,0755)
+ %{_javadocdir}/%{name}*
+ 
  %files demo
  %defattr(0644,root,root,0755)
***************
*** 151,158 ****
  %files repolib
  %defattr(0644,root,root,0755)
! %{repodir}
  %endif
  
  %changelog
  * Fri May 30 2008 Permaine Cheung <pcheung at redhat.com> 0:3.2-2
  - First JPP 5 build
--- 186,202 ----
  %files repolib
  %defattr(0644,root,root,0755)
! %{_javadir}/repository.jboss.com
  %endif
  
  %changelog
+ * Wed Dec 15 2010 Ralph Apel <r.apel at r-apel.de> 0:3.2-6
+ - Release for JPP-6
+ - Add pom and depmap frag
+ - Add javadocs
+ 
+ * Mon Jan 12 2009 David Walluck <dwalluck at redhat.com> 0:3.2-5
+ - bump release
+ - fix repolib
+ 
  * Fri May 30 2008 Permaine Cheung <pcheung at redhat.com> 0:3.2-2
  - First JPP 5 build




More information about the JPackage-commits mailing list