[Jpackage-commits] rpms/free/groovy10 groovy-1.0-jpp-depmap.xml, 1.1, 1.2 groovy-1.0.pom, 1.1, 1.2 groovy10.spec, 1.1, 1.2

jpackage jpackage at ryu.zarb.org
Fri Dec 17 12:18:23 CET 2010


Update of /home/projects/jpackage/cvs/rpms/free/groovy10
In directory ryu.zarb.org:/tmp/1ShynG_qkL/rpms/free/groovy10

Modified Files:
	groovy-1.0-jpp-depmap.xml groovy-1.0.pom groovy10.spec 
Log Message:
1.0-4.jpp6

Index: groovy-1.0-jpp-depmap.xml
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/groovy10/groovy-1.0-jpp-depmap.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** groovy-1.0-jpp-depmap.xml	16 Dec 2010 18:52:58 -0000	1.1
--- groovy-1.0-jpp-depmap.xml	17 Dec 2010 11:18:20 -0000	1.2
***************
*** 152,157 ****
        <jpp>
           <groupId>JPP</groupId>
!          <artifactId>cglib-nodep</artifactId>
!          <jar>cglib-nodep.jar</jar>
           <version>2.1_3</version>
        </jpp>
--- 152,157 ----
        <jpp>
           <groupId>JPP</groupId>
!          <artifactId>cglib21-nodep</artifactId>
!          <jar>cglib21-nodep.jar</jar>
           <version>2.1_3</version>
        </jpp>

Index: groovy-1.0.pom
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/groovy10/groovy-1.0.pom,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** groovy-1.0.pom	16 Dec 2010 18:52:58 -0000	1.1
--- groovy-1.0.pom	17 Dec 2010 11:18:20 -0000	1.2
***************
*** 409,413 ****
      <dependency>
        <groupId>cglib</groupId>
!       <artifactId>cglib-nodep</artifactId>
        <version>2.1_3</version>
      </dependency>
--- 409,413 ----
      <dependency>
        <groupId>cglib</groupId>
!       <artifactId>cglib21-nodep</artifactId>
        <version>2.1_3</version>
      </dependency>
***************
*** 528,530 ****
      </dependency>
    </dependencies>
! </project>
\ No newline at end of file
--- 528,530 ----
      </dependency>
    </dependencies>
! </project>

Index: groovy10.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/groovy10/groovy10.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** groovy10.spec	16 Dec 2010 18:52:58 -0000	1.1
--- groovy10.spec	17 Dec 2010 11:18:20 -0000	1.2
***************
*** 36,40 ****
  Url:            http://groovy.codehaus.org/
  Version:        1.0
! Release:        3%{?dist}
  Epoch:          0
  License:        BSD/Apache-style Software License
--- 36,40 ----
  Url:            http://groovy.codehaus.org/
  Version:        1.0
! Release:        4%{?dist}
  Epoch:          0
  License:        BSD/Apache-style Software License
***************
*** 71,75 ****
  BuildRequires:  axion
  BuildRequires:  bsf
! BuildRequires:  cglib >= 0:2.1.3
  BuildRequires:  apache-commons-lang
  BuildRequires:  apache-commons-cli
--- 71,75 ----
  BuildRequires:  axion
  BuildRequires:  bsf
! BuildRequires:  cglib21
  BuildRequires:  apache-commons-lang
  BuildRequires:  apache-commons-cli
***************
*** 103,107 ****
  Requires:       axion
  Requires:       bsf
! Requires:       cglib
  Requires:       apache-commons-cli
  Requires:       apache-commons-codec
--- 103,107 ----
  Requires:       axion
  Requires:       bsf
! Requires:       cglib21
  Requires:       apache-commons-cli
  Requires:       apache-commons-codec
***************
*** 253,257 ****
  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
  
--- 253,257 ----
  install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/embeddable
  pushd $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/embeddable
! ln -sf %{javadir}/groovy10-all.jar
  popd
  
***************
*** 259,263 ****
  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 \
--- 259,263 ----
  install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/lib
  pushd $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/lib
! build-jar-repository -p -s . \
  ant \
  ant/ant-junit \
***************
*** 271,275 ****
  axion \
  bsf \
! cglib-nodep \
  commons-cli \
  commons-codec \
--- 271,275 ----
  axion \
  bsf \
! cglib21-nodep \
  commons-cli \
  commons-codec \
***************
*** 295,300 ****
  
  
! ln -sf %{_javadir}/groovy.jar
! ln -sf %{_javadir}/groovy-starter.jar
  popd
  
--- 295,300 ----
  
  
! ln -sf %{_javadir}/groovy10.jar
! ln -sf %{_javadir}/groovy10-starter.jar
  popd
  
***************
*** 302,315 ****
  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
  
--- 302,306 ----
***************
*** 331,334 ****
--- 322,331 ----
  
  %changelog
+ * Fri Dec 17 2010 Ralph Apel <r.apel at r-apel.de> 0:1.0-4
+ - Change (B)R cglib to cglib21
+ - Create lib with "build-jar-repository -p -s"
+ - Omit rebuild-jar-repository and rm lib/*
+ - Use groovy10 in lib links
+ 
  * Wed Dec 16 2010 Ralph Apel <r.apel at r-apel.de> 0:1.0-3
  - First JPP-6 release as groovy10




More information about the JPackage-commits mailing list