[Jpackage-commits] rpms/free/pmd pmd-3.9.pom, 1.2, NONE pmd-4.2.4-no-classpath-in-manifest.patch, 1.1, 1.2 pmd-4.2.4-no-retroweaver.patch, 1.1, 1.2 pmd-4.2.5-jpp-depmap.xml, NONE, 1.1 pmd-4.2.5-pom.patch, NONE, 1.1 pmd-4.2.5-settings.xml, NONE, 1.1 pmd-4.2.5.pom, 1.1, 1.2 pmd.spec, 1.7, 1.8

jpackage jpackage at ryu.zarb.org
Mon Dec 6 22:21:32 CET 2010


Update of /home/projects/jpackage/cvs/rpms/free/pmd
In directory ryu.zarb.org:/tmp/y5ls4fqRlm/rpms/free/pmd

Modified Files:
	pmd.spec 
Added Files:
	pmd-4.2.4-no-classpath-in-manifest.patch 
	pmd-4.2.4-no-retroweaver.patch pmd-4.2.5-jpp-depmap.xml 
	pmd-4.2.5-pom.patch pmd-4.2.5-settings.xml pmd-4.2.5.pom 
Removed Files:
	pmd-3.9.pom 
Log Message:
4.2.5-2.jpp6

--- NEW FILE: pmd-4.2.5-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: pmd-4.2.5-jpp-depmap.xml ---
<dependencies>
<!--
-->

   <dependency>
      <maven>
        <groupId>asm</groupId>
        <artifactId>asm</artifactId>
        <version>3.1</version>
      </maven>
      <jpp>
        <groupId>JPP/objectweb-asm</groupId>
        <artifactId>asm</artifactId>
        <version>3.2</version>
      </jpp>
   </dependency>

   <dependency>
      <maven>
        <groupId>velocity</groupId>
        <artifactId>velocity</artifactId>
        <version>1.4</version>
      </maven>
      <jpp>
        <groupId>JPP</groupId>
        <artifactId>velocity14</artifactId>
        <version>1.4</version>
      </jpp>
   </dependency>

</dependencies>

--- NEW FILE: pmd-4.2.4-no-classpath-in-manifest.patch ---
--- pmd-4.2.4/bin/build.xml.orig	2008-11-10 14:29:16.281494022 -0500
+++ pmd-4.2.4/bin/build.xml	2008-11-10 14:29:24.828492529 -0500
@@ -75,7 +75,6 @@
 			<zipfileset dir="etc" includes="ruleset.dtd,ruleset_xml_schema.xsd" prefix="rulesets"/>
 			<manifest>
 				<attribute name="Main-Class" value="net.sourceforge.pmd.PMD" />
-				<attribute name="Class-Path" value="jaxen-${jaxen.version}.jar asm-${asm.version}.jar" />
 			</manifest>
 		</jar>
 

--- NEW FILE: pmd-4.2.5.pom ---
<?xml version="1.0" encoding="UTF-8"?>
<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>pmd</groupId>
  <artifactId>pmd</artifactId>
  <name>PMD</name>
  <version>4.2.5</version>
  <description>
    <![CDATA[
<p>PMD scans Java source code and looks for potential problems like:</p>
<ul>
  <li>Possible bugs - empty try/catch/finally/switch statements</li>
  <li>Dead code - unused local variables, parameters and private methods</li>
  <li>Suboptimal code - wasteful String/StringBuffer usage</li>
  <li>Overcomplicated expressions - unnecessary if statements, for loops that could be while loops</li>
  <li>Duplicate code - copied/pasted code means copied/pasted bugs</li>
</ul>
<p>You can <b><a href="http://sourceforge.net/project/showfiles.php?group_id=56262">download everything from here</a></b>, and you can get an overview of all the rules at the <a href="rules/index.html">rulesets index</a> page.</p>
<p>PMD is <a href="integrations.html">integrated</a> with JDeveloper, Eclipse, JEdit, JBuilder, BlueJ, CodeGuide, NetBeans/Sun Java Studio Enterprise/Creator, IntelliJ IDEA, TextPad, Maven, Ant, Gel, JCreator, and Emacs.</p>
    ]]>
  </description>
  <url>http://pmd.sourceforge.net/</url>
  <issueManagement>
    <url>http://www.sourceforge.net/tracker/?group_id=56262</url>
  </issueManagement>
  <ciManagement>
    <notifiers>
      <notifier>
        <configuration>
          <address>tom at infoether.com</address>
        </configuration>
      </notifier>
    </notifiers>
  </ciManagement>
  <inceptionYear>2002</inceptionYear>
  <mailingLists>
    <mailingList>
      <name>PMD development</name>
      <subscribe>http://lists.sourceforge.net/lists/listinfo/pmd-devel</subscribe>
      <unsubscribe>http://lists.sourceforge.net/lists/listinfo/pmd-devel</unsubscribe>
      <archive>http://sourceforge.net/mailarchive/forum.php?forum=pmd-devel</archive>
    </mailingList>
  </mailingLists>
  <developers>
    <developer>
      <id>tomcopeland</id>
      <name>Tom Copeland</name>
      <email>tom at infoether.com</email>
      <organization>InfoEther</organization>
      <roles>
        <role>Developer</role>
      </roles>
    </developer>
    <developer>
      <id>dpeugh</id>
      <name>David Dixon-Peugh</name>
      <email>ddp at apache.org</email>
      <organization>Lockheed Martin Corporation</organization>
      <roles>
        <role>Developer</role>
      </roles>
    </developer>
    <developer>
      <id>olemartin</id>
      <name>Ole-Martin Mork</name>
      <email>olemartin at users.sourceforge.net</email>
      <organization>Bekk Consulting</organization>
      <roles>
        <role>Developer</role>
      </roles>
    </developer>
    <developer>
      <id>mikkey</id>
      <name>Miguel Griffa</name>
      <email>mikkey at users.sourceforge.net</email>
      <roles>
        <role>Developer</role>
      </roles>
    </developer>
    <developer>
      <id>phherlin</id>
      <name>Philippe Herlin</name>
      <email>phherlin at users.sourceforge.net</email>
      <roles>
        <role>Developer</role>
      </roles>
    </developer>
    <developer>
      <id>jigerjava</id>
      <name>Jiger Patel</name>
      <email>jigerjava at users.sourceforge.net</email>
      <roles>
        <role>Developer</role>
      </roles>
    </developer>
    <developer>
      <id>kubacki</id>
      <name>Radim Kubacki</name>
      <email>kubacki at users.sourceforge.net</email>
      <roles>
        <role>Developer</role>
      </roles>
    </developer>
    <developer>
      <id>tomslot</id>
      <name>Tomasz Slota</name>
      <email>tomslot at users.sourceforge.net</email>
      <roles>
        <role>Developer</role>
      </roles>
    </developer>
    <developer>
      <id>tomslot</id>
      <name>Alan Ezust</name>
      <email>ezust at users.sourceforge.net</email>
      <roles>
        <role>Developer</role>
      </roles>
    </developer>
    <developer>
      <id>nascif</id>
      <name>Nascif Abousalh Neto</name>
      <email>nascif at users.sourceforge.net</email>
      <roles>
        <role>Developer</role>
      </roles>
    </developer>
    <developer>
      <id>allancaplan</id>
      <name>Allan Caplan</name>
      <email>allancaplan at users.sourceforge.net</email>
      <roles>
        <role>Developer</role>
      </roles>
    </developer>
    <developer>
      <id>holobender</id>
      <name>Sven Jacob</name>
      <email>holobender at users.sourceforge.net</email>
      <roles>
        <role>Developer</role>
      </roles>
    </developer>
    <developer>
      <id>wfzelle</id>
      <name>Wouter Zelle</name>
      <email>wfzelle at users.sourceforge.net</email>
      <roles>
        <role>Developer</role>
      </roles>
    </developer>
    <developer>
      <id>hooperbloob</id>
      <name>Brian Remedios</name>
      <email>hooperbloob at users.sourceforge.net</email>
      <roles>
        <role>Developer</role>
      </roles>
    </developer>
    <developer>
      <id>xlv</id>
      <name>Xavier Le Vourch</name>
      <email>xlv at users.sourceforge.net</email>
      <roles>
        <role>Developer</role>
      </roles>
    </developer>
    <developer>
      <id>rgustav</id>
      <name>Ryan Gustafson</name>
      <email>rgustav at users.sourceforge.net</email>
      <roles>
        <role>Developer</role>
      </roles>
    </developer>
    <developer>
      <id>bluejohn</id>
      <name>Johan Nagels</name>
      <email>bluejohn at users.sourceforge.net</email>
      <roles>
        <role>Developer</role>
      </roles>
    </developer>
    <developer>
      <id>tkleiber</id>
      <name>Torsten Kleiber</name>
      <email>tkleiber at users.sourceforge.net</email>
      <roles>
        <role>Developer</role>
      </roles>
    </developer>
    <developer>
      <id>rpelisse</id>
      <name>Romain Pelisse</name>
      <email>rpelisse at users.sourceforge.net</email>
      <roles>
        <role>Developer</role>
      </roles>
    </developer>
  </developers>
  <scm>
    <connection>scm:svn:https://pmd.svn.sourceforge.net/svnroot/pmd/trunk/pmd</connection>
    <developerConnection>scm:svn:https://pmd.svn.sourceforge.net/svnroot/pmd/trunk/pmd</developerConnection>
    <url>http://pmd.svn.sourceforge.net/viewvc/pmd/</url>
  </scm>
  <organization>
    <name>InfoEther</name>
    <url>http://pmd.sourceforge.net/</url>
  </organization>
  <build>
    <sourceDirectory>src</sourceDirectory>
    <testSourceDirectory>regress</testSourceDirectory>
    <resources>
      <resource>
        <directory>${basedir}</directory>
        <includes>
          <include>rulesets/**/*.xml</include>
          <include>rulesets/*.properties</include>
          <include>etc/pmd-nicerhtml.xsl</include>
        </includes>
      </resource>
      <resource>
        <directory>${basedir}/src</directory>
        <includes>
          <include>**/*.properties</include>
        </includes>
      </resource>
    </resources>
    <testResources>
      <testResource>
        <directory>${basedir}/regress/</directory>
        <includes>
          <include>**/*.xml</include>
        </includes>
      </testResource>
    </testResources>
    <plugins>
      <plugin>
        <artifactId>maven-surefire-plugin</artifactId>
        <configuration>
          <forkMode>once</forkMode>
          <skip>true</skip>
        </configuration>
      </plugin>
      <plugin>
        <artifactId>maven-compiler-plugin</artifactId>
        <configuration>
          <encoding>utf8</encoding>
          <source>1.5</source>
          <target>1.5</target>
        </configuration>
      </plugin>
    </plugins>
  </build>
  <dependencies>
    <dependency>
      <groupId>ant</groupId>
      <artifactId>ant</artifactId>
      <version>1.6</version>
    </dependency>
    <dependency>
      <groupId>jaxen</groupId>
      <artifactId>jaxen</artifactId>
      <version>1.1.1</version>
    </dependency>
    <dependency>
      <groupId>asm</groupId>
      <artifactId>asm</artifactId>
      <version>3.1</version>
    </dependency>
    <dependency>
      <groupId>junit</groupId>
      <artifactId>junit</artifactId>
      <version>4.4</version>
    </dependency>
  </dependencies>

  <distributionManagement>
    <repository>
      <id>pmd-repo</id>
      <name>Default Repository</name>
      <url>scp://shell.sourceforge.net/home/groups/p/pm/pmd/htdocs/maven2</url>
    </repository>
    <site>
      <id>pmd-site</id>
      <name>Default Site</name>
      <url>scp://shell.sourceforge.net/home/groups/p/pm/pmd/htdocs</url>
    </site>
  </distributionManagement>

  <reporting>
    <plugins>
		<plugin>
			<groupId>org.apache.maven.plugins</groupId>
	        <artifactId>maven-jxr-plugin</artifactId>
        </plugin>
	<!--
		<plugin>
        	<groupId>org.apache.maven.plugins</groupId>
            <artifactId>maven-javadoc-plugin</artifactId>
        </plugin>  -->
		<plugin>
		
	        <groupId>org.apache.maven.plugins</groupId>
    	    <artifactId>maven-pmd-plugin</artifactId>
        	<configuration>
				<linkXref>true</linkXref>
				<sourceEncoding>utf-8</sourceEncoding>
				<minimumTokens>100</minimumTokens>
				<targetJdk>1.5</targetJdk>
				<rulesets>
            		<ruleset>http://pmd.svn.sourceforge.net/svnroot/pmd/branches/pmd/4.2.x/rulesets/internal/dogfood.xml</ruleset>
				</rulesets>
        	</configuration>
      </plugin>
      
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-checkstyle-plugin</artifactId>
        <configuration>
          <configLocation>etc/checkstyle-config.xml</configLocation>
        </configuration>
      </plugin>
    </plugins>
  </reporting>

</project>


--- NEW FILE: pmd-4.2.4-no-retroweaver.patch ---
--- pmd-4.2.4/bin/build.xml.orig	2008-08-31 17:32:19.000000000 -0400
+++ pmd-4.2.4/bin/build.xml	2008-11-10 14:01:02.870662251 -0500
@@ -14,7 +14,6 @@
 	<property name="asm.version" value="3.1" />
 	<property name="jaxen.version" value="1.1.1" />
 	<property name="junit.version" value="4.4" />
-	<property name="retroweaver.version" value="2.0.5" />
 	<property name="javacc-home.path" value="${dir.lib}" />
 
 	<!--Settings-->
@@ -86,56 +85,10 @@
 			basedir="${dir.build}" />
 	</target>
 
-	<taskdef name="retroweaver" classname="net.sourceforge.retroweaver.ant.RetroWeaverTask">
-		<classpath>
-			<pathelement location="${dir.lib14}/retroweaver-${retroweaver.version}.jar"/>
-			<pathelement location="${dir.lib14}/retroweaver-rt-${retroweaver.version}.jar"/>
-			<pathelement location="${dir.lib14}/backport-util-concurrent.jar"/>
-			<pathelement location="${dir.lib14}/asm-commons-${asm.version}.jar"/>
-			<pathelement location="${dir.lib14}/asm-util-${asm.version}.jar"/>
-			<pathelement location="${dir.lib}/asm-${asm.version}.jar"/>
-		</classpath>
-	</taskdef>
-
 	<target name="weavejunit" depends="jar">
-		<path id="retroweaverclasspath">
-			<pathelement location="${dir.lib14}/retroweaver-rt-${retroweaver.version}.jar"/>
-			<pathelement location="${dir.lib14}/backport-util-concurrent.jar"/>
-			<pathelement location="${dir.lib}/asm-${asm.version}.jar"/>
-			<pathelement location="${jvm14.runtime}" />
-			<pathelement location="${dir.lib}/jaxen-${jaxen.version}.jar" />
-			<pathelement location="${dir.lib14}/junit.jar" />
-			<pathelement location="${ant.jar}" />
-		</path>
-
-		<retroweaver inputjar="${dir.lib}/junit-${junit.version}.jar" outputjar="${dir.lib14}/junit.jar" target="1.4" failonerror="true" verify="true">
-			<classpath refid="retroweaverclasspath" />
-		</retroweaver>
 	</target>
 
 	<target name="weave" depends="jar, weavejunit">
-		<fail unless="ant.jar" message="ant.jar location is not defined properly" />
-		<fail unless="jvm14.runtime" message="jvm14.runtime (i.e. rt.jar) location is not defined properly" />
-
-		<path id="retroweaverclasspath">
-			<pathelement location="${dir.lib14}/pmd14-${version}.jar" />
-			<pathelement location="${dir.lib14}/pmd14-test-${version}.jar" />
-			<pathelement location="${dir.lib14}/retroweaver-rt-${retroweaver.version}.jar"/>
-			<pathelement location="${dir.lib14}/backport-util-concurrent.jar"/>
-			<pathelement location="${dir.lib}/asm-${asm.version}.jar"/>
-			<pathelement location="${jvm14.runtime}" />
-			<pathelement location="${dir.lib}/jaxen-${jaxen.version}.jar" />
-			<pathelement location="${dir.lib14}/junit.jar" />
-			<pathelement location="${ant.jar}" />
-		</path>
-
-		<retroweaver inputjar="${dir.lib}/pmd-${version}.jar" outputjar="${dir.lib14}/pmd14-${version}.jar" target="1.4" failonerror="true" verify="true">
-			<classpath refid="retroweaverclasspath" />
-		</retroweaver>
-
-		<retroweaver inputjar="${dir.lib}/pmd-test-${version}.jar" outputjar="${dir.lib14}/pmd14-test-${version}.jar" target="1.4" failonerror="true" verify="true">
-			<classpath refid="retroweaverclasspath" />
-		</retroweaver>
 	</target>
 
 	<target name="jarsrc" depends="copy,compile" description="Jars up the source directory">
@@ -252,7 +205,6 @@
 			<include name="backport-util-concurrent.jar" />
 			<include name="pmd14-${version}.jar" />
 			<include name="pmd14-test-${version}.jar" />
-			<include name="retroweaver-rt-${retroweaver.version}.jar" />
 			<include name="junit.jar" />
 		</fileset>
 		<fileset dir="${dir.lib}">

Index: pmd.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/pmd/pmd.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -C 2 -d -r1.7 -r1.8
*** pmd.spec	16 Mar 2009 08:33:22 -0000	1.7
--- pmd.spec	6 Dec 2010 21:21:30 -0000	1.8
***************
*** 1,3 ****
! # Copyright (c) 2000-2008, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2010, JPackage Project
  # All rights reserved.
  #
***************
*** 28,67 ****
  # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  #
  Name:           pmd
! Version:        3.9
! Release:        4%{?dist}
  Epoch:          0
  Summary:        Scans Java source code and looks for potential problems
  License:        BSD Style
- 
- # cvs -z3 -d:pserver:anonymous at pmd.cvs.sourceforge.net:/cvsroot/pmd export \
- # -r pmd_release_3_9 pmd
- # tar -czvf pmd-src.tar.gz pmd
- Source0:        %{name}-src.tar.gz
- Source1:        %{name}-%{version}.pom
- Patch0:         %{name}-ruby.patch
- 
  Url:            http://pmd.sourceforge.net/
  
! Group:          Development/Tools
! BuildRequires:  jpackage-utils >= 0:1.6
! BuildRequires:  ant >= 0:1.6
  BuildRequires:  ant-junit
- #commented while building with JDK5/JDK6
- #BuildRequires:  backport-util-concurrent
- BuildRequires:  junit
  BuildRequires:  jaxen >= 0:1.1
! BuildRequires:  objectweb-asm >= 3.1
! BuildRequires:  xerces-j2
! BuildRequires:  xml-commons-apis >= 1.3.02
! BuildRequires:  jakarta-oro
! #Requires:       backport-util-concurrent
! Requires:       jaxen >= 0:1.1
! Requires:       objectweb-asm >= 3.1
! Requires:       xerces-j2
! Requires:       xml-commons-apis >= 1.3.02
! Requires:       jakarta-oro
! Buildarch:      noarch
! Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
  %description
--- 28,102 ----
  # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  #
+ 
+ %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 with()          %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
+ %define without()       %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
+ %define bcond_with()    %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
+ %define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
+ 
+ %bcond_without          maven
+ 
+ %define section free
+ 
  Name:           pmd
! Version:        4.2.5
! Release:        2%{?dist}
  Epoch:          0
  Summary:        Scans Java source code and looks for potential problems
  License:        BSD Style
  Url:            http://pmd.sourceforge.net/
+ Group:          Development/Testing
+ # svn export https://pmd.svn.sourceforge.net/svnroot/pmd/tags/pmd/pmd_release_4_2_5 pmd-4.2.5 && tar cjf pmd-4.2.5.tar.bz2 pmd-4.2.5
+ Source0:        pmd-4.2.5.tar.bz2
+ Source1:        pmd-4.2.5.pom
+ Source2:        %{name}-%{version}-jpp-depmap.xml
+ Source3:        %{name}-%{version}-settings.xml
  
! Patch0:         pmd-4.2.5-pom.patch
! Patch1:         pmd-ruby.patch
! Patch2:         pmd-4.2.4-no-retroweaver.patch
! Patch3:         pmd-4.2.4-no-classpath-in-manifest.patch
! Requires(post): jpackage-utils >= 0:1.7.5
! Requires(postun): jpackage-utils >= 0:1.7.5
! Requires:       ant >= 0:1.7.1
! Requires:       java >= 0:1.6.0
! # FIXME: (dwalluck): Should be 1.1.1
! Requires:       jaxen >= 0:1.1
! Requires:       objectweb-asm >= 0:3.1
! Requires:       junit4 >= 0:4.4
! BuildRequires:  ant >= 0:1.7.1
  BuildRequires:  ant-junit
  BuildRequires:  jaxen >= 0:1.1
! BuildRequires:  java-devel >= 0:1.6.0
! BuildRequires:  jpackage-utils >= 0:1.7.5
! BuildRequires:  junit4 >= 0:4.4
! BuildRequires:  objectweb-asm >= 0:3.1
! %if %with maven
! BuildRequires:  maven2 >= 0:2.0.8
! BuildRequires:  maven2-plugin-checkstyle
! BuildRequires:  maven2-plugin-compiler
! BuildRequires:  maven2-plugin-install
! BuildRequires:  maven2-plugin-jar
! BuildRequires:  maven2-plugin-javadoc
! BuildRequires:  maven2-plugin-pmd
! BuildRequires:  maven2-plugin-project-info-reports
! BuildRequires:  maven2-plugin-resources
! BuildRequires:  maven2-plugin-site
! BuildRequires:  maven2-default-skin
! BuildRequires:  maven-doxia
! BuildRequires:  maven-doxia-sitetools
! BuildRequires:  maven-jxr
! BuildRequires:  maven-surefire-maven-plugin
! BuildRequires:  apache-commons-parent
! BuildRequires:  liberation-fonts
! BuildRequires:  velocity14
! %endif
! %if %{gcj_support}
! BuildRequires:  java-gcj-compat-devel
! %else
! BuildArch:      noarch
! %endif
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  
  %description
***************
*** 80,83 ****
--- 115,119 ----
  Maven, Ant, Eclipse, Gel, and Emacs. 
  
+ %if %with maven
  %package manual
  Summary:        Manual for %{name}
***************
*** 86,89 ****
--- 122,126 ----
  %description manual
  Documentation for %{name}.
+ %endif
  
  %package javadoc
***************
*** 92,150 ****
  
  %description javadoc
! Javadoc for %{name}.
  
  %prep
! %setup -q -n %{name}
  
! # set right permissions
! find . -name "*.sh" -exec chmod 755 \{\} \;
! # remove all binary libs
! find . -name "*.jar" -exec rm -f {} \;
  
! %patch0
  
! #use java.util.concurrent instead of edu.emory.mathcs.backport.java.util.concurrent
! sed -i "s|edu.emory.mathcs.backport.||g" src/net/sourceforge/pmd/PMD.java
  
! %build
! export OPT_JAR_LIST="ant/ant-junit junit"
  export CLASSPATH=$(build-classpath \
  jaxen \
! objectweb-asm/asm)
! #backport-util-concurrent \
! 
  CLASSPATH=$CLASSPATH:target/classes:target/test-classes
  cd bin
! ant -Dbuild.sysclasspath=only dist javadoc
  
  %install
! rm -rf $RPM_BUILD_ROOT
  
  # jar
! install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
! install -m 644 lib/%{name}-%{version}.jar \
!   $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
! (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; \
!    do ln -sf ${jar} ${jar/-%{version}/}; done)
! install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/etc
! cp -pr etc/* $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/etc
! install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/rulesets
! cp -pr rulesets/* $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/rulesets
  
  # pom
! install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
! install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
  %add_to_maven_depmap %{name} %{name} %{version} JPP %{name}
  
  # javadoc
! install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
! cp -pr docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
  
  # manual
! install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
! cp -p LICENSE.txt $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
  
  %clean
! rm -rf $RPM_BUILD_ROOT
  
  %files
--- 129,247 ----
  
  %description javadoc
! %{summary}.
  
  %prep
! %setup -q
! %patch0 -p0
! %patch1 -p0
! %patch2 -p1
! %patch3 -p1
! %{_bindir}/find . -name "*.sh" | %{_bindir}/xargs -t %{__chmod} 0755
! %{_bindir}/find . -name "*.jar" | xargs -t %{__rm}
  
! %{__ln_s} $(build-classpath objectweb-asm/asm) lib/asm-3.0.jar
! %if %with maven
! cp %{SOURCE3} 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
! %endif
  
! %build
! %if %with maven
! export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
! mkdir -p $MAVEN_REPO_LOCAL
  
! mkdir external_repo
! ln -s %{_javadir} external_repo/JPP
  
! export M2_SETTINGS=$(pwd)/settings.xml
!     mvn-jpp \
!         -e \
!         -s $M2_SETTINGS \
!         -Dmaven.test.failure.ignore=true \
!         -Dmaven2.jpp.depmap.file=%{SOURCE2} \
!         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
!         install javadoc:javadoc site
! 
! %else
! export OPT_JAR_LIST=`%{__cat} %{_sysconfdir}/ant.d/junit`
  export CLASSPATH=$(build-classpath \
+ backport-util-concurrent \
  jaxen \
! junit4 \
! objectweb-asm \
! )
  CLASSPATH=$CLASSPATH:target/classes:target/test-classes
  cd bin
! %{ant} -Dbuild.sysclasspath=only dist javadoc
! %endif
  
  %install
! rm -rf %{buildroot}
  
  # jar
! install -d -m 755 %{buildroot}%{_javadir}
! %if %with maven
! install -p -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
! %else
! install -p -m 644 lib/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
! %endif
! 
! (cd %{buildroot}%{_javadir} && for jar in *-%{version}.jar; do %{__ln_s} ${jar} ${jar/-%{version}/}; done)
! 
! install -d -m 755 %{buildroot}%{_datadir}/%{name}-%{version}/etc
! %{__cp} -pr etc/* %{buildroot}%{_datadir}/%{name}-%{version}/etc
! 
! install -d -m 755 %{buildroot}%{_datadir}/%{name}-%{version}/rulesets
! %{__cp} -pr rulesets/* %{buildroot}%{_datadir}/%{name}-%{version}/rulesets
! %{__ln_s} %{name}-%{version} %{buildroot}%{_datadir}/%{name}
  
  # pom
! install -d -m 755 %{buildroot}%{_datadir}/maven2/poms
! install -pm 644 %{SOURCE1} %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}.pom
  %add_to_maven_depmap %{name} %{name} %{version} JPP %{name}
  
  # javadoc
! install -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version}
! %if %with maven
! %{__cp} -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
! # FIXME: (dwalluck): breaks -bi --short-circuit
! rm -rf target/site/apidocs
! %else
! %{__cp} -pr docs/api/* %{buildroot}%{_javadocdir}/%{name}-%{version}
! %endif
! %{__ln_s} %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
  
  # manual
! %if %with maven
! install -d -m 755 %{buildroot}%{_docdir}/%{name}-%{version}
! %{__cp} -pr target/site/* %{buildroot}%{_docdir}/%{name}-%{version}/
! %endif
! 
! %if %{gcj_support}
! %{_bindir}/aot-compile-rpm
! %endif
  
  %clean
! %{__rm} -rf %{buildroot}
! 
! %post
! %update_maven_depmap
! %if %{gcj_support}
! if [ -x %{_bindir}/rebuild-gcj-db ]
! then
!   %{_bindir}/rebuild-gcj-db
! fi
! %endif
! 
! %postun
! %update_maven_depmap
! %if %{gcj_support}
! if [ -x %{_bindir}/rebuild-gcj-db ]
! then
!   %{_bindir}/rebuild-gcj-db
! fi
! %endif
  
  %files
***************
*** 152,168 ****
  %doc LICENSE.txt
  %{_javadir}/*.jar
  %{_datadir}/%{name}-%{version}
! %{_datadir}/maven2
! %{_mavendepmapfragdir}
  
  %files manual
  %defattr(0644,root,root,0755)
  %doc %{_docdir}/%{name}-%{version}
  
  %files javadoc
  %defattr(0644,root,root,0755)
! %{_javadocdir}/*
  
  %changelog
  * Mon Mar 16 2009 Yong Yang <yyang at redhat.com> 3.9-4
  - rebuild with new maven2 2.0.8 built in bootstrap mode
--- 249,281 ----
  %doc LICENSE.txt
  %{_javadir}/*.jar
+ %{_datadir}/maven2/poms/*
+ %{_mavendepmapfragdir}/*
+ %defattr(-,root,root,0755)
+ %{_datadir}/%{name}
  %{_datadir}/%{name}-%{version}
! %if %{gcj_support}
! %dir %{_libdir}/gcj/%{name}
! %attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
! %endif
  
+ %if %with maven
  %files manual
  %defattr(0644,root,root,0755)
  %doc %{_docdir}/%{name}-%{version}
+ %endif
  
  %files javadoc
  %defattr(0644,root,root,0755)
! %doc %{_javadocdir}/*
  
  %changelog
+ * Mon Dec 06 2010 Ralph Apel <r.apel at r-apel.de> 0:4.2.5-2
+ - Prepare for JPP-6
+ - Build with maven2 by default
+ - Drop backport-util-concurrent: not needed
+ 
+ * Wed Mar 18 2009 David Walluck <dwalluck at redhat.com> 0:4.2.5-1
+ - 4.2.5
+ 
  * Mon Mar 16 2009 Yong Yang <yyang at redhat.com> 3.9-4
  - rebuild with new maven2 2.0.8 built in bootstrap mode
***************
*** 172,187 ****
  - commented BR backport-util-concurrent, sed -i PDM.java
  
! * Tue Apr 08 2008 Deepak Bhole <dbhole at redhat.com> 3.9-1jpp.1
! - Update tp 3.9
! 
! * Mon Mar 26 2007 Matt Wringe <mwringe at redhat.com> - 0:3.6-1jpp.3
! - Fix unowned doc directory for pmd
! 
! * Mon Mar 19 2007 Matt Wringe <mwringe at redhat.com> - 0:3.6-1jpp.2
! - Add missing jakarta-commons-oro build requires
  
! * Tue Mar 13 2007 Jeff Johnston <jjohnstn at redhat.com> - 0:3.6-1jpp.1
! - Updated per Fedora package review process
! - Resolves: #227109
  
  * Mon Jun 19 2006 Deepak Bhole <dbhole at redhat.com> - 0:3.6-1jpp
--- 285,296 ----
  - commented BR backport-util-concurrent, sed -i PDM.java
  
! * Mon Feb 11 2008 Ralph Apel <r.apel at r-apel.de> - 0:3.9-2jpp
! - Use org.objectweb.asm as groupId for asm-3.x in pom
  
! * Tue Feb 05 2008 Ralph Apel <r.apel at r-apel.de> - 0:3.9-1jpp
! - Upgrade to 3.9
! - Build with maven1 per default
! - Add gcj_support option
! - Add pom and depmap frag
  
  * Mon Jun 19 2006 Deepak Bhole <dbhole at redhat.com> - 0:3.6-1jpp

--- NEW FILE: pmd-4.2.5-pom.patch ---
--- pom.xml.sav	2010-12-06 12:56:19.000000000 +0100
+++ pom.xml	2010-12-06 12:56:45.000000000 +0100
@@ -309,7 +309,7 @@
 				<minimumTokens>100</minimumTokens>
 				<targetJdk>1.5</targetJdk>
 				<rulesets>
-            		<ruleset>http://pmd.svn.sourceforge.net/svnroot/pmd/branches/pmd/4.2.x/rulesets/internal/dogfood.xml</ruleset>
+            		<ruleset>rulesets/internal/dogfood.xml</ruleset>
 				</rulesets>
         	</configuration>
       </plugin>

--- pmd-3.9.pom DELETED ---




More information about the JPackage-commits mailing list