[Jpackage-commits] dist/groovy15/JPP-6 groovy15.spec,1.12,1.13

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


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

Modified Files:
	groovy15.spec 
Log Message:
Fixes

Index: groovy15.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/groovy15/JPP-6/groovy15.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -C 2 -d -r1.12 -r1.13
*** groovy15.spec	16 Dec 2010 18:58:21 -0000	1.12
--- groovy15.spec	17 Dec 2010 11:23:46 -0000	1.13
***************
*** 37,41 ****
  Url:            http://groovy.codehaus.org/
  Version:        1.5.8
! Release:        1%{?dist}
  Epoch:          0
  License:        Apache Software License 2.0
--- 37,41 ----
  Url:            http://groovy.codehaus.org/
  Version:        1.5.8
! Release:        2%{?dist}
  Epoch:          0
  License:        Apache Software License 2.0
***************
*** 74,78 ****
  BuildRequires:  asm2 >= 0:2.2
  BuildRequires:  bsf
! BuildRequires:  cglib >= 0:2.1.3
  BuildRequires:  hsqldb
  BuildRequires:  apache-commons-beanutils
--- 74,78 ----
  BuildRequires:  asm2 >= 0:2.2
  BuildRequires:  bsf
! BuildRequires:  cglib21
  BuildRequires:  hsqldb
  BuildRequires:  apache-commons-beanutils
***************
*** 312,316 ****
  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
  
--- 312,316 ----
  install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/embeddable
  pushd $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/embeddable
! ln -sf %{_javadir}/groovy15-all.jar
  popd
  
***************
*** 318,322 ****
  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 \
--- 318,322 ----
  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 \
***************
*** 345,358 ****
  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
  
--- 345,349 ----
***************
*** 371,378 ****
  %files javadoc
  %defattr(-,root,root)
! %{_javadocdir}/%{name}-%{version}
! %doc %{_javadocdir}/%{name}
  
  %changelog
  * Thu Dec 16 2010 Ralph Apel <r.apel at r-apel.de> 0:1.5.8-1
  - First JPP-6 release
--- 362,374 ----
  %files javadoc
  %defattr(-,root,root)
! %doc %{_javadocdir}/%{name}*
  
  %changelog
+ * Fri Dec 17 2010 Ralph Apel <r.apel at r-apel.de> 0:1.5.8-2
+ - Use build-jar-repository -s -p to build lib
+ - Omit rebuild-jar-repository and rm lib/* scriptlets
+ - Symlink groovy15.jar to lib
+ - BR cglib21 instead of cglib
+ 
  * Thu Dec 16 2010 Ralph Apel <r.apel at r-apel.de> 0:1.5.8-1
  - First JPP-6 release




More information about the JPackage-commits mailing list