rpms/qdox/devel qdox.spec,1.12,1.13

[Alexander Kurtakov]

Author: akurtakov

Update of /cvs/pkgs/rpms/qdox/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv11135/devel

Modified Files:
	qdox.spec 
Log Message:
- Symlink byaccj to both yacc.linux and yacc.linux.x86_64 to keep it building as noarch.


Index: qdox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qdox/devel/qdox.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- qdox.spec	15 Mar 2010 16:14:40 -0000	1.12
+++ qdox.spec	7 Jun 2010 10:48:11 -0000	1.13
@@ -31,21 +31,18 @@
 # If you don't want to build with maven, and use straight ant instead,
 # give rpmbuild option '--without maven'
 
-%define with_maven 1
-
-%define section free
+%global with_maven 1
 
 Summary:        Extract class/interface/method definitions from sources
 Name:           qdox
 Version:        1.11
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          0
 License:        ASL 2.0
 URL:            http://qdox.codehaus.org/
 Group:          Development/Libraries
 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
 
 BuildRequires:  jpackage-utils >= 0:1.7.4
@@ -96,6 +93,7 @@ generators or documentation tools.
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Documentation
+Requires:       jpackage-utils
 
 %description javadoc
 API docs for %{name}.
@@ -109,21 +107,14 @@ for j in $(find . -name "*.jar"); do
 done
 rm bootstrap/yacc.linux
 ln -s /usr/bin/byaccj bootstrap/yacc.linux
+ln -s /usr/bin/byaccj bootstrap/yacc.linux.x86_64
 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}
-mkdir external_repo
-ln -s %{_javadir} external_repo/JPP
-
 export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
 mkdir -p $MAVEN_REPO_LOCAL
 
@@ -200,6 +191,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Mon Jun 7 2010 Alexander Kurtakov <akurtako at redhat.com> 0:1.11-2
+- Symlink byaccj to both yacc.linux and yacc.linux.x86_64 to keep it building as noarch.
+
 * Mon Mar 15 2010 Alexander Kurtakov <akurtako at redhat.com> 0:1.11-1
 - Update to 1.11.