[Jpackage-commits] dist/maven-archiver/devel .cvsignore, 1.3, 1.4 maven-archiver-depmap.xml, NONE, 1.1 maven-archiver.spec, 1.4, 1.5 sources, 1.3, 1.4

David Walluck david at ryu.zarb.org
Tue Oct 11 23:12:51 CEST 2011


Update of /home/projects/jpackage/cvs/dist/maven-archiver/devel
In directory ryu.zarb.org:/tmp/cvs-serv25809/devel

Modified Files:
	.cvsignore maven-archiver.spec sources 
Added Files:
	maven-archiver-depmap.xml 
Log Message:
- initial import

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-archiver/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** .cvsignore	20 May 2009 21:35:13 -0000	1.3
--- .cvsignore	11 Oct 2011 21:12:48 -0000	1.4
***************
*** 1 ****
! maven-archiver-2.2-src.tgz
--- 1 ----
! maven-archiver-2.4.1-src.tar.bz2

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-archiver/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** sources	20 May 2009 21:35:13 -0000	1.3
--- sources	11 Oct 2011 21:12:49 -0000	1.4
***************
*** 1 ****
! f8677c83f40badb5b81e1ae5c6fe4d69  maven-archiver-2.2-src.tgz
--- 1 ----
! ca5f465ea46cd4d0deb8b2f5f123734b  maven-archiver-2.4.1-src.tar.bz2

--- NEW FILE: maven-archiver-depmap.xml ---
<dependencies>
	<dependency>
	  <maven>
		<groupId>commons-codec</groupId>
		<artifactId>commons-codec</artifactId>
	  </maven>
	  <jpp>
		<groupId>JPP</groupId>
		<artifactId>commons-codec</artifactId>
	  </jpp>
	</dependency>
</dependencies>


Index: maven-archiver.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-archiver/devel/maven-archiver.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** maven-archiver.spec	20 May 2009 21:36:29 -0000	1.4
--- maven-archiver.spec	11 Oct 2011 21:12:49 -0000	1.5
***************
*** 29,91 ****
  #
  
- %define _with_gcj_support 1
- %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
- 
- # If you don't want to build with maven, and use straight ant instead,
- # give rpmbuild option '--without maven'
- %define with_maven %{!?_without_maven:1}%{?_without_maven:0}
- %define without_maven %{?_without_maven:1}%{!?_without_maven:0}
- 
- %define namedversion 1.0-alpha-7
- 
  Name:           maven-archiver
! Version:        2.2
! Release:        1%{?dist}
  Epoch:          0
  Summary:        Maven Archiver
  License:        ASL 2.0
! Group:          Development/Java
  URL:            http://maven.apache.org/
  
! # svn export https://svn.apache.org/repos/asf/maven/shared/tags/maven-archiver-2.2 maven-archiver
! # Note: Exported revision 776866.
! # tar czf maven-archiver-2.2-src.tgz maven-archiver/
! Source0:        %{name}-%{version}-src.tgz
! 
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
- %if ! %{gcj_support}
  BuildArch:      noarch
- %endif
  
  BuildRequires:  jpackage-utils >= 0:1.7.2
! BuildRequires:  maven2 >= 0:2.0.4-9
! BuildRequires:  maven2-plugin-compiler
! BuildRequires:  maven2-plugin-install
! BuildRequires:  maven2-plugin-jar
! BuildRequires:  maven2-plugin-javadoc
! BuildRequires:  maven2-plugin-resources
! BuildRequires:  maven2-plugin-site
! BuildRequires:  maven2-plugin-surefire
  BuildRequires:  plexus-archiver >= 1.0-0.1.a7
  
  Requires:       maven2 >= 0:2.0.4-9
  Requires:       plexus-archiver >= 1.0-0.1.a7
  
  Requires(post):   jpackage-utils >= 0:1.7.2
  Requires(postun): jpackage-utils >= 0:1.7.2
! 
! %if %{gcj_support}
! BuildRequires:    java-gcj-compat-devel
! Requires(post):   java-gcj-compat
! Requires(postun): java-gcj-compat
! %endif
  
  %description
! The Maven Archiver is mainly used by plugins to handle packaging.
  
  %package javadoc
  Summary:        Javadoc for %{name}
! Group:          Development/Documentation
  
  %description javadoc
--- 29,81 ----
  #
  
  Name:           maven-archiver
! Version:        2.4.1
! Release:        5%{?dist}
  Epoch:          0
  Summary:        Maven Archiver
  License:        ASL 2.0
! Group:          Development/Libraries
  URL:            http://maven.apache.org/
  
! # svn export https://svn.apache.org/repos/asf/maven/shared/tags/maven-archiver-2.4.1 maven-archiver
! # tar jcf maven-archiver-2.4.1-src.tar.bz2 maven-archiver/
! Source0:        %{name}-%{version}-src.tar.bz2
! Source1:        %{name}-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:  maven2 >= 0:2.0.8
! BuildRequires:  maven2-common-poms
! 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-interpolation
  BuildRequires:  plexus-archiver >= 1.0-0.1.a7
+ BuildRequires:  plexus-utils
  
  Requires:       maven2 >= 0:2.0.4-9
  Requires:       plexus-archiver >= 1.0-0.1.a7
+ Requires:       plexus-interpolation
+ Requires:       plexus-utils
  
  Requires(post):   jpackage-utils >= 0:1.7.2
  Requires(postun): jpackage-utils >= 0:1.7.2
! Provides: maven-shared-archiver = %{version}-%{release}
! Obsoletes: maven-shared-archiver < %{version}-%{release}
  
  %description
! The Maven Archiver is used by other Maven plugins
! to handle packaging
  
  %package javadoc
  Summary:        Javadoc for %{name}
! Group:          Documentation
! Requires:       jpackage-utils
  
  %description javadoc
***************
*** 103,106 ****
--- 93,99 ----
      -e \
      -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+     -Dmaven.test.failure.ignore=true \
+     -Dmaven2.jpp.depmap.file=%{SOURCE1} \
+     -Dmaven.test.skip=true \
      install javadoc:javadoc
  
***************
*** 113,121 ****
  
  # Copy file and create unversioned symlink
! install -pm 644 target/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
  ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
  
  # Copy pom
! install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-maven-archiver.pom
  %add_to_maven_depmap org.apache.maven maven-archiver %{version} JPP maven-archiver
  
--- 106,116 ----
  
  # Copy file and create unversioned symlink
! install -pm 644 target/%{name}-%{version}.jar \
!   $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
  ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
  
  # Copy pom
! install -pm 644 pom.xml \
!   $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-maven-archiver.pom
  %add_to_maven_depmap org.apache.maven maven-archiver %{version} JPP maven-archiver
  
***************
*** 125,152 ****
  ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
  
- %if %{gcj_support}
- %{_bindir}/aot-compile-rpm
- %endif
- 
  %clean
  rm -rf $RPM_BUILD_ROOT
  
- %if %{gcj_support}
- %postun
- if [ -x %{_bindir}/rebuild-gcj-db ]
- then
-   %{_bindir}/rebuild-gcj-db
- fi
- %endif
- 
  %files
  %defattr(-,root,root,-)
! %{_javadir}
! %{_datadir}/maven2
! %{_mavendepmapfragdir}
! 
! %if %{gcj_support}
! %attr(-,root,root) %{_libdir}/gcj/%{name}
! %endif
  
  %files javadoc
--- 120,131 ----
  ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
  
  %clean
  rm -rf $RPM_BUILD_ROOT
  
  %files
  %defattr(-,root,root,-)
! %{_javadir}/*
! %{_datadir}/maven2/poms/JPP-maven-archiver.pom
! %{_mavendepmapfragdir}/%{name}
  
  %files javadoc
***************
*** 155,158 ****
--- 134,163 ----
  
  %changelog
+ * Tue Sep 28 2010 Hui Wang <huwang at redhat.com> 0:2.4.1-5
+ - Adjust BRs
+ 
+ * Thu Sep 02 2010 Hui Wang <huwang at redhat.com> 0:2.4.1-4
+ - Rebuild with maven221
+ - Skip test
+ 
+ * Thu Aug 05 2010 Hui Wang <huwang at redhat.com> 0:2.4.1-3
+ - Change source tarball xz to bz2
+ 
+ * Mon May 31 2010 Alexander Kurtakov <akurtako at redhat.com> 0:2.4.1-2
+ - BR java-devel >= 1:1.6.0.
+ 
+ * Sat May 29 2010 Alexander Kurtakov <akurtako at redhat.com> 0:2.4.1-1
+ - Update to 2.4.1.
+ 
+ * Wed Dec 23 2009 Alexander Kurtakov <akurtako at redhat.com> 0:2.4-1
+ - Update to 2.4.
+ 
+ * Mon Dec 21 2009 Alexander Kurtakov <akurtako at redhat.com> 0:2.2-3
+ - BR maven-surefire-provider-junit.
+ 
+ * Mon Aug 31 2009 Alexander Kurtakov <akurtako at redhat.com> 0:2.2-2
+ - Fix line length.
+ - Own only specific fragment and pom.
+ 
  * Wed May 20 2009 Fernando Nasser <fnasser at redhat.com> 0:2.2-1
  - Fix license




More information about the JPackage-commits mailing list