[Jpackage-commits] rpms/free/modello modello-1.1-ModelloConvertersMojoTest.patch, NONE, 1.1 modello-1.1-ModelloJavaMojoTest.patch, NONE, 1.1 modello-build-all-plugins.patch, 1.3, NONE modello-hibernateold-artifactid-fix.patch, 1.2, NONE modello-jpp-depmap.xml, 1.4, 1.5 modello-maven-plugin-pom.patch, NONE, 1.1 modello-use-old-pdcontainer.patch, 1.1, NONE modello.script, 1.3, 1.4 modello.spec, 1.8, 1.9

jpackage jpackage at ryu.zarb.org
Sat Dec 4 10:51:54 CET 2010


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

Modified Files:
	modello-jpp-depmap.xml modello.script modello.spec 
Added Files:
	modello-1.1-ModelloConvertersMojoTest.patch 
	modello-1.1-ModelloJavaMojoTest.patch 
	modello-maven-plugin-pom.patch 
Removed Files:
	modello-build-all-plugins.patch 
	modello-hibernateold-artifactid-fix.patch 
	modello-use-old-pdcontainer.patch 
Log Message:
1.3-1.jpp6

--- NEW FILE: modello-maven-plugin-pom.patch ---
--- modello-maven-plugin/pom.xml.sav99	2010-04-01 00:18:39.000000000 +0200
+++ modello-maven-plugin/pom.xml	2010-11-27 14:59:44.000000000 +0100
@@ -91,6 +91,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-plugin-plugin</artifactId>
+<!--
         <executions>
           <execution>
             <id>generated-helpmojo</id>
@@ -99,7 +100,21 @@
             </goals>
           </execution>
         </executions>
+-->
       </plugin>
+            <plugin>
+                <groupId>org.codehaus.plexus</groupId>
+                <artifactId>plexus-maven-plugin</artifactId>
+                <version>1.3.5</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>descriptor</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
     </plugins>
   </build>
 

--- modello-build-all-plugins.patch DELETED ---

--- NEW FILE: modello-1.1-ModelloJavaMojoTest.patch ---
--- modello-maven-plugin/src/test/java/org/codehaus/modello/maven/ModelloJavaMojoTest.java.sav	2010-11-27 18:41:55.000000000 +0100
+++ modello-maven-plugin/src/test/java/org/codehaus/modello/maven/ModelloJavaMojoTest.java	2010-11-27 18:42:27.000000000 +0100
@@ -42,7 +42,7 @@
     {
         ModelloCore modelloCore = (ModelloCore) lookup( ModelloCore.ROLE );
 
-        BuildContext buildContext = (BuildContext) lookup( BuildContext.class );
+        BuildContext buildContext = (BuildContext) lookup( (BuildContext.class).getName() );
 
         ModelloJavaMojo mojo = new ModelloJavaMojo();
 

Index: modello.script
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/modello/modello.script,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** modello.script	20 Jan 2009 07:33:51 -0000	1.3
--- modello.script	4 Dec 2010 09:51:52 -0000	1.4
***************
*** 1,3 ****
  #!/bin/sh
! export CLASSPATH=$(build-classpath modello/core modello/plugin-xpp3 modello/plugin-xml plexus/container-default plexus/containers-container-default plexus/utils plexus/classworlds)
  ${JAVA_HOME}/bin/java org.codehaus.modello.ModelloCli $@
--- 1,3 ----
  #!/bin/sh
! export CLASSPATH=$(build-classpath modello/core modello/plugin-xpp3 modello/plugin-xml plexus/container-default plexus/utils classworlds)
  ${JAVA_HOME}/bin/java org.codehaus.modello.ModelloCli $@

--- modello-hibernateold-artifactid-fix.patch DELETED ---

--- NEW FILE: modello-1.1-ModelloConvertersMojoTest.patch ---
--- modello-maven-plugin/src/test/java/org/codehaus/modello/maven/ModelloConvertersMojoTest.java.sav	2010-11-27 18:41:32.000000000 +0100
+++ modello-maven-plugin/src/test/java/org/codehaus/modello/maven/ModelloConvertersMojoTest.java	2010-11-27 18:42:39.000000000 +0100
@@ -42,7 +42,7 @@
     {
         ModelloCore modelloCore = (ModelloCore) lookup( ModelloCore.ROLE );
 
-        BuildContext buildContext = (BuildContext) lookup( BuildContext.class );
+        BuildContext buildContext = (BuildContext) lookup( (BuildContext.class).getName() );
 
         ModelloConvertersMojo mojo = new ModelloConvertersMojo();
 

--- modello-use-old-pdcontainer.patch DELETED ---

Index: modello-jpp-depmap.xml
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/modello/modello-jpp-depmap.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** modello-jpp-depmap.xml	20 Jan 2009 07:33:51 -0000	1.4
--- modello-jpp-depmap.xml	4 Dec 2010 09:51:52 -0000	1.5
***************
*** 1,13 ****
  <dependencies>
    <dependency>
  	<maven>
! 	  <groupId>wutka</groupId>
! 	  <artifactId>dtdparser</artifactId>
! 	  <version>1.21</version>
  	</maven>
  	<jpp>
  	  <groupId>JPP</groupId>
! 	  <artifactId>dtdparser</artifactId>
! 	  <version>1.21</version>
  	</jpp>
    </dependency>
--- 1,29 ----
  <dependencies>
+ <!--
+ 
+   <dependency>
+         <maven>
+           <groupId>org.apache.maven.plugins</groupId>
+           <artifactId>maven-plugin-plugin</artifactId>
+           <version>2.0.8</version>
+         </maven>
+         <jpp>
+           <groupId>JPP/maven-plugin-tools</groupId>
+           <artifactId>plugin-plugin</artifactId>
+           <version>2.4.3</version>
+         </jpp>
+   </dependency>
+ -->
+ 
    <dependency>
  	<maven>
! 	  <groupId>javax.persistence</groupId>
! 	  <artifactId>persistence-api</artifactId>
! 	  <version>1.0</version>
  	</maven>
  	<jpp>
  	  <groupId>JPP</groupId>
! 	  <artifactId>jpa_api</artifactId>
! 	  <version>1.0</version>
  	</jpp>
    </dependency>
***************
*** 15,26 ****
    <dependency>
  	<maven>
! 	  <groupId>org.codehaus.plexus</groupId>
! 	  <artifactId>plexus-component-api</artifactId>
! 	  <version>1.0-alpha-15</version>
  	</maven>
  	<jpp>
! 	  <groupId>JPP/plexus</groupId>
! 	  <artifactId>container-default</artifactId>
! 	  <version>1.0-alpha-8</version>
  	</jpp>
    </dependency>
--- 31,42 ----
    <dependency>
  	<maven>
! 	  <groupId>javax.xml.stream</groupId>
! 	  <artifactId>stax-api</artifactId>
! 	  <version>1.0-2</version>
  	</maven>
  	<jpp>
! 	  <groupId>JPP</groupId>
! 	  <artifactId>stax_1_0_api</artifactId>
! 	  <version>1.0.1</version>
  	</jpp>
    </dependency>
***************
*** 29,153 ****
  	<maven>
  	  <groupId>org.codehaus.plexus</groupId>
! 	  <artifactId>containers-containers-default</artifactId>
! 	  <version>1.0-alpha-15</version>
  	</maven>
  	<jpp>
  	  <groupId>JPP/plexus</groupId>
  	  <artifactId>container-default</artifactId>
! 	  <version>1.0-alpha-8</version>
  	</jpp>
    </dependency>
    <dependency>
-       <maven>
-           <groupId>org.codehaus.plexus</groupId>
-           <artifactId>plexus-interactivity-api</artifactId>
-           <version>1.0-alpha-4</version>
-       </maven>
-       <jpp>
-           <groupId>JPP/plexus</groupId>
-           <artifactId>interactivity-api</artifactId>
-           <version>1.0-alpha-1</version>
-       </jpp>
-   </dependency>
-     <dependency>
          <maven>
!             <groupId>stax</groupId>
!             <artifactId>stax-api</artifactId>
!             <version>1.0.1</version>
!             <scope>test</scope>
!         </maven>
!         <jpp>
!             <groupId>JPP</groupId>
!             <artifactId>stax_api</artifactId>
!             <version>1.0</version>
!         </jpp>
!     </dependency>
!     <dependency>
!         <maven>
!             <groupId>stax</groupId>
!             <artifactId>stax</artifactId>
!             <version>1.2.0</version>
!             <scope>test</scope>
          </maven>
          <jpp>
!             <groupId>JPP</groupId>
!             <artifactId>bea-stax-api</artifactId>
!             <version>1.2.0</version>
          </jpp>
-     </dependency>
-   <!-- unnecessary jars -->
-   <dependency>
- 	<maven>
- 	  <groupId>hibernate</groupId>
- 	  <artifactId>hibernate</artifactId>
- 	  <version>2.0.3</version>
- 	</maven>
-   </dependency>
- 
-   <dependency>
- 	<maven>
- 	  <groupId>hsqldb</groupId>
- 	  <artifactId>hsqldb</artifactId>
- 	  <version>1.7.2.2</version>
- 	</maven>
-   </dependency>
- 
-   <dependency>
- 	<maven>
- 	  <groupId>postgresql</groupId>
- 	  <artifactId>postgresql</artifactId>
- 	  <version>7.4.1-jdbc3</version>
- 	</maven>
-   </dependency>
- 
-   <!-- jars needed for test only, that we don't have yet in Fedora -->
-   <dependency>
-     <maven>
-       <groupId>org.apache.derby</groupId>
-       <artifactId>derby</artifactId>
-       <version>10.1.3.1</version>
-     </maven>
-   </dependency>
- 
-   <dependency>
-     <maven>
-       <groupId>jpox</groupId>
-       <artifactId>jpox-enhancer</artifactId>
-       <version>1.1.1</version>
-     </maven>
-   </dependency>
- 
-   <dependency>
-     <maven>
-       <groupId>jpox</groupId>
-       <artifactId>jpox</artifactId>
-       <version>1.1.1</version>
-     </maven>
-   </dependency>
- 
-   <dependency>
-     <maven>
-       <groupId>net.java.dev.stax-utils</groupId>
-       <artifactId>stax-utils</artifactId>
-       <version>20060502</version>
-     </maven>
-   </dependency>
- 
-   <dependency>
-     <maven>
-       <groupId>woodstox</groupId>
-       <artifactId>wstx-asl</artifactId>
-       <version>3.2.0</version>
-     </maven>
-   </dependency>
- 
-   <dependency>
-     <maven>
-       <groupId>org.codehaus.plexus.registry</groupId>
-       <artifactId>plexus-registry-commons</artifactId>
-       <version>1.0-alpha-2</version>
-     </maven>
    </dependency>
  
  </dependencies>
- 
--- 45,70 ----
  	<maven>
  	  <groupId>org.codehaus.plexus</groupId>
! 	  <artifactId>containers-container-default</artifactId>
! 	  <version>1.0-alpha-30</version>
  	</maven>
  	<jpp>
  	  <groupId>JPP/plexus</groupId>
  	  <artifactId>container-default</artifactId>
! 	  <version>1.0-alpha-9s1</version>
  	</jpp>
    </dependency>
+ 
    <dependency>
          <maven>
!           <groupId>org.mortbay.jetty</groupId>
!           <artifactId>servlet-api</artifactId>
!           <version>2.5-20081211</version>
          </maven>
          <jpp>
!           <groupId>JPP</groupId>
!           <artifactId>servlet_2_5_api</artifactId>
!           <version>2.5</version>
          </jpp>
    </dependency>
  
  </dependencies>

Index: modello.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/modello/modello.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -C 2 -d -r1.8 -r1.9
*** modello.spec	28 Apr 2009 10:47:42 -0000	1.8
--- modello.spec	4 Dec 2010 09:51:52 -0000	1.9
***************
*** 1,3 ****
! # Copyright (c) 2000-2005, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2010, JPackage Project
  # All rights reserved.
  #
***************
*** 34,43 ****
  %define repo_dir    .m2/repository
  
! %define namedversion 1.0-alpha-15
  %define maven_settings_file %{_builddir}/%{name}-%{namedversion}/settings.xml
  
  Name:           modello
! Version:        1.0
! Release:        0.2.a15.5%{?dist}
  Epoch:          0
  Summary:        Modello Data Model toolkit
--- 34,43 ----
  %define repo_dir    .m2/repository
  
! %define namedversion 1.3
  %define maven_settings_file %{_builddir}/%{name}-%{namedversion}/settings.xml
  
  Name:           modello
! Version:        1.3
! Release:        1%{?dist}
  Epoch:          0
  Summary:        Modello Data Model toolkit
***************
*** 45,58 ****
  Group:          Development/Java
  URL:            http://modello.codehaus.org/
! Source0:        %{name}-%{namedversion}-src.tar.gz
! # svn export https://svn.codehaus.org/modello/tags/modello-1.0-alpha-15/
! # tar czf modello-1.0-alpha-15-src.tar.gz modello-1.0-alpha-15/
  Source1:        modello.script
! 
! Source2:                %{name}-jpp-depmap.xml
! 
! Patch0:                 modello-hibernateold-artifactid-fix.patch
! Patch1:                 modello-build-all-plugins.patch
! Patch2:                 modello-use-old-pdcontainer.patch
  %if %{gcj_support}
  BuildRequires:          java-gcj-compat-devel
--- 45,56 ----
  Group:          Development/Java
  URL:            http://modello.codehaus.org/
! Source0:        %{name}-%{namedversion}.tgz
! # svn export https://svn.codehaus.org/modello/tags/modello-1.3/
! # tar czf modello-1.3.tgz modello-1.3/
  Source1:        modello.script
! Source2:        %{name}-jpp-depmap.xml
! Patch0:         modello-1.1-ModelloConvertersMojoTest.patch
! Patch1:         modello-1.1-ModelloJavaMojoTest.patch
! Patch99:        modello-maven-plugin-pom.patch
  %if %{gcj_support}
  BuildRequires:          java-gcj-compat-devel
***************
*** 65,71 ****
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
! BuildRequires:  ant >= 0:1.6
! BuildRequires:  jpackage-utils >= 0:1.7.2
! BuildRequires:  maven2 >= 2.0.4-9
  BuildRequires:  maven2-plugin-assembly
  BuildRequires:  maven2-plugin-compiler
--- 63,70 ----
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
! BuildRequires:  jpackage-utils >= 0:1.7.5
! BuildRequires:  java-devel >= 0:1.6.0
! BuildRequires:  ant >= 0:1.7
! BuildRequires:  maven2 >= 2.0.8
  BuildRequires:  maven2-plugin-assembly
  BuildRequires:  maven2-plugin-compiler
***************
*** 74,106 ****
  BuildRequires:  maven2-plugin-javadoc
  BuildRequires:  maven2-plugin-resources
! BuildRequires:  maven2-plugin-surefire = 2.3
! BuildRequires:  maven-surefire-provider-junit = 2.3
  BuildRequires:	maven-doxia
  BuildRequires:  maven-doxia-sitetools
  BuildRequires:  maven2-plugin-plugin
! BuildRequires:  plexus-containers-component-api >= 1.0-0.a34
  BuildRequires:  classworlds >= 0:1.1
  BuildRequires:  dtdparser
! BuildRequires:  plexus-container-default
  BuildRequires:  plexus-utils
  BuildRequires:  plexus-velocity
- BuildRequires:  velocity
  BuildRequires:  excalibur-avalon-framework
! #BuildRequires:       stax_1_0_1_api
! #BuildRequires:  stax-utils
  
  
  Requires:       classworlds >= 0:1.1
  Requires:       dtdparser
  Requires:       plexus-container-default
  Requires:       plexus-utils
  Requires:       plexus-velocity
  Requires:       velocity
- #Requires:       stax_1_0_1_api
- #Requires:       stax-utils
  
  
! Requires(post):    jpackage-utils >= 0:1.7.2
! Requires(postun):  jpackage-utils >= 0:1.7.2
  
  Provides:       modello-maven-plugin = %{epoch}:%{version}-%{release}
--- 73,111 ----
  BuildRequires:  maven2-plugin-javadoc
  BuildRequires:  maven2-plugin-resources
! BuildRequires:  maven-surefire-maven-plugin
! BuildRequires:  maven-surefire-provider-junit
  BuildRequires:	maven-doxia
  BuildRequires:  maven-doxia-sitetools
  BuildRequires:  maven2-plugin-plugin
! BuildRequires:  apache-commons-parent
  BuildRequires:  classworlds >= 0:1.1
  BuildRequires:  dtdparser
! BuildRequires:  geronimo-jpa-3.0-api
! BuildRequires:  plexus-build-api
! BuildRequires:  plexus-containers-container-default
! BuildRequires:  plexus-containers-component-api 
  BuildRequires:  plexus-utils
  BuildRequires:  plexus-velocity
  BuildRequires:  excalibur-avalon-framework
! BuildRequires:  stax_1_0_api
! BuildRequires:  stax-utils
! BuildRequires:  velocity
! BuildRequires:  wstx
  
  
  Requires:       classworlds >= 0:1.1
  Requires:       dtdparser
+ Requires:       jpa_3_0_api
+ Requires:       plexus-build-api
  Requires:       plexus-container-default
  Requires:       plexus-utils
  Requires:       plexus-velocity
+ Requires:       stax_1_0_api
+ Requires:       stax-utils
  Requires:       velocity
  
  
! Requires(post):    jpackage-utils >= 0:1.7.5
! Requires(postun):  jpackage-utils >= 0:1.7.5
  
  Provides:       modello-maven-plugin = %{epoch}:%{version}-%{release}
***************
*** 125,130 ****
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
- Requires(post):   /bin/rm,/bin/ln
- Requires(postun): /bin/rm
  
  %description javadoc
--- 130,133 ----
***************
*** 133,154 ****
  %prep
  %setup -q -n %{name}-%{namedversion}
! #%patch0 -b .sav
! %patch1 -b .sav
! %patch2 -b .sav
! 
  find . -name release-pom.xml -exec rm -f '{}' \;
! 
! #ObjStateFactoryModeeneratorTest renamed to ObjStateFactoryModelloGeneratorTest
! for i in modello-plugins-sandbox/modello-plugin-ldap/src/test/java/org/codehaus/modello/plugin/ldap/ObjStateFactoryModelloGeneratorTest.java \
!          modello-plugins-sandbox/modello-plugin-ldap/src/test/java/org/codehaus/modello/plugin/ldap/LdapSchemaGeneratorTest.java \
!          modello-plugins-sandbox/modello-plugin-ojb/src/test/java/org/codehaus/modello/plugin/ojb/OjbModelloGeneratorTest.java \
!          modello-plugins-sandbox/modello-plugin-stash/src/test/java/org/codehaus/modello/plugin/stash/StashModelloGeneratorTest.java \
!          modello-plugins-sandbox/modello-plugin-hibernate-store/src/test/java/org/codehaus/modello/plugin/hibernate/HibernateModelloGeneratorTest.java; do
!         sed -i -e s:org.codehaus.modello.ModelloGeneratorTest:org.codehaus.modello.AbstractModelloGeneratorTest:g $i
!         sed -i -e s:"extends ModelloGeneratorTest":"extends AbstractModelloGeneratorTest":g $i
  done
  
  %build
- ls -lR /usr/share/java/*stax*
  
  export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
--- 136,148 ----
  %prep
  %setup -q -n %{name}-%{namedversion}
! %patch0 -b .sav0
! %patch1 -b .sav1
! %patch99 -b .sav99
  find . -name release-pom.xml -exec rm -f '{}' \;
! for p in $(find . -name pom.xml); do
!     sed -i -e 's|<groupId>plexus</groupId>|<groupId>org.codehaus.plexus</groupId>|' $p
  done
  
  %build
  
  export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
***************
*** 162,191 ****
          install
  
! # Manual iteration should not be needed, but there is a bug in the javadoc 
! # plugin which makes this necessary. See: 
! # http://jira.codehaus.org/browse/MJAVADOC-157
! for dir in modello-*; do
!     pushd $dir
!         mvn-jpp \
!           -e \
!           -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
!           -Dmaven2.jpp.depmap.file=%{SOURCE2} \
!           -Dmaven.test.failure.ignore=true \
!           javadoc:javadoc
!     popd
! done
! 
! for dir in modello-plugins/modello-plugin-*; do
!     pushd $dir
!         mvn-jpp \
!           -e \
!           -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
!           -Dmaven2.jpp.depmap.file=%{SOURCE2} \
!           -Dmaven.test.failure.ignore=true \
!           javadoc:javadoc
!     popd
! done
! 
! 
  
  %install
--- 156,165 ----
          install
  
! mvn-jpp \
!         -e \
!         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
!         -Dmaven2.jpp.depmap.file=%{SOURCE2} \
!         -Daggregate=true \
!         javadoc:javadoc
  
  %install
***************
*** 206,217 ****
  done
  
- # sandbox plugins are a different version
- for i in `find . -name pom.xml | grep modello-plugins-sandbox`; do
-         # i is in format ..../artifactid/pom.xml
-         artifactname=`basename \`dirname $i\` | sed -e s:^modello-::g`
- 
-         %add_to_maven_depmap org.codehaus.modello modello-$artifactname 1.0-alpha-4-SNAPSHOT JPP/%{name} $artifactname
- done
- 
  cp -p pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.modello-modello.pom
  %add_to_maven_depmap org.codehaus.modello modello %{namedversion} JPP/%{name} modello
--- 180,183 ----
***************
*** 229,246 ****
  (cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{namedversion}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{namedversion}||g"`; done)
  
- # Do it again for sandbox plugins, which have a different version
- (cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-1.0-alpha-4-SNAPSHOT*; do ln -sf ${jar} `echo $jar| sed  "s|-1.0-alpha-4-SNAPSHOT||g"`; done)
- 
- # Prevayler is in a sandbox and has a different version
- ln -s plugin-prevayler-1.0-alpha-12-SNAPSHOT.jar  $RPM_BUILD_ROOT%{_javadir}/%{name}/plugin-prevayler.jar
- 
  # javadoc
  install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! for target in $(find -type d -name target); do
!   if [ -d $target/site/apidocs ]; then
!     install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/`basename \`dirname $target\` | sed -e s:modello-::g`
!     cp -pr $target/site/apidocs/* $jar $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/`basename \`dirname $target\` | sed -e s:modello-::g`
!   fi
! done
  ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
  
--- 195,201 ----
  (cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{namedversion}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{namedversion}||g"`; done)
  
  # javadoc
  install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
  ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
  
***************
*** 253,256 ****
--- 208,212 ----
  
  %post
+ %update_maven_depmap
  %if %{gcj_support}
  if [ -x %{_bindir}/rebuild-gcj-db ]
***************
*** 259,265 ****
  fi
  %endif
- %update_maven_depmap
  
  %postun
  %if %{gcj_support}
  if [ -x %{_bindir}/rebuild-gcj-db ]
--- 215,221 ----
  fi
  %endif
  
  %postun
+ %update_maven_depmap
  %if %{gcj_support}
  if [ -x %{_bindir}/rebuild-gcj-db ]
***************
*** 268,280 ****
  fi
  %endif
- %update_maven_depmap
  
  
  %files
  %defattr(-,root,root,-)
! %{_datadir}/maven2
! %{_javadir}/%{name}
  %attr(755,root,root) %{_bindir}/*
! %{_mavendepmapfragdir}
  %if %{gcj_support}
  %attr(-,root,root) %dir %{_libdir}/gcj/%{name}
--- 224,236 ----
  fi
  %endif
  
  
  %files
  %defattr(-,root,root,-)
! %dir %{_javadir}/%{name}
! %{_javadir}/%{name}/*.jar
  %attr(755,root,root) %{_bindir}/*
! %{_datadir}/maven2/poms/*
! %{_mavendepmapfragdir}/*
  %if %{gcj_support}
  %attr(-,root,root) %dir %{_libdir}/gcj/%{name}
***************
*** 287,290 ****
--- 243,249 ----
  
  %changelog
+ * Mon Nov 29 2010 Ralph Apel <r.apel at r-apel.de> 1.3-1
+ - 1.3
+ 
  * Tue Apr 28 2009 Yong Yang <yyang at redhat.com> 1.0-0.2.a15.5
  - rebuild with new maven2 2.0.8 built in non-bootstrap mode




More information about the JPackage-commits mailing list