[Jpackage-commits] dist/plexus-active-collections/devel plexus-active-collections-jpp-depmap.xml, 1.1, NONE plexus-active-collections.spec, 1.1, 1.2

David Walluck david at ryu.zarb.org
Sat Oct 15 01:05:48 CEST 2011


Update of /home/projects/jpackage/cvs/dist/plexus-active-collections/devel
In directory ryu.zarb.org:/tmp/cvs-serv17544

Modified Files:
	plexus-active-collections.spec 
Removed Files:
	plexus-active-collections-jpp-depmap.xml 
Log Message:
- fix Requires

--- plexus-active-collections-jpp-depmap.xml DELETED ---

Index: plexus-active-collections.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/plexus-active-collections/devel/plexus-active-collections.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** plexus-active-collections.spec	14 Oct 2011 20:33:43 -0000	1.1
--- plexus-active-collections.spec	14 Oct 2011 23:05:46 -0000	1.2
***************
*** 1,61 ****
! %define project_version 1.0-beta-2
  
  Name:           plexus-active-collections
  Version:        1.0
! Release:        0.5.beta2%{?dist}
  Summary:        Plexus Container-Backed Active Collections
! 
! Group:          Development/Libraries
  License:        ASL 2.0
  URL:            http://plexus.codehaus.org/
! #svn export http://svn.codehaus.org/plexus/tags/plexus-active-collections-1.0-beta-2/
! #tar zcf plexus-active-collections-1.0-beta-2.tar.gz plexus-active-collections-1.0-beta-2/
  Source0:        plexus-active-collections-1.0-beta-2.tar.gz
! Source1:        plexus-active-collections-jpp-depmap.xml
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
! 
! BuildArch: noarch
! 
! BuildRequires:  java >= 1:1.6.0
! BuildRequires:  jpackage-utils >= 0:1.7.2
! BuildRequires:  ant, ant-nodeps
  BuildRequires:  maven2
  BuildRequires:  maven2-common-poms
  BuildRequires:  maven2-plugin-plugin
! BuildRequires:  maven-compiler-plugin
! BuildRequires:  maven-install-plugin
! BuildRequires:  maven-jar-plugin
! BuildRequires:  maven-javadoc-plugin
! BuildRequires:  maven-resources-plugin
  BuildRequires:  maven-surefire-maven-plugin
! BuildRequires:  plexus-maven-plugin
! BuildRequires:  plexus-component-api
! BuildRequires:  plexus-container-default
! BuildRequires:  junit
! 
! Requires:          java >= 1:1.6.0
! Requires:          plexus-component-api
! Requires:          plexus-container-default
! Requires:          junit
! Requires:          jpackage-utils
! Requires(post):    jpackage-utils >= 0:1.7.2
! Requires(postun):  jpackage-utils >= 0:1.7.2
! 
  
  %description
! Plexus Container-Backed Active Collections
  
  %package javadoc
  Group:          Documentation
  Summary:        Javadoc for %{name}
! 
! Requires:          plexus-utils
  
  %description javadoc
  API documentation for %{name}.
  
- 
  %prep
! %setup -q -n %{name}-%{project_version}
  
  %build
--- 1,56 ----
! %define reltag _beta_2
! %define namedreltag -beta-2
! %global namedversion %{version}%{?namedreltag}
  
  Name:           plexus-active-collections
  Version:        1.0
! Release:        1%{?reltag}%{?dist}
! Epoch:          0
  Summary:        Plexus Container-Backed Active Collections
! Group:          Development/Java
  License:        ASL 2.0
  URL:            http://plexus.codehaus.org/
! # svn export http://svn.codehaus.org/plexus/tags/plexus-active-collections-1.0-beta-2 && tar ccf plexus-active-collections-1.0-beta-2.tar.gz plexus-active-collections-1.0-beta-2
  Source0:        plexus-active-collections-1.0-beta-2.tar.gz
! Requires(post): jpackage-utils
! Requires(postun): jpackage-utils
! Requires:       jpackage-utils
! # XXX: 1.0-alpha-12
! Requires:       plexus-component-api >= 0:1.0
! # XXX: 1.0-alpha-12
! Requires:       plexus-container-default >= 0:1.0
! BuildRequires:  jpackage-utils
  BuildRequires:  maven2
  BuildRequires:  maven2-common-poms
  BuildRequires:  maven2-plugin-plugin
! BuildRequires:  maven2-plugin-compiler
! BuildRequires:  maven2-plugin-install
! BuildRequires:  maven2-plugin-jar
! BuildRequires:  maven2-plugin-javadoc
! BuildRequires:  maven2-plugin-resources
  BuildRequires:  maven-surefire-maven-plugin
! BuildRequires:  maven-surefire-provider-junit
! BuildRequires:  junit >= 0:3.8.2
! BuildRequires:  plexus-maven-plugin >= 0:1.3
! # XXX: 1.0-alpha-12
! BuildRequires:  plexus-component-api >= 0:1.0
! # XXX: 1.0-alpha-12
! BuildRequires:  plexus-container-default 0:1.0
! BuildArch:      noarch
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  
  %description
! Plexus Container-Backed Active Collections.
  
  %package javadoc
  Group:          Documentation
  Summary:        Javadoc for %{name}
! Requires:       jpackage-utils
  
  %description javadoc
  API documentation for %{name}.
  
  %prep
! %setup -q -n plexus-active-collections--%{namedversion}
  
  %build
***************
*** 63,70 ****
  mvn-jpp \
          -e \
-         -Dmaven2.jpp.mode=true \
          -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-         -Dmaven2.jpp.depmap.file=%{SOURCE1} \
-         -Dmaven.test.skip=true \
          install javadoc:javadoc
  
--- 58,62 ----
***************
*** 73,92 ****
  
  # jars
! install -d -m 0755 %{buildroot}%{_javadir}/plexus
! install -m 644 target/%{name}-%{project_version}.jar %{buildroot}%{_javadir}/plexus
! 
! (cd %{buildroot}%{_javadir}/plexus && for jar in *-%{project_version}*; \
!     do ln -sf ${jar} `echo $jar| sed "s|-%{project_version}||g"`; done)
! 
! %add_to_maven_depmap org.codehaus.plexus %{name} %{project_version} JPP/plexus %{name}
  
  # poms
! install -Dpm 644 pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP.plexus-%{name}.pom
  
  # javadoc
! install -d -m 0755 %{buildroot}%{_javadocdir}/plexus/%{name}-%{version}
! cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/plexus/%{name}-%{version}/
! ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/plexus/%{name}
! rm -rf target/site/api*
  
  %post
--- 65,80 ----
  
  # jars
! install -d -m 0755 %{buildroot}%{_javadir}
! install -p -m 644 target/plexus-active-collections-%{namedversion}.jar %{buildroot}%{_javadir}
! (cd %{buildroot}%{_javadir} && for jar in *-%{namedversion}*; do ln -s ${jar} `echo $jar | sed "s|-%{namedversion}||g"`; done)
  
  # poms
! install -Dpm 644 pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP-plexus-active-collections.pom
! %add_to_maven_depmap org.codehaus.plexus plexus-active-collections %{namedversion} JPP plexus-active-collections
  
  # javadoc
! install -d -m 0755 %{buildroot}%{_javadocdir}/plexus-active-collections-%{namedversion}
! cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/plexus-active-collections-%{namedversion}/
! ln -s plexus-active-collections-%{namedversion} %{buildroot}%{_javadocdir}/plexus-active-collections
  
  %post
***************
*** 100,114 ****
  
  %files
! %defattr(-,root,root,-)
! %{_javadir}/plexus/*
! %{_datadir}/maven2/poms/*
! %{_mavendepmapfragdir}/*
  
  %files javadoc
! %defattr(-,root,root,-)
! %{_javadocdir}/plexus/%{name}-%{version}
! %{_javadocdir}/plexus/%{name}
  
  %changelog
  * Tue Sep 28 2010 Hui Wang <huwang at redhat.com> - 1.0-0.5.beta2
  - Adjust BRs
--- 88,106 ----
  
  %files
! %defattr(0644,root,root,0755)
! %{_javadir}*/plexus-active-collections-%{namedversion}.jar
! %{_javadir}*/plexus-active-collections.jar
! %{_datadir}/maven2/poms/JPP-plexus-active-collections.pom
! %{_mavendepmapfragdir}/%{name}
  
  %files javadoc
! %defattr(0644,root,root,0755)
! %{_javadocdir}/plexus-active-collections-%{namedversion}
! %{_javadocdir}/plexus-active-collections
  
  %changelog
+ * Fri Oct 14 2011 David Walluck <dwalluck at redhat.com> 0:1.0-1_beta_2
+ - fix Requires
+ 
  * Tue Sep 28 2010 Hui Wang <huwang at redhat.com> - 1.0-0.5.beta2
  - Adjust BRs




More information about the JPackage-commits mailing list