[Jpackage-commits] dist/jflex/JPP-6 jflex.spec,1.1,1.2

jpackage jpackage at ryu.zarb.org
Wed Dec 8 10:30:43 CET 2010


Update of /home/projects/jpackage/cvs/dist/jflex/JPP-6
In directory ryu.zarb.org:/tmp/cvs-serv4410

Modified Files:
	jflex.spec 
Log Message:
more BRs

Index: jflex.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/jflex/JPP-6/jflex.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** jflex.spec	8 Dec 2010 09:17:01 -0000	1.1
--- jflex.spec	8 Dec 2010 09:30:41 -0000	1.2
***************
*** 52,57 ****
  Source2:        jflex-settings.xml
  Source3:        jflex-1.4.3.pom
  Requires:       java_cup
! Requires:       jpackage-utils
  BuildRequires:  ant
  BuildRequires:  java_cup
--- 52,64 ----
  Source2:        jflex-settings.xml
  Source3:        jflex-1.4.3.pom
+ Requires:       java >= 0:1.6.0
  Requires:       java_cup
! Requires:       jpackage-utils >= 0:1.7.5
! Requires(post): jpackage-utils >= 0:1.7.5
! Requires(postun): jpackage-utils >= 0:1.7.5
! 
! BuildRequires:  jpackage-utils >= 0:1.7.5
! BuildRequires:  java-devel >= 0:1.6.0
! BuildRequires:  junit
  BuildRequires:  ant
  BuildRequires:  java_cup
***************
*** 59,64 ****
  BuildRequires:  jflex
  %endif
- BuildRequires:  java-devel
- BuildRequires:  junit
  
  BuildRequires:  maven2 >= 2.0.8
--- 66,69 ----
***************
*** 106,110 ****
  %prep
  %setup -q
- #%patch0 -b .sav0
  cp -p %{SOURCE2} settings.xml
  
--- 111,114 ----
***************
*** 148,154 ****
          install javadoc:javadoc
  
- #       -Dmaven2.jpp.depmap.file=%{SOURCE4} \
- #       -Dmaven.test.failure.ignore=true \
- 
  popd
  
--- 152,155 ----
***************
*** 188,193 ****
  %{__rm} -rf %{_builddir}/jflex
  
- %if %{gcj_support}
  %post
  if [ -x %{_bindir}/rebuild-gcj-db ]
  then
--- 189,195 ----
  %{__rm} -rf %{_builddir}/jflex
  
  %post
+ %update_maven_depmap
+ %if %{gcj_support}
  if [ -x %{_bindir}/rebuild-gcj-db ]
  then
***************
*** 196,201 ****
  %endif
  
- %if %{gcj_support}
  %postun
  if [ -x %{_bindir}/rebuild-gcj-db ]
  then
--- 198,204 ----
  %endif
  
  %postun
+ %update_maven_depmap
+ %if %{gcj_support}
  if [ -x %{_bindir}/rebuild-gcj-db ]
  then
***************
*** 229,233 ****
  
  %changelog
! * Tue Dec 07 2010 Ralph Apel <r.apel at r-apel.de> 0:1.4.3-1
  - 1.4.3 for JPP-6
  
--- 232,236 ----
  
  %changelog
! * Wed Dec 08 2010 Ralph Apel <r.apel at r-apel.de> 0:1.4.3-1
  - 1.4.3 for JPP-6
  




More information about the JPackage-commits mailing list