[Jpackage-commits] rpms/free/jsr-305 jsr-305-jpp-depmap.xml, NONE, 1.1 jsr-305-pom.patch, NONE, 1.1 jsr-305-settings.xml, NONE, 1.1 jsr-305.spec, 1.1, 1.2

jpackage jpackage at ryu.zarb.org
Mon Dec 20 18:26:18 CET 2010


Update of /home/projects/jpackage/cvs/rpms/free/jsr-305
In directory ryu.zarb.org:/tmp/8vfdjSjkMg/rpms/free/jsr-305

Modified Files:
	jsr-305.spec 
Added Files:
	jsr-305-jpp-depmap.xml jsr-305-pom.patch jsr-305-settings.xml 
Log Message:
0.1-3.jpp6

--- NEW FILE: jsr-305-settings.xml ---
<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>

--- NEW FILE: jsr-305-jpp-depmap.xml ---
<dependencies>
<!--
  <dependency>
    <maven>
    <groupId>org.apache.commons</groupId>
    <artifactId>commons-io</artifactId>
    <version>1.3.2</version>
    </maven>
    <jpp>
    <groupId>JPP</groupId>
    <artifactId>commons-io</artifactId>
    <version>1.4</version>
    </jpp>
  </dependency>

  <dependency>
    <maven>
    <groupId>org.freemarker</groupId>
    <artifactId>freemarker</artifactId>
    <version>2.3.13</version>
    </maven>
    <jpp>
    <groupId>JPP</groupId>
    <artifactId>freemarker</artifactId>
    <version>2.3.15</version>
    </jpp>
  </dependency>

  <dependency>
    <maven>
    <groupId>javax.annotation</groupId>
    <artifactId>jsr250-api</artifactId>
    <version>1.0</version>
    </maven>
    <jpp>
    <groupId>JPP</groupId>
    <artifactId>annotation_1_0_api</artifactId>
    <version>1.0</version>
    </jpp>
  </dependency>
-->


</dependencies>

Index: jsr-305.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/jsr-305/jsr-305.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** jsr-305.spec	8 Aug 2008 18:17:20 -0000	1.1
--- jsr-305.spec	20 Dec 2010 17:26:16 -0000	1.2
***************
*** 1,3 ****
! # Copyright (c) 2000-2008, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2010, JPackage Project
  # All rights reserved.
  #
***************
*** 31,39 ****
  %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
  
  %define section free
  
  Name:           jsr-305
  Version:        0.1
! Release:        1%{?dist}
  Epoch:          0
  Summary:        JSR 305: Annotations for Software Defect Detection in Java
--- 31,45 ----
  %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 section free
  
  Name:           jsr-305
  Version:        0.1
! Release:        3%{?dist}
  Epoch:          0
  Summary:        JSR 305: Annotations for Software Defect Detection in Java
***************
*** 42,55 ****
  Group:          Development/Libraries/Java
  URL:            http://code.google.com/p/jsr-305/
! # svn export -r20080806 http://jsr-305.googlecode.com/svn/trunk/ jsr-305-0.1
! # tar cjf jsr-305-0.1.bz2 jsr-305-0.1
! Source0:        http://code.google.com/p/jsr-305/jsr-305-0.1.tar.bz2
  Source1:        jsr-305-ri-build.xml
  Provides:       jsr305 = %{epoch}:%{version}-%{release}
! Requires:       jpackage-utils
! BuildRequires:  ant
! BuildRequires:  java-devel
  BuildRequires:  java-javadoc
! BuildRequires:  jpackage-utils
  %if %{gcj_support}
  BuildRequires:  java-gcj-compat-devel
--- 48,76 ----
  Group:          Development/Libraries/Java
  URL:            http://code.google.com/p/jsr-305/
! # svn export -r '{20101219}' http://jsr-305.googlecode.com/svn/trunk/ jsr-305-0.1
! # tar cjf jsr-305-0.1.tar.bz2 jsr-305-0.1
! Source0:        jsr-305-0.1.tar.bz2
  Source1:        jsr-305-ri-build.xml
+ Source2:        jsr-305-settings.xml
+ Source3:        jsr-305-jpp-depmap.xml
+ Patch0:         jsr-305-pom.patch
  Provides:       jsr305 = %{epoch}:%{version}-%{release}
! Requires:       jpackage-utils >= 0:1.7.5
! BuildRequires:  java-devel >= 0:1.6.0
  BuildRequires:  java-javadoc
! BuildRequires:  jpackage-utils >= 0:1.7.5
! BuildRequires:  ant >= 0:1.7.1
! %if %{with_maven}
! BuildRequires:  maven2 >= 0:2.0.8
! BuildRequires:  maven2-plugin-compiler
! BuildRequires:  maven2-plugin-install
! BuildRequires:  maven2-plugin-jar
! BuildRequires:  maven2-plugin-javadoc
! BuildRequires:  maven2-plugin-resources
! BuildRequires:  maven2-default-skin
! BuildRequires:  maven-shared-filtering
! BuildRequires:  apache-commons-parent
! BuildRequires:  liberation-fonts
! %endif
  %if %{gcj_support}
  BuildRequires:  java-gcj-compat-devel
***************
*** 58,61 ****
--- 79,84 ----
  %endif
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
+ Requires(post):    jpackage-utils >= 0:1.7.5
+ Requires(postun):  jpackage-utils >= 0:1.7.5
  
  %description
***************
*** 68,80 ****
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
  
  %description javadoc
! Javadoc for %{name}.
  
  %prep
  %setup -q
  %{__cp} -a %{SOURCE1} ri/build.xml
  
  %build
  export OPT_JAR_LIST=:
  export CLASSPATH=
--- 91,134 ----
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
+ Provides:       jsr305-javadoc = %{epoch}:%{version}-%{release}
  
  %description javadoc
! %{summary}.
! 
! %if %{with_maven}
! %package manual
! Summary:        Documents for %{name}
! Group:          Development/Documentation
! 
! %description manual
! %{summary}.
! %endif
  
  %prep
  %setup -q
  %{__cp} -a %{SOURCE1} ri/build.xml
+ cp %{SOURCE2} settings.xml
+ sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
+ sed -i -e "s|<url>__JAVADIR_PLACEHOLDER__</url>|<url>file://`pwd`/external_repo</url>|g" settings.xml
+ sed -i -e "s|<url>__MAVENREPO_DIR_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
+ %patch0 -b .sav0
  
  %build
+ %if %{with_maven}
+ mkdir external_repo
+ ln -s %{_javadir} external_repo/JPP
+ 
+ export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
+ mkdir -p $MAVEN_REPO_LOCAL
+ 
+ mvn-jpp \
+         -e \
+         -s settings.xml \
+         -Dmaven2.jpp.depmap.file=%{SOURCE3} \
+         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+         install javadoc:aggregate site
+ #       -Dmaven.test.failure.ignore=true \
+ 
+ %else
  export OPT_JAR_LIST=:
  export CLASSPATH=
***************
*** 82,85 ****
--- 136,140 ----
  %{ant} -Dversion=%{version} -Djava.javadoc=%{_javadocdir}/java
  popd
+ %endif
  
  %install
***************
*** 87,105 ****
  
  # jars
! %{__mkdir_p} %{buildroot}%{_javadir}
! %{__cp} -a ri/jsr-305-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
  %{__ln_s} %{name}-%{version}.jar %{buildroot}%{_javadir}/jsr305-%{version}.jar
  (cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do %{__ln_s} ${jar} ${jar/-%{version}/}; done)
  
  # poms
- %add_to_maven_depmap org.jsr-305 %{name} %{version} JPP %{name}
  
! %{__mkdir_p} %{buildroot}%{_datadir}/maven2/poms
! %{__cp} -a ri/pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}.pom
  
  # javadoc
! %{__mkdir_p} %{buildroot}%{_javadocdir}/%{name}-%{version}
  %{__cp} -a ri/javadoc/* %{buildroot}%{_javadocdir}/%{name}-%{version}
  %{__ln_s} %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
  
  %if %{gcj_support}
--- 142,186 ----
  
  # jars
! install -d -m 755 %{buildroot}%{_javadir}
! %if %{with_maven}
! install -m 644 ri/target/ri-0.1-SNAPSHOT.jar \
!         %{buildroot}%{_javadir}/%{name}-%{version}.jar
! install -m 644 proposedAnnotations/target/proposedAnnotations-0.1-SNAPSHOT.jar \
!         %{buildroot}%{_javadir}/%{name}-proposedAnnotations-%{version}.jar
! install -m 644 tcl/target/tcl-0.1-SNAPSHOT.jar \
!         %{buildroot}%{_javadir}/%{name}-tcl-%{version}.jar
! %else
! install -m 644 ri/jsr-305-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
! %endif
  %{__ln_s} %{name}-%{version}.jar %{buildroot}%{_javadir}/jsr305-%{version}.jar
  (cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do %{__ln_s} ${jar} ${jar/-%{version}/}; done)
  
  # poms
  
! install -d -m 755 %{buildroot}%{_datadir}/maven2/poms
! install -m 644 pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}-parent.pom
! %add_to_maven_depmap org.jsr-305 %{name} %{version} JPP %{name}-parent
! install -m 644 ri/pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}.pom
! %add_to_maven_depmap org.jsr-305 ri %{version} JPP %{name}
! install -m 644 tcl/pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}-tcl.pom
! %add_to_maven_depmap org.jsr-305 tcl %{version} JPP %{name}
! 
  
  # javadoc
! install -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version}
! %if %{with_maven}
! %{__cp} -a target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
! %else
  %{__cp} -a ri/javadoc/* %{buildroot}%{_javadocdir}/%{name}-%{version}
+ %endif
  %{__ln_s} %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
+ %{__ln_s} %{name}-%{version} %{buildroot}%{_javadocdir}/jsr305-%{version}
+ %{__ln_s} jsr305-%{version} %{buildroot}%{_javadocdir}/jsr305
+ 
+ %if %{with_maven}
+ rm -rf target/site/apidocs
+ install -d -m 755 %{buildroot}%{_docdir}/%{name}-%{version}
+ %{__cp} -a target/site/* %{buildroot}%{_docdir}/%{name}-%{version}
+ %endif
  
  %if %{gcj_support}
***************
*** 130,137 ****
  %files
  %defattr(0644,root,root,0755)
! %{_javadir}/%{name}-%{version}.jar
! %{_javadir}/%{name}.jar
! %{_javadir}/jsr305-%{version}.jar
! %{_javadir}/jsr305.jar
  %{_datadir}/maven2/poms/*
  %{_mavendepmapfragdir}/*
--- 211,215 ----
  %files
  %defattr(0644,root,root,0755)
! %{_javadir}/*.jar
  %{_datadir}/maven2/poms/*
  %{_mavendepmapfragdir}/*
***************
*** 145,150 ****
--- 223,244 ----
  %{_javadocdir}/%{name}-%{version}
  %{_javadocdir}/%{name}
+ %{_javadocdir}/jsr305-%{version}
+ %{_javadocdir}/jsr305
+ 
+ %if %{with_maven}
+ %files manual
+ %defattr(0644,root,root,0755)
+ %{_docdir}/%{name}-%{version}
+ %endif
  
  %changelog
+ * Mon Dec 20 2010 Ralph Apel <r.apel at r-apel.de> 0:0.1-3
+ - svn r50 for JPP-6
+ - build with maven by default
+ - fix poms and depmap frags
+ 
+ * Mon Apr 20 2009 David Walluck <dwalluck at redhat.com> 0:0.1-2
+ - add javadoc symlinks for jsr305
+ 
  * Fri Aug 08 2008 David Walluck <dwalluck at redhat.com> 0:0.1-1
  - release

--- NEW FILE: jsr-305-pom.patch ---
--- pom.xml.sav	2010-12-20 12:40:40.000000000 +0100
+++ pom.xml	2010-12-20 12:41:05.000000000 +0100
@@ -17,7 +17,7 @@
 	<modules>
 		<module>ri</module>
 		<module>tcl</module>
-		<module>sampleUses</module>
+		<!-- <module>sampleUses</module> -->
 		<module>proposedAnnotations</module>
 	</modules>
 	




More information about the JPackage-commits mailing list