rpms/qdox/devel sources, 1.5, 1.6 qdox.spec, 1.11, 1.12 .cvsignore, 1.5, 1.6 qdox-disable-xsite.patch, 1.1, 1.2

Alexander Kurtakov akurtakov at fedoraproject.org
Mon Mar 15 16:14:41 UTC 2010


Author: akurtakov

Update of /cvs/pkgs/rpms/qdox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32375/devel

Modified Files:
	sources qdox.spec .cvsignore qdox-disable-xsite.patch 
Log Message:
Update to 1.11.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qdox/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	14 Jan 2010 09:11:54 -0000	1.5
+++ sources	15 Mar 2010 16:14:40 -0000	1.6
@@ -1 +1 @@
-de95f7234e55fe1b76886b4f2732647c  qdox-1.10.1.tar.bz2
+88fad5f4a210426eb11029ac7c0f02c5  qdox-1.11-project.tar.bz2


Index: qdox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qdox/devel/qdox.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- qdox.spec	15 Feb 2010 14:53:00 -0000	1.11
+++ qdox.spec	15 Mar 2010 16:14:40 -0000	1.12
@@ -37,16 +37,13 @@
 
 Summary:        Extract class/interface/method definitions from sources
 Name:           qdox
-Version:        1.10.1
-Release:        2%{?dist}
+Version:        1.11
+Release:        1%{?dist}
 Epoch:          0
 License:        ASL 2.0
 URL:            http://qdox.codehaus.org/
 Group:          Development/Libraries
-Source0:        %{name}-%{version}.tar.bz2
-# svn export http://svn.codehaus.org/qdox/tags/qdox-1.10.1/
-# tar cjf qdox-1.10.1.tar.bz2 qdox-1.10.1/
-
+Source0:        http://repository.codehaus.org/com/thoughtworks/qdox/qdox/%{version}/%{name}-%{version}-project.tar.bz2
 Source1:        build.xml.tar.gz
 Source2:        qdox-settings.xml
 Patch0:         %{name}-disable-xsite.patch
@@ -62,6 +59,7 @@ BuildRequires:  jflex
 BuildRequires:  maven2 >= 2.0.7
 BuildRequires:  maven2-plugin-ant
 BuildRequires:  maven2-plugin-antrun
+BuildRequires:  maven2-plugin-assembly
 BuildRequires:  maven2-plugin-compiler
 BuildRequires:  maven2-plugin-changes
 BuildRequires:  maven2-plugin-clean
@@ -202,6 +200,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Mon Mar 15 2010 Alexander Kurtakov <akurtako at redhat.com> 0:1.11-1
+- Update to 1.11.
+
 * Mon Feb 15 2010 Alexander Kurtakov <akurtako at redhat.com> 0:1.10.1-2
 - Rebuild for rhbz#565013.
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qdox/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	14 Jan 2010 09:11:54 -0000	1.5
+++ .cvsignore	15 Mar 2010 16:14:40 -0000	1.6
@@ -1,3 +1,4 @@
 qdox-1.6.1-src.tar.gz
 qdox-1.9.2-src.tar.gz
 qdox-1.10.1.tar.bz2
+qdox-1.11-project.tar.bz2

qdox-disable-xsite.patch:
 pom.xml |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

Index: qdox-disable-xsite.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qdox/devel/qdox-disable-xsite.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- qdox-disable-xsite.patch	14 Jan 2010 09:11:54 -0000	1.1
+++ qdox-disable-xsite.patch	15 Mar 2010 16:14:40 -0000	1.2
@@ -1,61 +1,61 @@
---- pom.xml.sav	2009-12-31 18:37:19.000000000 +0200
-+++ pom.xml	2010-01-08 16:26:05.294855545 +0200
-@@ -264,7 +264,7 @@
-           <templateFile>${basedir}/src/site/templates/site-template.vm</templateFile>
-         </configuration>
-       </plugin>
--      <plugin>
-+      <!--<plugin>
-         <groupId>org.codehaus.xsite</groupId>
-         <artifactId>xsite-maven-plugin</artifactId>
-         <version>1.0</version>
-@@ -283,11 +283,11 @@
-             </goals>
-           </execution>
-         </executions>
--      </plugin>
-+      </plugin>-->
-         <plugin>
-           <artifactId>maven-resources-plugin</artifactId>
-           <version>2.3</version>
--        <executions>
-+        <!--executions>
-           <execution>
-             <id>pre-copy-resources</id>
-             <phase>pre-site</phase>
-@@ -332,9 +332,9 @@
-               </resources>              
-             </configuration>            
-           </execution>
--        </executions>
-+        </executions-->
-       </plugin>
--      <plugin>
-+      <!--plugin>
-         <groupId>org.apache.maven.plugins</groupId>
-         <artifactId>maven-release-plugin</artifactId>
-         <version>2.0-beta-9</version>
-@@ -344,7 +344,7 @@
-           <goals>deploy</goals>
-           <tagBase>https://svn.codehaus.org/qdox/tags</tagBase>
-         </configuration>
--      </plugin>
-+      </plugin-->
-     </plugins>
-   </build>
- 
-@@ -363,12 +363,12 @@
-       <scope>compile</scope>
-       <optional>true</optional>
-     </dependency>
--    <dependency>
-+    <!--dependency>
-       <groupId>jmock</groupId>
-       <artifactId>jmock</artifactId>
-       <version>1.0.0</version>
-       <scope>test</scope>
--    </dependency>
-+    </dependency-->
-   </dependencies>
- 
-   <distributionManagement>
+--- pom.xml.sav	2010-03-13 12:43:16.000000000 +0200
++++ pom.xml	2010-03-15 17:52:45.147525923 +0200
+@@ -282,7 +282,7 @@
+           <templateFile>${basedir}/src/site/templates/site-template.vm</templateFile>
+         </configuration>
+       </plugin>
+-      <plugin>
++      <!--plugin>
+         <groupId>org.codehaus.xsite</groupId>
+         <artifactId>xsite-maven-plugin</artifactId>
+         <version>1.0</version>
+@@ -301,11 +301,11 @@
+             </goals>
+           </execution>
+         </executions>
+-      </plugin>
++      </plugin-->
+         <plugin>
+           <artifactId>maven-resources-plugin</artifactId>
+           <version>2.3</version>
+-        <executions>
++        <!--executions>
+           <execution>
+             <id>pre-copy-resources</id>
+             <phase>pre-site</phase>
+@@ -352,9 +352,9 @@
+               </resources>              
+             </configuration>            
+           </execution>
+-        </executions>
++        </executions-->
+       </plugin>
+-      <plugin>
++      <!--plugin>
+         <groupId>org.apache.maven.plugins</groupId>
+         <artifactId>maven-release-plugin</artifactId>
+         <version>2.0</version>
+@@ -364,7 +364,7 @@
+           <tagBase>https://svn.codehaus.org/qdox/tags</tagBase>
+           <arguments>-Dproject.rel.org.thoughtworks.qdox:qdox=${project.rel.org.thoughtworks.qdox:qdox} -Dproject.dev.org.thoughtworks.qdox:qdox=${project.dev.org.thoughtworks.qdox:qdox}</arguments>
+         </configuration>
+-      </plugin>
++      </plugin-->
+     </plugins>
+   </build>
+ 
+@@ -383,12 +383,12 @@
+       <scope>compile</scope>
+       <optional>true</optional>
+     </dependency>
+-    <dependency>
++    <!--dependency>
+       <groupId>jmock</groupId>
+       <artifactId>jmock</artifactId>
+       <version>1.0.0</version>
+       <scope>test</scope>
+-    </dependency>
++    </dependency-->
+   </dependencies>
+ 
+   <distributionManagement>



More information about the scm-commits mailing list