[Jpackage-commits] dist/groovy16/JPP-6 groovy16.spec,1.3,1.4

jpackage jpackage at ryu.zarb.org
Fri Dec 17 13:44:00 CET 2010


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

Modified Files:
	groovy16.spec 
Log Message:
1.6.9-3

Index: groovy16.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/groovy16/JPP-6/groovy16.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** groovy16.spec	16 Dec 2010 22:43:15 -0000	1.3
--- groovy16.spec	17 Dec 2010 12:43:57 -0000	1.4
***************
*** 37,41 ****
  Url:            http://groovy.codehaus.org/
  Version:        1.6.9
! Release:        2%{?dist}
  Epoch:          0
  License:        Apache Software License 2.0
--- 37,41 ----
  Url:            http://groovy.codehaus.org/
  Version:        1.6.9
! Release:        3%{?dist}
  Epoch:          0
  License:        Apache Software License 2.0
***************
*** 264,268 ****
  export OPT_JAR_LIST="maven-ant-tasks ant17/ant17-trax ant17/ant17-antlr ant17/ant17-junit junit"
  export ANT_OPTS="-DskipFetch=true -DforceRetro=false"
! ant17 install javadoc || :
  
  %install
--- 264,268 ----
  export OPT_JAR_LIST="maven-ant-tasks ant17/ant17-trax ant17/ant17-antlr ant17/ant17-junit junit"
  export ANT_OPTS="-DskipFetch=true -DforceRetro=false"
! ant17 install javadoc 
  
  %install
***************
*** 281,286 ****
--- 281,288 ----
  install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
  %add_to_maven_depmap org.codehaus.groovy groovy %{namedversion} JPP %{name}
+ %add_to_maven_depmap org.codehaus.groovy groovy16 %{namedversion} JPP %{name}
  install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}-all.pom
  %add_to_maven_depmap org.codehaus.groovy groovy-all %{namedversion} JPP %{name}-all
+ %add_to_maven_depmap org.codehaus.groovy groovy16-all %{namedversion} JPP %{name}-all
  
  # javadoc
***************
*** 305,309 ****
  install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/embeddable
  pushd $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/embeddable
! ln -sf %{_javadir}/groovy-all.jar
  popd
  
--- 307,311 ----
  install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/embeddable
  pushd $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/embeddable
! ln -sf %{_javadir}/groovy16-all.jar
  popd
  
***************
*** 311,315 ****
  install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/lib
  pushd $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/lib
! build-jar-repository . \
  ant \
  ant/ant-junit \
--- 313,317 ----
  install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/lib
  pushd $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/lib
! build-jar-repository -s -p . \
  ant \
  ant/ant-junit \
***************
*** 338,351 ****
  rm -rf $RPM_BUILD_ROOT
  
- %preun
- if [ "$1" = "0" ]; then
-   rm %{_datadir}/%{name}-%{version}/lib/*.jar
- fi
- 
- %pre
- rm -f %{_datadir}/%{name}-%{version}/lib/*
- 
  %post
- rebuild-jar-repository %{_datadir}/%{name}-%{version}/lib
  %update_maven_depmap
  
--- 340,344 ----
***************
*** 367,370 ****
--- 360,369 ----
  
  %changelog
+ * Fri Dec 17 2010 Ralph Apel <r.apel at r-apel.de> 0:1.6.9-3
+ - Use grovy16 when symlinking to lib
+ - Use build-jar-repository to build lib
+ - Omit rebuild-jar-repository and rm ./lib/* scriptlets
+ - Depmap groovy:grovy16 and groovy:grovy16-all
+ 
  * Thu Dec 16 2010 Ralph Apel <r.apel at r-apel.de> 0:1.6.9-2
  - Fix command names




More information about the JPackage-commits mailing list