[Jpackage-commits] dist/plexus-component-api/devel .cvsignore, 1.2, 1.3 plexus-component-api-jpp-depmap.xml, 1.1, NONE plexus-component-api.spec, 1.1, 1.2 sources, 1.2, 1.3

David Walluck david at ryu.zarb.org
Fri Oct 14 23:06:50 CEST 2011


Update of /home/projects/jpackage/cvs/dist/plexus-component-api/devel
In directory ryu.zarb.org:/tmp/cvs-serv16671

Modified Files:
	.cvsignore plexus-component-api.spec sources 
Removed Files:
	plexus-component-api-jpp-depmap.xml 
Log Message:
- 1.0-alpha-22

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/plexus-component-api/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** .cvsignore	14 Oct 2011 20:42:11 -0000	1.2
--- .cvsignore	14 Oct 2011 21:06:47 -0000	1.3
***************
*** 1 ****
! plexus-component-api-1.0-alpha-15.tar.gz
--- 1 ----
! plexus-component-api-1.0-alpha-22.tar.bz2

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/plexus-component-api/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** sources	14 Oct 2011 20:42:11 -0000	1.2
--- sources	14 Oct 2011 21:06:47 -0000	1.3
***************
*** 1 ****
! e3404406d7f86a5a5963c7a8f8626915  plexus-component-api-1.0-alpha-15.tar.gz
--- 1 ----
! 749eb8c0d583d1e6e4c67699a04fbe66  plexus-component-api-1.0-alpha-22.tar.bz2

Index: plexus-component-api.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/plexus-component-api/devel/plexus-component-api.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** plexus-component-api.spec	14 Oct 2011 20:42:11 -0000	1.1
--- plexus-component-api.spec	14 Oct 2011 21:06:47 -0000	1.2
***************
*** 1,53 ****
! %define project_version 1.0-alpha-15
  
  Name:           plexus-component-api
  Version:        1.0
! Release:        0.8.alpha15%{?dist}
  Summary:        Plexus Component API
- 
  Group:          Development/Libraries
  License:        ASL 2.0
! URL:            http://svn.codehaus.org/plexus/plexus-containers/tags/plexus-containers-1.0-alpha-15/plexus-component-api/
! #svn export http://svn.codehaus.org/plexus/plexus-containers/tags/plexus-containers-1.0-alpha-15/plexus-component-api/ plexus-component-api-1.0-alpha-15
! #tar zcf plexus-component-api-1.0-alpha-15.tar.gz plexus-component-api-1.0-alpha-15/
! Source0:        plexus-component-api-1.0-alpha-15.tar.gz
! Source1:        plexus-component-api-jpp-depmap.xml
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
! 
! BuildArch: noarch
! 
! BuildRequires:  java-devel >= 1:1.6.0
! BuildRequires:  jpackage-utils >= 0:1.7.2
! BuildRequires:  ant, ant-nodeps
! BuildRequires:  maven2 >= 0:2.0.4-9
  BuildRequires:  maven2-common-poms
! BuildRequires:  maven-compiler-plugin
! BuildRequires:  maven-install-plugin
! BuildRequires:  maven-jar-plugin
! BuildRequires:  maven-resources-plugin
! BuildRequires:  maven-plugin-plugin
  BuildRequires:  maven-surefire-maven-plugin
! BuildRequires:  maven-javadoc-plugin
  BuildRequires:  plexus-classworlds
! 
! Requires:          java-devel >= 1:1.6.0
! Requires:          plexus-classworlds
! Requires:          jpackage-utils
! Requires(post):    jpackage-utils >= 0:1.7.2
! Requires(postun):  jpackage-utils >= 0:1.7.2
  
  %description
! Plexus Component API
  
  %package javadoc
  Group:          Documentation
  Summary:        Javadoc for %{name}
  
  %description javadoc
  API documentation for %{name}.
  
- 
  %prep
! %setup -q -n %{name}-%{project_version}
  
  %build
--- 1,52 ----
! %define reltag _alpha_22
! %define namedreltag -alpha-22
! %define namedversion %{version}%{?namedreltag}
  
  Name:           plexus-component-api
  Version:        1.0
! Release:        1%{?reltag}%{?dist}
! Epoch:          0
  Summary:        Plexus Component API
  Group:          Development/Libraries
  License:        ASL 2.0
! URL:            http://svn.codehaus.org/plexus/plexus-containers/tags/plexus-containers-1.0-alpha-22/plexus-component-api/
! %if 0
! svn export http://svn.codehaus.org/plexus/plexus-containers/tags/plexus-containers-1.0-alpha-22/plexus-component-api plexus-component-api-1.0-alpha-22 && tar cjf plexus-component-api-1.0-alpha-22.tar.bz2 plexus-component-api-1.0-alpha-22/
! %endif
! Source0:        plexus-component-api-1.0-alpha-22.tar.gz
! Requires(post): jpackage-utils
! Requires(postun): jpackage-utils
! Requires:       jpackage-utils
! Requires:       plexus-classworlds
! BuildRequires:  java-devel
! BuildRequires:  jpackage-utils
! BuildRequires:  maven2
  BuildRequires:  maven2-common-poms
! BuildRequires:  maven2-plugin-compiler
! BuildRequires:  maven2-plugin-install
! BuildRequires:  maven2-plugin-jar
! BuildRequires:  maven2-plugin-resources
! BuildRequires:  maven2-plugin-plugin
  BuildRequires:  maven-surefire-maven-plugin
! BuildRequires:  maven-surefire-provider-junit
! BuildRequires:  maven2-plugin-javadoc
! BuildRequires:  maven-pmd-plugin
  BuildRequires:  plexus-classworlds
! BuildArch:      noarch
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  
  %description
! Plexus Component API.
  
  %package javadoc
  Group:          Documentation
  Summary:        Javadoc for %{name}
+ Requires:       jpackage-utils
  
  %description javadoc
  API documentation for %{name}.
  
  %prep
! %setup -q -n plexus-component-api-%{namedversion}
  
  %build
***************
*** 55,86 ****
  mvn-jpp \
          -e \
-         -Dmaven2.jpp.mode=true \
          -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-         -Dmaven2.jpp.depmap.file=%{SOURCE1} \
          install javadoc:javadoc
  
  %install
- 
  rm -rf %{buildroot}
  
  # 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 -d -m 755 %{buildroot}%{_datadir}/maven2/poms
! install -pm 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
--- 54,77 ----
  mvn-jpp \
          -e \
          -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
          install javadoc:javadoc
  
  %install
  rm -rf %{buildroot}
  
  # jars
! install -d -m 0755 %{buildroot}%{_javadir}
! install -p -m 644 target/plexus-component-api-%{namedversion}.jar %{buildroot}%{_javadir}/plexus-component-api-%{namedversion}.jar
! (cd %{buildroot}%{_javadir} && for jar in *-%{namedversion}*; do ln -s ${jar} `echo $jar| sed "s|-%{namedversion}||g"`; done)
  
  # poms
  install -d -m 755 %{buildroot}%{_datadir}/maven2/poms
! install -pm 644 pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP-plexus-component-api.pom
! %add_to_maven_depmap org.codehaus.plexus plexus-component-api %{namedversion} JPP plexus-component-api
  
  # javadoc
! install -d -m 0755 %{buildroot}%{_javadocdir}/plexus-component-api-%{namedversion}
! cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/plexus-component-api-%{namedversion}
! ln -s plexus-component-api-%{namedversion} %{buildroot}%{_javadocdir}/plexus-component-api
  
  %post
***************
*** 94,108 ****
  
  %files
! %defattr(-,root,root,-)
! %{_javadir}/plexus/*
! %{_datadir}/maven2/poms/*
! %{_mavendepmapfragdir}/*
  
  %files javadoc
! %defattr(-,root,root,-)
! %{_javadocdir}/plexus/%{name}-%{version}
! %{_javadocdir}/plexus/%{name}
  
  %changelog
  * Wed Sep 29 2010 Hui Wang <huwang at redhat.com> - 0:1.0-0.8.alpha16
  - Adjust BRs
--- 85,103 ----
  
  %files
! %defattr(0644,root,root,0755)
! %{_javadir}*/plexus-component-api-%{namedversion}.jar
! %{_javadir}*/plexus-component-api.jar
! %{_datadir}/maven2/poms/JPP-plexus-component-api.pom
! %{_mavendepmapfragdir}/%{name}
  
  %files javadoc
! %defattr(0644,root,root,0755)
! %{_javadocdir}/plexus-component-api-%{namedversion}
! %{_javadocdir}/plexus-component-api
  
  %changelog
+ * Fri Oct 14 2011 David Walluck <dwalluck at redhat.com> 0:1.0-1_alpha_22
+ - 1.0-alpha-22
+ 
  * Wed Sep 29 2010 Hui Wang <huwang at redhat.com> - 0:1.0-0.8.alpha16
  - Adjust BRs

--- plexus-component-api-jpp-depmap.xml DELETED ---




More information about the JPackage-commits mailing list