[Jpackage-commits] dist/apache-mime4j/JPP-6 .cvsignore, 1.2, 1.3 apache-mime4j-jpp-depmap.xml, 1.1, 1.2 apache-mime4j-settings.xml, 1.1, 1.2 apache-mime4j.spec, 1.12, 1.13 james-parent-1.2.pom, 1.1, NONE sources, 1.2, 1.3

David Walluck david at ryu.zarb.org
Tue Dec 14 07:38:01 CET 2010


Update of /home/projects/jpackage/cvs/dist/apache-mime4j/JPP-6
In directory ryu.zarb.org:/tmp/cvs-serv25188

Modified Files:
	.cvsignore apache-mime4j-jpp-depmap.xml 
	apache-mime4j-settings.xml apache-mime4j.spec sources 
Removed Files:
	james-parent-1.2.pom 
Log Message:
- build with external apache-jar-resource-bundle-1.3
- build with external james-project-1.2
- remove BuildRequires: junit44


Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/apache-mime4j/JPP-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** .cvsignore	15 Oct 2010 22:39:40 -0000	1.2
--- .cvsignore	14 Dec 2010 06:37:58 -0000	1.3
***************
*** 1,2 ****
- apache-jar-resource-bundle-1.3.jar
  apache-mime4j-0.6-src.tar.gz
--- 1 ----

Index: apache-mime4j.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/apache-mime4j/JPP-6/apache-mime4j.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -C 2 -d -r1.12 -r1.13
*** apache-mime4j.spec	16 Oct 2010 08:46:21 -0000	1.12
--- apache-mime4j.spec	14 Dec 2010 06:37:58 -0000	1.13
***************
*** 29,40 ****
  #
  
! %define section   free
  
  Name:           apache-mime4j
  Version:        0.6
! Release:	1%{?dist}
  Epoch:          0
  Summary:        Mime stream parser
- 
  Group:          Development/Libraries/Java
  License:        BSD
--- 29,39 ----
  #
  
! %define section free
  
  Name:           apache-mime4j
  Version:        0.6
! Release:        2%{?dist}
  Epoch:          0
  Summary:        Mime stream parser
  Group:          Development/Libraries/Java
  License:        BSD
***************
*** 43,54 ****
  Source2:        %{name}-jpp-depmap.xml
  Source3:        %{name}-settings.xml
- Source4:        james-parent-1.2.pom
  Source5:        apache-jar-resource-bundle-1.3.jar
  Patch0:         %{name}-pom.patch
  Patch1:         %{name}-TestHandler.patch
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
! 
! BuildArch:      noarch
! BuildRequires:  jpackage-utils >= 0:5.0.0
  BuildRequires:  java-devel >= 0:1.6.0
  BuildRequires:  maven2 >= 0:2.0.8
--- 42,56 ----
  Source2:        %{name}-jpp-depmap.xml
  Source3:        %{name}-settings.xml
  Source5:        apache-jar-resource-bundle-1.3.jar
  Patch0:         %{name}-pom.patch
  Patch1:         %{name}-TestHandler.patch
! Requires(post): jpackage-utils >= 0:1.7.3
! Requires(postun): jpackage-utils >= 0:1.7.3
! Requires:       apache-commons-logging
! Requires:       java >= 0:1.6.0
! Requires:       jpackage-utils
! BuildRequires:  apache-jar-resource-bundle >= 0:1.3
! BuildRequires:  james-project >= 0:1.2
! BuildRequires:  jpackage-utils >= 0:1.7.3
  BuildRequires:  java-devel >= 0:1.6.0
  BuildRequires:  maven2 >= 0:2.0.8
***************
*** 70,81 ****
  BuildRequires:  apache-commons-io
  BuildRequires:  apache-commons-logging
- BuildRequires:  junit44
  BuildRequires:  log4j
! 
! Requires:  java >= 0:1.6.0
! Requires:  apache-commons-logging
! 
! Requires(post):   jpackage-utils >= 0:5.0.0
! Requires(postun): jpackage-utils >= 0:5.0.0
  
  %description
--- 72,78 ----
  BuildRequires:  apache-commons-io
  BuildRequires:  apache-commons-logging
  BuildRequires:  log4j
! BuildArch:      noarch
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  
  %description
***************
*** 97,105 ****
  transparently. 
  
! %package        javadoc
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
  
! %description    javadoc
  %{summary}.
  
--- 94,102 ----
  transparently. 
  
! %package javadoc
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
  
! %description javadoc
  %{summary}.
  
***************
*** 108,111 ****
--- 105,109 ----
  %patch0 -b .sav0
  %patch1 -b .sav1
+ 
  cp -p %{SOURCE3} maven2-settings.xml
  sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/m2_repo/repository</url>|g" maven2-settings.xml
***************
*** 114,117 ****
--- 112,116 ----
  sed -i -e "s|<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/maven2/plugins</url>|g" maven2-settings.xml
  sed -i -e "s|<url>__ECLIPSEDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/eclipse/plugins</url>|g" maven2-settings.xml
+ 
  mkdir external_repo
  ln -s %{_javadir} external_repo/JPP
***************
*** 119,131 ****
  %build
  export M2SETTINGS=$(pwd)/maven2-settings.xml
! export MAVEN_REPO_LOCAL=`pwd`/m2_repo/repository
! mkdir -p ${MAVEN_REPO_LOCAL}/org/apache/james/james-project/1.2/
! cp %{SOURCE4} ${MAVEN_REPO_LOCAL}/org/apache/james/james-project/1.2/james-project-1.2.pom
! mkdir -p ${MAVEN_REPO_LOCAL}/org/apache/apache-jar-resource-bundle/1.4/
! cp %{SOURCE5} ${MAVEN_REPO_LOCAL}/org/apache/apache-jar-resource-bundle/1.4/apache-jar-resource-bundle-1.4.jar
! 
! mvn-jpp -e \
          -s ${M2SETTINGS} \
!         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
          -Dmaven2.jpp.depmap.file=%{SOURCE2} \
          install javadoc:javadoc
--- 118,125 ----
  %build
  export M2SETTINGS=$(pwd)/maven2-settings.xml
! export MAVEN_REPO_LOCAL=$(pwd)/m2_repo/repository
! %{_bindir}/mvn-jpp -e \
          -s ${M2SETTINGS} \
!         -Dmaven.repo.local=${MAVEN_REPO_LOCAL} \
          -Dmaven2.jpp.depmap.file=%{SOURCE2} \
          install javadoc:javadoc
***************
*** 134,144 ****
  rm -rf $RPM_BUILD_ROOT
  install -dm 755 $RPM_BUILD_ROOT%{_javadir}
! install -dm 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
! 
! install -m 644 target/%{name}-%{version}.jar \
!   $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
  ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
! install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
! %add_to_maven_depmap org.apache.james %{name} %{version} JPP %{name}
  
  # javadoc
--- 128,137 ----
  rm -rf $RPM_BUILD_ROOT
  install -dm 755 $RPM_BUILD_ROOT%{_javadir}
! install -m 644 target/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
  ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
! 
! install -dm 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
! install -p -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
! %add_to_maven_depmap org.apache.james apache-mime4j %{version} JPP %{name}
  
  # javadoc
***************
*** 159,165 ****
  %defattr(0644,root,root,0755)
  %doc LICENSE.txt
! %{_javadir}/*.jar
! %{_datadir}/maven2/poms/*
! %{_mavendepmapfragdir}/*
  
  %files javadoc
--- 152,158 ----
  %defattr(0644,root,root,0755)
  %doc LICENSE.txt
! %{_javadir}/%{name}-%{version}.jar
! %{_datadir}/maven2/poms/JPP-%{name}.pom
! %{_mavendepmapfragdir}/%{name}
  
  %files javadoc
***************
*** 169,172 ****
--- 162,170 ----
  
  %changelog
+ * Tue Dec 14 2010 David Walluck <dwalluck at redhat.com> 0:0.6-2
+ - build with external apache-jar-resource-bundle-1.3
+ - build with external james-project-1.2
+ - remove BuildRequires: junit44
+ 
  * Sat Oct 16 2010 Ralph Apel <r.apel at r-apel.de> 0.6-1
  - first release

--- james-parent-1.2.pom DELETED ---

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/apache-mime4j/JPP-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** sources	15 Oct 2010 22:39:40 -0000	1.2
--- sources	14 Dec 2010 06:37:58 -0000	1.3
***************
*** 1,2 ****
- 31ab2e98ffeacf46ee7c6e9210cc44b6  apache-jar-resource-bundle-1.3.jar
  54022d1fa365b88de27a81e4eb1559d3  apache-mime4j-0.6-src.tar.gz
--- 1 ----

Index: apache-mime4j-settings.xml
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/apache-mime4j/JPP-6/apache-mime4j-settings.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** apache-mime4j-settings.xml	15 Oct 2010 22:39:40 -0000	1.1
--- apache-mime4j-settings.xml	14 Dec 2010 06:37:58 -0000	1.2
***************
*** 1,47 ****
  <settings>
! 	<profiles>
! 		<profile>
! 			<id>JPP</id>
! 			<repositories>
! 				<repository>
! 					<id>internal</id>
! 					<layout>jpp</layout>
! 					<url>__JPP_URL_PLACEHOLDER__</url>
! 				</repository>
! 				<repository>
! 					<id>external</id>
! 					<layout>jpp</layout>
! 					<url>__JAVADIR_PLACEHOLDER__</url>
! 				</repository>
! 				<repository>
! 					<id>local</id>
! 					<layout>jpp</layout>
! 					<url>__MAVENREPO_DIR_PLACEHOLDER__</url>
! 				</repository>
! 			</repositories>
! 			<pluginRepositories>
! 				<pluginRepository>
! 					<id>plugins-internal</id>
! 					<name>plugins-internal</name>
! 					<layout>jpp</layout>
! 					<url>__JPP_URL_PLACEHOLDER__</url>
! 				</pluginRepository>
! 				<pluginRepository>
! 					<id>plugins-external</id>
! 					<name>plugins-external</name>
! 					<layout>jpp</layout>
! 					<url>__JAVADIR_PLACEHOLDER__</url>
! 				</pluginRepository>
! 				<pluginRepository>
! 					<id>plugins-maven</id>
! 					<name>plugins-maven</name>
! 					<layout>jpp</layout>
! 					<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>
! 				</pluginRepository>
! 			</pluginRepositories>
! 		</profile>
! 	</profiles>
! 	<activeProfiles>
! 		<activeProfile>JPP</activeProfile>
! 	</activeProfiles>
  </settings>
--- 1,47 ----
  <settings>
!     <profiles>
!         <profile>
!             <id>JPP</id>
!             <repositories>
!                 <repository>
!                     <id>internal</id>
!                     <layout>jpp</layout>
!                     <url>__JPP_URL_PLACEHOLDER__</url>
!                 </repository>
!                 <repository>
!                     <id>external</id>
!                     <layout>jpp</layout>
!                     <url>__JAVADIR_PLACEHOLDER__</url>
!                 </repository>
!                 <repository>
!                     <id>local</id>
!                     <layout>jpp</layout>
!                     <url>__MAVENREPO_DIR_PLACEHOLDER__</url>
!                 </repository>
!             </repositories>
!             <pluginRepositories>
!                 <pluginRepository>
!                     <id>plugins-internal</id>
!                     <name>plugins-internal</name>
!                     <layout>jpp</layout>
!                     <url>__JPP_URL_PLACEHOLDER__</url>
!                 </pluginRepository>
!                 <pluginRepository>
!                     <id>plugins-external</id>
!                     <name>plugins-external</name>
!                     <layout>jpp</layout>
!                     <url>__JAVADIR_PLACEHOLDER__</url>
!                 </pluginRepository>
!                 <pluginRepository>
!                     <id>plugins-maven</id>
!                     <name>plugins-maven</name>
!                     <layout>jpp</layout>
!                     <url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>
!                 </pluginRepository>
!             </pluginRepositories>
!         </profile>
!     </profiles>
!     <activeProfiles>
!         <activeProfile>JPP</activeProfile>
!     </activeProfiles>
  </settings>

Index: apache-mime4j-jpp-depmap.xml
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/apache-mime4j/JPP-6/apache-mime4j-jpp-depmap.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** apache-mime4j-jpp-depmap.xml	15 Oct 2010 22:39:40 -0000	1.1
--- apache-mime4j-jpp-depmap.xml	14 Dec 2010 06:37:58 -0000	1.2
***************
*** 25,31 ****
        </jpp>
     </dependency>
- 
- <!--
- 
- -->
  </dependencies>
--- 25,27 ----




More information about the JPackage-commits mailing list