rpms/qdox/devel build.xml.tar.gz, NONE, 1.1 qdox-1.8-jpp-depmap.xml, NONE, 1.1 qdox-settings.xml, NONE, 1.1 sources, 1.3, 1.4 qdox.spec, 1.7, 1.8 .cvsignore, 1.3, 1.4

Alexander Kurtakov akurtakov at fedoraproject.org
Tue Aug 18 15:19:05 UTC 2009 

Author: akurtakov

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

Modified Files:
	sources qdox.spec .cvsignore 
Added Files:
	build.xml.tar.gz qdox-1.8-jpp-depmap.xml qdox-settings.xml 
Log Message:
Update to 1.9.2.


--- NEW FILE build.xml.tar.gz ---
‹
Ê”A,$æ ÊKù˜µ ì÷ãŸÀöèpAY8ìöí^‘Ðe
ï†Ý?nµ»?t:Çß[¾
 Ë:1üNC‰FÊјúý0‘2:rJG؝›ñ;çŸh̸ÆíÛûö
¥B×@Žã+ʨXR# ²ã°[³ë¨Y7§œOďDñ©]ø*°9å$²Oš€´]5wÂP@„
z½Ä5mãX,–Q,Ï(‡WŒÏ†ïÿÒnW}.‘y5žBU	ÙÍ°ëÞÛ䉸±Ä#È=΄ÄÁÓ˜K<eŽ"G¡:#ƤGŽ¢±}ÆOÃU!mNTS9jÜJÆ;ùÑ1
±©¢ZMaõíö A0è°‰6,^O ¨$ÆjÆ/D°˜»(íÞPp7•Ã¼.J’MRÅÞõ±%¾À=À4tª¹«‰¯–Í %+N£`ûÌÅ>Ä‚p[YæÙ±ƒ£Æ`Í Y©t%l6ƒeÈpŒ}QT‰ÚdMî+ÓÀ&ìJú@>3%µYÔba^ÎGïñî<)ƒØ™‚Œá®±œÔ»—͹K£ÉÒ6ýÖÑÝ¥­z#s,Ïÿƒ½ƒýƒRþvÛü¿hëÿjù6³àšášMÕl`Ášß+AÎÀ3€/©‹%8˜@Ô÷ш °äTJHëó{mù–?,D‡NÿÐé}D{Pá ëÏMün9B‰›-&çÇ‘æ*Ì€Nn™7ÎöÖûŠþRÕ [cÎK¯ïöÊ?ëŒBÂÊY$]qÒج©´Í´ƒ‰8³¤[^(ŒçÌ…NZ¿Yuç¦pÈÆ:•Uk=`?Nm§«×òT‹Ô`ÀŒÎ=Í4YušQÖW©ÍÜÒz-c–Ömͤ…ª·@_¬~›9JâeËÊ—Æ«±]N½]öKí‹ÍÃ2nùv¨qe)Þ~µ­Ð2æÅBÚqù¡\êÝóŽ#Ǹ¶óX&q¹Éøé¶d%ÊRS2hNÒUl&ýpi§‹ kY'ëm#ýHˆzî1w&fz(¦Òèé­"u¹qŸ<uèº~ì‘Ä°£ªÒÑéÛ{v_=YúɾÇܘ¬‚æ>©tÌÏö!ÐégK?ç)D,s
§ä=©XŒŽ·±¢EÊ€¹SÇü„>Àî™gK?7êbsý‹O°vèøE§¼[:Þu•´ªú.§‘Ô]•^>§7e'[©‡xÄ'’dž
Î~7§kDÔ×µú[е––(mG$ôÄ°cü!Ê0ˆæªD¥ãDíÁÔ[¥õù™dæôªÂp[¹urŠ(·Ò…Á=b¦»JaÈ#£ø.Ù-
VÐÿ“ªü
›5/ÒÝ©&·8
vÌB'¦Â`M)>&’òèqÛ‚(Ô‘bJ£Æh+Ó+F\‰¦ºc¥¨ËúŒæ°+q.Fa©ÞqÖc1Í*1JSç[ÉÅ¢’¬Ù#2~•ÕWMË4w>GM´­dò%ö}V_U­ØR2Ñíè²bÒ̏ÈTž‚±2Sh$"âÕ§¥ŸyÚÁª•®Ï)ùþ5—LÔL(âИÝÄA€ùl؝4Á¾dÐlrÆÓð5¯Æ˜ú1O{¶$$ÍsvŠ•àLdíà”
ð¢I3ïÑŽ˜“§!Ò“?ÉyY©ÚÙqÔ¾¾cϏ“ê1wê꘿€KTa“§2öéH]T»²z‚B÷e^dz[[“t¼-¾ÿK¡>og½Ç¦Å]LÖYË2	ök¡N“r˜Š¸”6Ú%s}´=æðÇ#D¾}«“^åéxÊ©¢A«›\H,㚬^F—…ÕufY„4½fêÁ¡—Ó:cÌOÄ
‚ãy·TÈÂ7›Fm•‰pÂ¦™>cÃøW˪Rñj¢¦“”$]b¯ú«ÊV&UUeýÉ×É*[ïO¿\^\þ¶ÊN~ìh®¹	Ðï¨íŽ
(wÕ®§ˆhˆfPë ÷§—·ÿûtõùÜñéh~aë¦Æ˜Ojˆg/ò~iQQ+ü6*­ß!Ø=æ¾ôsÁ-UZ÷FÚÒiFzk)tM”®ˆõŸ8Šüä¶5u¹„KÒ;¨·¾	/4%wwJpùòðBoV{Öÿìàˆ‚¢Ì»®ÞË!SH at -U
TCˆæŸ<,vlHU[Õ8–“yX xXºGžj$z„Aö(©TuÜÎØÒwnÿx×ïý+wz}Q&
YÚe’:mäQ|ÈŽµh’“:…l™ü!S¢Ö†øa„yÍ° œb¿¶óFȝ`.TŸ|qseî}´úeŸ†Ó´ÿ­ä1âO©ºx‘Œok¶Z®M¬¼‘Ô’ÝÊ—›·M{WÈ8ÙÒêGð/½Î^¸Ì+¾Êõ¥BΆJn*ûR|Õ¹eöIÁ*DZIå)tÕ™¬ßžÈ´ýÚ†œ"šÏYê#êÃ&¥ÓDmá±nÿT¿- ‚}ÜÇ–¹¯¶¶ýðœä<&çúk³)7HW”÷’Í^w²ÇÐgØK䄬¯>óX;·xtb¥·ÊKªeã̤t»ˆ­Š°?clûs¿/_YƒãÂ`~á¬IW®ç÷(µ¥ov7^wh“YFlå­³ä̸bÅUG<ù»Sg%4§p—š©Cñ3ì&m)Š¾m¨Õ7[úià,»ˆÍ-F•C+Ì^Ï
¯«ækå•ô°›Íi£|Ó½¶6¯ÊWÓÆ:l¾R¯þ?†Zh¡…Zh¡…Zh¡…Zh¡…Zh¡…Zxð7xØÐ

--- NEW FILE qdox-1.8-jpp-depmap.xml ---
<dependencies>
<!--
	<dependency>
	  <maven>
		<groupId>jetty</groupId>
		<artifactId>jetty</artifactId>
		<version>4.2.10</version>
	  </maven>
	  <jpp>
		<groupId>JPP/jetty5</groupId>
		<artifactId>jetty5</artifactId>
		<version>5.1.12</version>
	  </jpp>
	</dependency>
	<dependency>
	  <maven>
		<groupId>servletapi</groupId>
		<artifactId>servletapi</artifactId>
		<version>2.3</version>
	  </maven>
	  <jpp>
		<groupId>JPP</groupId>
		<artifactId>servlet_2_4_api</artifactId>
		<version>2.4</version>
	  </jpp>
	</dependency>
	<dependency>
	  <maven>
		<groupId>org.nanocontainer</groupId>
		<artifactId>nanocontainer</artifactId>
		<version>1.1</version>
	  </maven>
	  <jpp>
		<groupId>JPP/nanocontainer</groupId>
		<artifactId>container</artifactId>
		<version>1.1</version>
	  </jpp>
	</dependency>
	<dependency>
	  <maven>
		<groupId>asm</groupId>
		<artifactId>asm</artifactId>
		<version>3.0</version>
	  </maven>
	  <jpp>
		<groupId>JPP/objectweb-asm</groupId>
		<artifactId>asm</artifactId>
		<version>3.1</version>
	  </jpp>
	</dependency>
	<dependency>
	  <maven>
		<groupId>asm</groupId>
		<artifactId>asm-parent</artifactId>
		<version>2.2.3</version>
	  </maven>
	  <jpp>
		<groupId>JPP</groupId>
		<artifactId>asm2-parent</artifactId>
		<version>2.2.3</version>
	  </jpp>
	</dependency>
	<dependency>
	  <maven>
		<groupId>asm</groupId>
		<artifactId>asm-tree</artifactId>
		<version>2.2.3</version>
	  </maven>
	  <jpp>
		<groupId>JPP/asm2</groupId>
		<artifactId>asm2-tree</artifactId>
		<version>2.2.3</version>
	  </jpp>
	</dependency>
	<dependency>
	  <maven>
		<groupId>freemarker</groupId>
		<artifactId>freemarker</artifactId>
		<version>2.3.9</version>
	  </maven>
	  <jpp>
		<groupId>JPP</groupId>
		<artifactId>freemarker</artifactId>
		<version>2.3.9</version>
	  </jpp>
	</dependency>
-->
	<dependency>
	  <maven>
		<groupId>slide</groupId>
		<artifactId>slide-webdavlib</artifactId>
		<version>2.1</version>
	  </maven>
	  <jpp>
		<groupId>JPP/slide</groupId>
		<artifactId>slide-webdavclient-webdavlib</artifactId>
		<version>2.1</version>
	  </jpp>
	</dependency>
<!--
	<dependency>
	  <maven>
		<groupId>avalon-framework</groupId>
		<artifactId>avalon-framework</artifactId>
		<version>4.1.3</version>
	  </maven>
	  <jpp>
		<groupId>JPP</groupId>
		<artifactId>avalon-framework</artifactId>
		<version>4.3.1</version>
	  </jpp>
	</dependency>
	<dependency>
	  <maven>
		<groupId>logkit</groupId>
		<artifactId>logkit</artifactId>
		<version>1.0.1</version>
	  </maven>
	  <jpp>
		<groupId>JPP</groupId>
		<artifactId>avalon-logkit</artifactId>
		<version>2.2.1</version>
	  </jpp>
	</dependency>

 <dependency>
   <maven>
     <groupId>javax.jms</groupId>
     <artifactId>jms</artifactId>
     <version>1.1</version>
   </maven>
   <jpp>
     <groupId>JPP</groupId>
     <artifactId>jms_1_1_api</artifactId>
     <version>1.1</version>
   </jpp>
 </dependency>
-->

        <dependency>
                <maven>
                        <groupId>xpp3</groupId>
                        <artifactId>xpp3_min</artifactId>
                        <version>1.1.3.4.O</version>
                </maven>
                <jpp>
                        <groupId>JPP</groupId>
                        <artifactId>xpp3-minimal</artifactId>
                        <version>1.1.3.8</version>
                </jpp>
        </dependency>

</dependencies>


--- NEW FILE qdox-settings.xml ---
<settings>
	<profiles>
		<profile>
			<id>JPP</id>
			<repositories>
				<repository>
					<id>internal</id>
					<layout>jpp</layout>
					<url>__JPP_URL_PLACEHOLDER__</url>
				</repository>
				<repository>
					<id>external</id>
					<layout>jpp</layout>
					<url>__JAVADIR_PLACEHOLDER__</url>
				</repository>
				<repository>
					<id>local</id>
					<layout>jpp</layout>
					<url>__MAVENREPO_DIR_PLACEHOLDER__</url>
				</repository>
			</repositories>
			<pluginRepositories>
				<pluginRepository>
					<id>plugins-internal</id>
					<name>plugins-internal</name>
					<layout>jpp</layout>
					<url>__JPP_URL_PLACEHOLDER__</url>
				</pluginRepository>
				<pluginRepository>
					<id>plugins-external</id>
					<name>plugins-external</name>
					<layout>jpp</layout>
					<url>__JAVADIR_PLACEHOLDER__</url>
				</pluginRepository>
				<pluginRepository>
					<id>plugins-maven</id>
					<name>plugins-maven</name>
					<layout>jpp</layout>
					<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>
				</pluginRepository>
			</pluginRepositories>
		</profile>
	</profiles>
	<activeProfiles>
		<activeProfile>JPP</activeProfile>
	</activeProfiles>
</settings>


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qdox/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	24 Oct 2008 19:44:10 -0000	1.3
+++ sources	18 Aug 2009 15:19:04 -0000	1.4
@@ -1 +1 @@
-21aec355b29e6ba2743ed90db643dbfc  qdox-1.6.1-src.tar.gz
+1d61cb18731aa74a60d9dd04029b9884  qdox-1.9.2-src.tar.gz


Index: qdox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qdox/devel/qdox.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- qdox.spec	27 Jul 2009 02:16:49 -0000	1.7
+++ qdox.spec	18 Aug 2009 15:19:04 -0000	1.8
@@ -1,4 +1,4 @@
-# Copyright (c) 2000-2008, JPackage Project
+# Copyright (c) 2000-2009, JPackage Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -28,140 +28,132 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define with()          %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
-%define without()       %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
-%define bcond_with()    %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
-%define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
+# If you don't want to build with maven, and use straight ant instead,
+# give rpmbuild option '--without maven'
 
-%bcond_with maven
-
-%define _with_gcj_support 1
-%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+%define with_maven 0
+%define without_maven 1
 
 %define section free
 
+Summary:        Extract class/interface/method definitions from sources
 Name:           qdox
-Version:        1.6.1
-Release:        7.2%{?dist}
+Version:        1.9.2
+Release:        1%{?dist}
 Epoch:          0
-Summary:        Extract class/interface/method definitions from sources
 License:        ASL 2.0
 URL:            http://qdox.codehaus.org/
-Group:          Development/Libraries/Java
-# svn co https://svn.codehaus.org/qdox/tags/QDOX_1_6_1/qdox
-# tar czvf qdox-1.6.1-src.tar.gz qdox
-Source0:        qdox-1.6.1-src.tar.gz
-Source1:        pom-maven2jpp-depcat.xsl
-Source2:        pom-maven2jpp-newdepmap.xsl
-Source3:        pom-maven2jpp-mapdeps.xsl
-Source4:        qdox-1.6-jpp-depmap.xml
-Source5:        qdox-LocatedDef.java
-Source6:        qdox-build.xml
-Patch0:         qdox-1.6.1-byaccj.patch
-Patch1:         qdox-1.6.1-jflex.patch
-Patch2:         qdox-1.6.1-test.patch
-BuildRequires:  jpackage-utils >= 0:1.6
-%if %with maven
-BuildRequires:  maven >= 0:1.1
-BuildRequires:  maven-plugins-base
-BuildRequires:  maven-plugin-license
-BuildRequires:  maven-plugin-test
-BuildRequires:  maven-plugin-xdoc
-BuildRequires:  saxon
-BuildRequires:  saxon-scripts
-BuildRequires:  jmock >= 0:1.0
-BuildRequires:  mockobjects >= 0:0.09
-%endif
+Group:          Development/Libraries
+Source0:        %{name}-%{version}-src.tar.gz
+# svn export http://svn.codehaus.org/qdox/tags/qdox-1.8/
+
+Source1:        build.xml.tar.gz
+Source2:        qdox-settings.xml
+Source3:        qdox-1.8-jpp-depmap.xml
+
+BuildRequires:  jpackage-utils >= 0:1.7.4
+BuildRequires:  java-devel = 0:1.5.0
 BuildRequires:  ant >= 0:1.6
 BuildRequires:  ant-junit >= 0:1.6
 BuildRequires:  junit >= 0:3.8.1
 BuildRequires:  byaccj
-BuildRequires:  java_cup
 BuildRequires:  jflex
-%if ! %{gcj_support}
-BuildArch:      noarch
+%if %{with_maven}
+BuildRequires:  maven2 >= 2.0.7
+BuildRequires:  maven2-plugin-ant
+BuildRequires:  maven2-plugin-antrun
+BuildRequires:  maven2-plugin-compiler
+BuildRequires:  maven2-plugin-dependency
+BuildRequires:  maven2-plugin-install
+BuildRequires:  maven2-plugin-jar
+BuildRequires:  maven2-plugin-javadoc
+BuildRequires:  maven2-plugin-release
+BuildRequires:  maven2-plugin-resources
+BuildRequires:  maven2-plugin-surefire
+BuildRequires:  jmock >= 0:1.0
 %endif
+
+Requires:          java >= 0:1.5.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
 
-%if %{gcj_support}
-BuildRequires:  java-gcj-compat-devel
-%endif
 
 %description
-QDox is a high speed, small footprint parser 
-for extracting class/interface/method definitions 
-from source files complete with JavaDoc @tags. 
-It is designed to be used by active code 
-generators or documentation tools. 
+QDox is a high speed, small footprint parser
+for extracting class/interface/method definitions
+from source files complete with JavaDoc @tags.
+It is designed to be used by active code
+generators or documentation tools.
 
 %package javadoc
 Summary:        Javadoc for %{name}
-Group:          Development/Documentation
+Group:          Documentation
 
 %description javadoc
 %{summary}.
 
+%if %{with_maven}
+%package manual
+Summary:        Documents for %{name}
+Group:          Documentation
+
+%description manual
+%{summary}.
+%endif
+
 %prep
 %setup -q -n %{name}
-chmod -Rf a+rX,u+w,g-w,o-w bootstrap
-rm -r bootstrap
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-cp -p %{SOURCE5} src/java/com/thoughtworks/qdox/parser/structs/LocatedDef.java 
-sed -e "s/@VERSION@/%{version}/g" %{SOURCE6} > build.xml
-
-rm src/test/com/thoughtworks/qdox/directorywalker/DirectoryScannerTest.java \
-  src/test/com/thoughtworks/qdox/parser/MockBuilder.java \
-  src/test/com/thoughtworks/qdox/parser/MockLexer.java \
-  src/test/com/thoughtworks/qdox/JavaDocBuilderTest.java \
-  src/test/com/thoughtworks/qdox/parser/ParserTest.java
+for j in $(find . -name "*.jar"); do
+    mv $j $j.no
+done
+rm bootstrap/yacc.linux
+ln -s /usr/bin/byaccj bootstrap/yacc.linux
+ln -s $(build-classpath jflex) bootstrap
+#ln -s $(build-classpath java-cup) bootstrap
+mkdir -p .m2/repository/JPP/maven2/default_poms
+tar xzf %{SOURCE1}
+
+cp %{SOURCE2} settings.xml
+sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
+sed -i -e "s|<url>__JAVADIR_PLACEHOLDER__</url>|<url>file://`pwd`/external_repo</url>|g" settings.xml
+sed -i -e "s|<url>__MAVENREPO_DIR_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
 
 %build
-%if %with maven
-export DEPCAT=$(pwd)/qdox-1.6-depcat.new.xml
-echo '<?xml version="1.0" standalone="yes"?>' > $DEPCAT
-echo '<depset>' >> $DEPCAT
-for p in $(find . -name project.xml); do
-    pushd $(dirname $p)
-    %{_bindir}/saxon project.xml %{SOURCE1} >> $DEPCAT
-    popd
-done
-echo >> $DEPCAT
-echo '</depset>' >> $DEPCAT
-%{_bindir}/saxon $DEPCAT %{SOURCE2} > qdox-1.6-depmap.new.xml
-for p in $(find . -name project.xml); do
-    pushd $(dirname $p)
-    cp project.xml project.xml.orig
-    %{_bindir}/saxon -o project.xml project.xml.orig %{SOURCE3} map=%{SOURCE4}
-    popd
-done
+%if %{with_maven}
+mkdir external_repo
+ln -s %{_javadir} external_repo/JPP
+
+export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
+mkdir -p $MAVEN_REPO_LOCAL
+
+mvn-jpp \
+        -e \
+        -s settings.xml \
+        -Dmaven2.jpp.depmap.file=%{SOURCE3} \
+        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+        ant:ant install javadoc:javadoc
 
-export MAVEN_HOME_LOCAL=$(pwd)/.maven
-export CLASSPATH=$(build-classpath junit)
-maven \
-        -Dmaven.repo.remote=file:/usr/share/maven-1.0/repository \
-        -Dmaven.home.local=$MAVEN_HOME_LOCAL \
-        -Dqdox.byaccj.executable=byaccj \
-        jar javadoc
 %else
-export OPT_JAR_LIST="junit ant/ant-junit"
-mkdir -p target/src/java/com/thoughtworks/qdox/parser/impl
-export CLASSPATH=`pwd`/target/classes:`pwd`/target/test-classes:$(build-classpath java_cup jflex junit)
-%{java} JFlex.Main \
+mkdir -p src/java/com/thoughtworks/qdox/parser/impl
+export CLASSPATH=$(build-classpath jmock jflex):target/classes:target/test-classes
+java JFlex.Main \
     -d src/java/com/thoughtworks/qdox/parser/impl \
     src/grammar/lexer.flex
-pushd target
-%{_bindir}/byaccj \
+pushd src
+byaccj \
     -Jnorun \
     -Jnoconstruct \
     -Jclass=Parser \
     -Jsemantic=Value \
     -Jpackage=com.thoughtworks.qdox.parser.impl \
-    ../src/grammar/parser.y
+    grammar/parser.y
 popd
-mv target/Parser.java src/java/com/thoughtworks/qdox/parser/impl
-ant -Dbuild.sysclasspath=only jar javadoc
+mv src/Parser.java src/java/com/thoughtworks/qdox/parser/impl
+#TODO reenable test when jmock is imported
+ant -Dbuild.sysclasspath=only -Dmaven.test.skip=true -Dmaven.mode.offline=true jar javadoc
 %endif
 
 %install
@@ -173,115 +165,95 @@ cp -p target/%{name}-%{version}.jar \
       $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
 (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
 
+%add_to_maven_depmap %{name} %{name} %{version} JPP %{name}
+%add_to_maven_depmap  com.thoughtworks.qdox qdox %{version} JPP %{name}
+
+
+# poms
+install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+install -m 644 pom.xml \
+    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
+
 # javadoc
 mkdir -p $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}
 
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
+# 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
 
-%if %{gcj_support}
 %post
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
+%update_maven_depmap
 
 %postun
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
+%update_maven_depmap
 
 %files
 %defattr(0644,root,root,0755)
-%doc LICENSE.txt
+%doc %{_docdir}/%{name}-%{version}/LICENSE.txt
 %{_javadir}/%{name}.jar
 %{_javadir}/%{name}-%{version}.jar
-%if %{gcj_support}
-%dir %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
-%endif
+%{_datadir}/maven2/poms/*
+%{_mavendepmapfragdir}/*
 
 %files javadoc
 %defattr(0644,root,root,0755)
-%{_javadocdir}/%{name}-%{version}
-%{_javadocdir}/%{name}
+%doc %{_javadocdir}/%{name}-%{version}
+%doc %{_javadocdir}/%{name}
 
-%changelog
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.6.1-7.2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+%if %{with_maven}
+%files manual
+%defattr(0644,root,root,0755)
+%doc %{_docdir}/%{name}-%{version}/site
+%endif
 
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.6.1-6.2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+%changelog
+* Tue Aug 18 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.9.2-1
+- Update to 1.9.2.
 
-* Fri Oct 24 2008 David Walluck <dwalluck at redhat.com> 0:1.6.1-5.2
-- Fedora-specific: enable GCJ support
+* Fri Apr 03 2009 Ralph Apel <r.apel at r-apel.de> 0:1.8-1.jpp5
+- 1.8 as qdox18 because of qdox frozen at 1.6.1 in JPP-5
 
-* Fri Oct 24 2008 David Walluck <dwalluck at redhat.com> 0:1.6.1-5.1
-- Fedora-specific: remove repolib
-- Fedora-specific: use java_cup not java-cup
-- Fedora-specific: don't use jmock
-
-* Tue Jul 29 2008 David Walluck <dwalluck at redhat.com> 0:1.6.1-5
-- remove bootstrap binaries
-- patch build for newer jflex
-- patch build to disable failing tests on JDK6
-- BuildRequires: jmock
-- fix version in ant build.xml
-- fix location of byaccj and jflex output files
-- fix apidoc location
-- correctly set CLASSPATH and OPT_JAR_LIST
-
-* Mon Jul 28 2008 David Walluck <dwalluck at redhat.com> 0:1.6.1-4
-- fix jflex part of build
-- GCJ fixes
-- fix javadoc Requires
-
-* Sat Jul 26 2008 David Walluck <dwalluck at redhat.com> 0:1.6.1-3
-- build without maven
-- fix repolib permissions
-
-* Thu May 29 2008 David Walluck <dwalluck at redhat.com> 0:1.6.1-2.jpp5
-- remove spurious gnu-crypto dependency
-- fix empty scriptlets
-- fix License
-- use %%{_bindir}
-
-* Fri Apr 18 2008 David Walluck <dwalluck at redhat.com> 0:1.6.1-1jpp.ep1.5
-- patch for byaccj
-- place junit on CLASSPATH
-- remove javadoc scriptlets
+* Tue Jul 01 2008 Ralph Apel <r.apel at r-apel.de> 0:1.6.3-5.jpp5
+- Restore to devel
+- Drop mockobjects BR
+
+* Fri Jun 13 2008 Ralph Apel <r.apel at r-apel.de> 0:1.6.3-4.jpp5
+- Add com.thoughtworks.qdox groupId to depmap frag
+
+* Tue Feb 26 2008 Ralph Apel <r.apel at r-apel.de> 0:1.6.3-3jpp
+- Add settings file
+- Fix pom marking jmock dependency as of scope test
+- Fix -jpp-depmap.xml for asm2-parent
+
+* Mon Nov 26 2007 Ralph Apel <r.apel at r-apel.de> 0:1.6.3-2jpp
+- Fix maven macro value
+
+* Thu Nov 22 2007 Ralph Apel <r.apel at r-apel.de> 0:1.6.3-1jpp
+- Upgrade to 1.6.3
+
+* Wed May 30 2007 Ralph Apel <r.apel at r-apel.de> 0:1.6.2-1jpp
+- Upgrade to 1.6.2
+- Activate tests while building with ant
+- Make Vendor, Distribution based on macro
+- Install depmap frags, poms
 
 * Thu Mar 22 2007 Vivek Lakshmanan <vivekl at redhat.com> 0:1.6.1-1jpp.ep1.4
 - Rebuild with fixed component-info.xml
 
-* Thu Mar 22 2007 Vivek Lakshmanan <vivekl at redhat.com> 0:1.6.1-1jpp.ep1.3
-- Add repository.jboss.com as a prefix for repodir
-
-* Thu Mar 22 2007 Fernando Nasser <fnasser at redhat.com> 0:1.6.1-1jpp.ep1.2
-- Add repolib subpackage
-
-* Thu Mar 22 2007 Fernando Nasser <fnasser at redhat.com> 0:1.6.1-1jpp.ep1.1
-- Merge with upstream for upgrade
-
-* Fri Mar 16 2007 Fernando Nasser <fnasser at redhat.com> 0:1.6.1-1jpp
-- Upgrade to 1.6.1
-
 * Fri Feb 23 2007 Ralph Apel <r.apel at r-apel.de> 0:1.5-3jpp
 - Add option to build without maven
 - Omit tests when building without maven
 - Add gcj_support option
 
-* Tue Feb 21 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.5-2jpp_1rh
-- First Red Hat build
-
 * Mon Feb 20 2006 Ralph Apel <r.apel at r-apel.de> - 0:1.5-2jpp
 - Rebuild for JPP-1.7, adapting to maven-1.1
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qdox/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	24 Oct 2008 19:44:10 -0000	1.3
+++ .cvsignore	18 Aug 2009 15:19:05 -0000	1.4
@@ -1 +1,2 @@
 qdox-1.6.1-src.tar.gz
+qdox-1.9.2-src.tar.gz

More information about the fedora-extras-commits mailing list