From ecd6cb5114ab9480ed5f1fec2c584fa849456d67 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Thu, 14 Jan 2010 09:11:54 +0000 Subject: [PATCH] Update to upstream 1.10.1. --- .cvsignore | 1 + qdox-disable-xsite.patch | 61 +++++++++++++++++++++++++++++++++++++ qdox.spec | 65 +++++++++++++++++----------------------- sources | 2 +- 4 files changed, 91 insertions(+), 38 deletions(-) create mode 100644 qdox-disable-xsite.patch diff --git a/.cvsignore b/.cvsignore index 4d6725b..9522097 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,3 @@ qdox-1.6.1-src.tar.gz qdox-1.9.2-src.tar.gz +qdox-1.10.1.tar.bz2 diff --git a/qdox-disable-xsite.patch b/qdox-disable-xsite.patch new file mode 100644 index 0000000..48a1713 --- /dev/null +++ b/qdox-disable-xsite.patch @@ -0,0 +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 + +- ++ + + + diff --git a/qdox.spec b/qdox.spec index 907c6c8..a10c508 100644 --- a/qdox.spec +++ b/qdox.spec @@ -31,27 +31,28 @@ # If you don't want to build with maven, and use straight ant instead, # give rpmbuild option '--without maven' -%define with_maven 0 -%define without_maven 1 +%define with_maven 1 %define section free Summary: Extract class/interface/method definitions from sources Name: qdox -Version: 1.9.2 -Release: 2%{?dist} +Version: 1.10.1 +Release: 1%{?dist} Epoch: 0 License: ASL 2.0 URL: http://qdox.codehaus.org/ Group: Development/Libraries -Source0: %{name}-%{version}-src.tar.gz -# svn export http://svn.codehaus.org/qdox/tags/qdox-1.8/ +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/ Source1: build.xml.tar.gz Source2: qdox-settings.xml +Patch0: %{name}-disable-xsite.patch BuildRequires: jpackage-utils >= 0:1.7.4 -BuildRequires: java-devel = 0:1.5.0 +BuildRequires: java-devel >= 1:1.6.0 BuildRequires: ant >= 0:1.6 BuildRequires: ant-junit >= 0:1.6 BuildRequires: junit >= 0:3.8.1 @@ -62,23 +63,30 @@ BuildRequires: maven2 >= 2.0.7 BuildRequires: maven2-plugin-ant BuildRequires: maven2-plugin-antrun BuildRequires: maven2-plugin-compiler +BuildRequires: maven2-plugin-changes +BuildRequires: maven2-plugin-clean +BuildRequires: maven-plugin-cobertura BuildRequires: maven2-plugin-dependency +BuildRequires: maven2-plugin-deploy BuildRequires: maven2-plugin-install BuildRequires: maven2-plugin-jar BuildRequires: maven2-plugin-javadoc -BuildRequires: maven2-plugin-release +BuildRequires: maven2-plugin-site BuildRequires: maven2-plugin-resources -BuildRequires: maven2-plugin-surefire -BuildRequires: jmock >= 0:1.0 +BuildRequires: maven-surefire-maven-plugin +BuildRequires: maven-surefire-provider-junit +BuildRequires: maven-jflex-plugin %endif -Requires: java >= 0:1.5.0 +Requires: java >= 1:1.6.0 Requires(post): jpackage-utils >= 0:1.7.4 Requires(postun): jpackage-utils >= 0:1.7.4 BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot +Obsoletes: qdox-manual <= 0:1.9.2 + %description QDox is a high speed, small footprint parser @@ -92,19 +100,12 @@ Summary: Javadoc for %{name} Group: Documentation %description javadoc -%{summary}. +API docs for %{name}. -%if %{with_maven} -%package manual -Summary: Documents for %{name} -Group: Documentation - -%description manual -%{summary}. -%endif %prep -%setup -q -n %{name} +%setup -q +%patch0 -b .sav for j in $(find . -name "*.jar"); do mv $j $j.no done @@ -131,6 +132,7 @@ mkdir -p $MAVEN_REPO_LOCAL mvn-jpp \ -e \ -s settings.xml \ + -Dmaven.test.skip=true \ -Dmaven.repo.local=$MAVEN_REPO_LOCAL \ ant:ant install javadoc:javadoc @@ -174,17 +176,9 @@ install -m 644 pom.xml \ # javadoc mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} +cp -pr target/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} -# manual -mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} -cp LICENSE.txt $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} -%if %{with_maven} -rm -rf target/site/apidocs -cp -pr target/site $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} -%endif - %clean rm -rf $RPM_BUILD_ROOT @@ -196,7 +190,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(0644,root,root,0755) -%doc %{_docdir}/%{name}-%{version}/LICENSE.txt +%doc LICENSE.txt README.txt %{_javadir}/%{name}.jar %{_javadir}/%{name}-%{version}.jar %{_datadir}/maven2/poms/* @@ -207,13 +201,10 @@ rm -rf $RPM_BUILD_ROOT %doc %{_javadocdir}/%{name}-%{version} %doc %{_javadocdir}/%{name} -%if %{with_maven} -%files manual -%defattr(0644,root,root,0755) -%doc %{_docdir}/%{name}-%{version}/site -%endif - %changelog +* Thu Jan 14 2010 Alexander Kurtakov 0:1.10.1-1 +- Update to upstream 1.10.1. + * Sat Sep 19 2009 Alexander Kurtakov 0:1.9.2-2 - Remove not needed sources. diff --git a/sources b/sources index 05bac31..0dd01b9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1d61cb18731aa74a60d9dd04029b9884 qdox-1.9.2-src.tar.gz +de95f7234e55fe1b76886b4f2732647c qdox-1.10.1.tar.bz2