diff --git a/.cvsignore b/.cvsignore index 9522097..e7f7977 100644 --- a/.cvsignore +++ b/.cvsignore @@ -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 diff --git a/qdox-disable-xsite.patch b/qdox-disable-xsite.patch index 48a1713..444b00d 100644 --- a/qdox-disable-xsite.patch +++ b/qdox-disable-xsite.patch @@ -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 @@ - ${basedir}/src/site/templates/site-template.vm - - -- -+ - - maven-resources-plugin - 2.3 -- -+ - -- -+ - - - -@@ -363,12 +363,12 @@ - compile - true - -- -+ - - - +--- 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 @@ + ${basedir}/src/site/templates/site-template.vm + + +- ++ + + maven-resources-plugin + 2.3 +- ++ + +- ++ + + + +@@ -383,12 +383,12 @@ + compile + true + +- ++ + + + diff --git a/qdox.spec b/qdox.spec index f357694..2f7f31b 100644 --- a/qdox.spec +++ b/qdox.spec @@ -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 0:1.11-1 +- Update to 1.11. + * Mon Feb 15 2010 Alexander Kurtakov 0:1.10.1-2 - Rebuild for rhbz#565013. diff --git a/sources b/sources index 0dd01b9..be2a4a7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -de95f7234e55fe1b76886b4f2732647c qdox-1.10.1.tar.bz2 +88fad5f4a210426eb11029ac7c0f02c5 qdox-1.11-project.tar.bz2