[Jpackage-commits] dist/gmaven/devel gmaven-gossip.patch, 1.1, 1.2 gmaven-poms.patch, 1.1, 1.2 gmaven.spec, 1.7, 1.8

David Walluck david at ryu.zarb.org
Thu Dec 23 02:55:09 CET 2010


Update of /home/projects/jpackage/cvs/dist/gmaven/devel
In directory ryu.zarb.org:/tmp/cvs-serv22628

Modified Files:
	gmaven-gossip.patch gmaven-poms.patch gmaven.spec 
Log Message:
- build fixes

Index: gmaven-poms.patch
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/gmaven/devel/gmaven-poms.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** gmaven-poms.patch	23 Dec 2010 01:07:30 -0000	1.1
--- gmaven-poms.patch	23 Dec 2010 01:55:07 -0000	1.2
***************
*** 35,47 ****
       <!--<distributionManagement>-->
           <!--<repository>-->
- @@ -221,7 +221,7 @@
-  
-              <dependency>
-                  <groupId>org.sonatype.gossip</groupId>
- -                <artifactId>gossip</artifactId>
- +                <artifactId>gossip-core</artifactId>
-                  <version>1.2</version>
-              </dependency>
-              
  @@ -418,13 +418,13 @@
       </modules>
--- 35,38 ----
***************
*** 65,69 ****
                       <version>1.0</version>
  -                    <executions>
! +                    <!--<executions>
                           <execution>
                               <goals>
--- 56,60 ----
                       <version>1.0</version>
  -                    <executions>
! +                    <executions>
                           <execution>
                               <goals>
***************
*** 74,78 ****
                           </execution>
  -                    </executions>
! +                    </executions>-->
                   </plugin>
   
--- 65,69 ----
                           </execution>
  -                    </executions>
! +                    </executions>
                   </plugin>
   

Index: gmaven.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/gmaven/devel/gmaven.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -C 2 -d -r1.7 -r1.8
*** gmaven.spec	23 Dec 2010 01:34:58 -0000	1.7
--- gmaven.spec	23 Dec 2010 01:55:07 -0000	1.8
***************
*** 206,213 ****
  %prep
  %setup -q -n gmaven-%{namedversion}
! %patch100 -b .sav0
! %patch101 -b .sav1
! %patch102 -b .sav2
! %patch103 -b .sav3
  
  %if 0
--- 206,213 ----
  %prep
  %setup -q -n gmaven-%{namedversion}
! %patch0 -b .sav0
! %patch1 -b .sav1
! %patch2 -b .sav2
! %patch3 -b .sav3
  
  %if 0

Index: gmaven-gossip.patch
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/gmaven/devel/gmaven-gossip.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** gmaven-gossip.patch	23 Dec 2010 01:07:30 -0000	1.1
--- gmaven-gossip.patch	23 Dec 2010 01:55:07 -0000	1.2
***************
*** 6,10 ****
               <groupId>org.sonatype.gossip</groupId>
  -            <artifactId>gossip</artifactId>
! +            <artifactId>gossip-core</artifactId>
               <scope>runtime</scope>
           </dependency>
--- 6,10 ----
               <groupId>org.sonatype.gossip</groupId>
  -            <artifactId>gossip</artifactId>
! +            <artifactId>gossip</artifactId>
               <scope>runtime</scope>
           </dependency>
***************
*** 17,21 ****
               <groupId>org.sonatype.gossip</groupId>
  -            <artifactId>gossip</artifactId>
! +            <artifactId>gossip-core</artifactId>
               <scope>runtime</scope>
           </dependency>
--- 17,21 ----
               <groupId>org.sonatype.gossip</groupId>
  -            <artifactId>gossip</artifactId>
! +            <artifactId>gossip</artifactId>
               <scope>runtime</scope>
           </dependency>
***************
*** 28,44 ****
               <groupId>org.sonatype.gossip</groupId>
  -            <artifactId>gossip</artifactId>
! +            <artifactId>gossip-core</artifactId>
               <scope>test</scope>
           </dependency>
       </dependencies>
! --- pom.xml~	2010-12-22 19:37:28.460688977 -0500
! +++ pom.xml	2010-12-22 19:37:28.472686467 -0500
! @@ -221,7 +221,7 @@
   
               <dependency>
                   <groupId>org.sonatype.gossip</groupId>
! -                <artifactId>gossip-core</artifactId>
! +                <artifactId>gossip-core-core</artifactId>
!                  <version>1.2</version>
               </dependency>
               
--- 28,46 ----
               <groupId>org.sonatype.gossip</groupId>
  -            <artifactId>gossip</artifactId>
! +            <artifactId>gossip</artifactId>
               <scope>test</scope>
           </dependency>
       </dependencies>
! --- pom.xml.sav3	2010-12-22 20:54:25.335557477 -0500
! +++ pom.xml	2010-12-22 20:52:38.439825012 -0500
! @@ -221,8 +221,8 @@
   
               <dependency>
                   <groupId>org.sonatype.gossip</groupId>
! -                <artifactId>gossip</artifactId>
! -                <version>1.2</version>
! +                <artifactId>gossip</artifactId>
! +                <version>1.5</version>
               </dependency>
               
+              <dependency>




More information about the JPackage-commits mailing list