[Jpackage-commits] rpms/free/plexus-bsh-factory plexus-bsh-factory.spec, 1.2, 1.3

jpackage jpackage at ryu.zarb.org
Tue Dec 7 00:19:24 CET 2010


Update of /home/projects/jpackage/cvs/rpms/free/plexus-bsh-factory
In directory ryu.zarb.org:/tmp/yKDVqPmdYA/rpms/free/plexus-bsh-factory

Modified Files:
	plexus-bsh-factory.spec 
Log Message:
1.0-0.a7s.5.jpp6

Index: plexus-bsh-factory.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/plexus-bsh-factory/plexus-bsh-factory.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** plexus-bsh-factory.spec	2 Oct 2008 19:26:29 -0000	1.2
--- plexus-bsh-factory.spec	6 Dec 2010 23:19:22 -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.
  #
***************
*** 47,53 ****
  Name:           %{parent}-%{subname}
  Version:        1.0
! Release:        0.a7s.4%{?dist}
  Epoch:          0
! Summary:        Plexus Component Creator
  License:        ASL 2.0
  Group:          Development/Java
--- 47,53 ----
  Name:           %{parent}-%{subname}
  Version:        1.0
! Release:        0.a7s.5%{?dist}
  Epoch:          0
! Summary:        Plexus Bsh Factory
  License:        ASL 2.0
  Group:          Development/Java
***************
*** 58,70 ****
  Source2:        %{name}-build.xml
  Patch0:         %{name}-encodingfix.patch
  Requires:       bsh
  Requires:       classworlds
  Requires:       plexus-container-default
  Requires:       plexus-utils
! Requires(post):  jpackage-utils >= 0:1.7.2
! Requires(postun): jpackage-utils >= 0:1.7.2
! BuildRequires:  jpackage-utils >= 0:1.7.2
  %if %{with_maven}
! BuildRequires:  maven2 >= 2.0.4-9
  BuildRequires:  maven2-plugin-compiler
  BuildRequires:  maven2-plugin-install
--- 58,72 ----
  Source2:        %{name}-build.xml
  Patch0:         %{name}-encodingfix.patch
+ Requires:       java >= 0:1.6.0
  Requires:       bsh
  Requires:       classworlds
  Requires:       plexus-container-default
  Requires:       plexus-utils
! Requires(post):  jpackage-utils >= 0:1.7.5
! Requires(postun): jpackage-utils >= 0:1.7.5
! BuildRequires:  jpackage-utils >= 0:1.7.5
  %if %{with_maven}
! BuildRequires:  java-devel >= 0:1.6.0
! BuildRequires:  maven2 >= 2.0.8
  BuildRequires:  maven2-plugin-compiler
  BuildRequires:  maven2-plugin-install
***************
*** 74,78 ****
  BuildRequires:  maven2-common-poms >= 1.0-2
  BuildRequires:  maven-release
! BuildRequires:  maven-surefire-plugin
  %else
  BuildRequires:  ant
--- 76,81 ----
  BuildRequires:  maven2-common-poms >= 1.0-2
  BuildRequires:  maven-release
! BuildRequires:  maven-surefire-maven-plugin
! BuildRequires:  apache-commons-parent
  %else
  BuildRequires:  ant
***************
*** 130,134 ****
  # jars
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
! install -pm 644 target/*.jar $RPM_BUILD_ROOT%{_javadir}/%{parent}/%{subname}-%{version}.jar
  (cd $RPM_BUILD_ROOT%{_javadir}/%{parent} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
  
--- 133,137 ----
  # jars
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
! install -m 644 target/*.jar $RPM_BUILD_ROOT%{_javadir}/%{parent}/%{subname}-%{version}.jar
  (cd $RPM_BUILD_ROOT%{_javadir}/%{parent} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
  
***************
*** 152,155 ****
--- 155,159 ----
  
  %post
+ %update_maven_depmap
  %if %{gcj_support}
  if [ -x %{_bindir}/rebuild-gcj-db ]
***************
*** 158,164 ****
  fi
  %endif
- %update_maven_depmap
  
  %postun
  %if %{gcj_support}
  if [ -x %{_bindir}/rebuild-gcj-db ]
--- 162,168 ----
  fi
  %endif
  
  %postun
+ %update_maven_depmap
  %if %{gcj_support}
  if [ -x %{_bindir}/rebuild-gcj-db ]
***************
*** 167,176 ****
  fi
  %endif
- %update_maven_depmap
  
  %files
  %defattr(0644,root,root,0755)
! %{_javadir}/plexus
! %{_datadir}/maven2/*
  %{_mavendepmapfragdir}/*
  %if %{with_maven}
--- 171,180 ----
  fi
  %endif
  
  %files
  %defattr(0644,root,root,0755)
! %dir %{_javadir}/plexus
! %{_javadir}/plexus/*.jar
! %{_datadir}/maven2/poms/*
  %{_mavendepmapfragdir}/*
  %if %{with_maven}
***************
*** 187,190 ****
--- 191,197 ----
  
  %changelog
+ * Mon Dec 06 2010 Ralph Apel <r.apel at r-apel.de> 0:1.0-0.a7s.5
+ - update maven dependencies
+ 
  * Thu Oct 02 2008 David Walluck <dwalluck at redhat.com> 0:1.0-0.a7s.4
  - update maven dependencies




More information about the JPackage-commits mailing list