commit 4e1ab494a09ffc27437b85dd34348ce8f4af8cd4
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Tue Aug 16 09:29:44 2011 +0200
Remvoe ant build support
fix few rpmlint problems
plexus-xmlrpc-1.0-build.xml | 121 -------------------------------------------
plexus-xmlrpc.spec | 52 +++++-------------
2 files changed, 15 insertions(+), 158 deletions(-)
---
diff --git a/plexus-xmlrpc.spec b/plexus-xmlrpc.spec
index 2bcdc55..3eacb25 100644
--- a/plexus-xmlrpc.spec
+++ b/plexus-xmlrpc.spec
@@ -28,11 +28,6 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-# If you don't want to build with maven, and use straight ant instead,
-# give rpmbuild option '--without maven'
-%global with_maven %{!?_without_maven:1}%{?_without_maven:0}
-%global without_maven %{?_without_maven:1}%{!?_without_maven:0}
-
%global parent plexus
%global subname xmlrpc
@@ -42,12 +37,11 @@ Release: 0.6.b4.3%{?dist}
Epoch: 0
Summary: Plexus XML RPC Component
License: ASL 1.1 and MIT
-Group: Development/Java
+Group: Development/Libraries
URL:
http://plexus.codehaus.org/
# svn export
svn://svn.plexus.codehaus.org/plexus/tags/plexus-xmlrpc-1.0-beta-4/
# tar czf plexus-xmlrpc-1.0-beta-4-src.tar.gz plexus-xmlrpc-1.0-beta-4/
Source0: plexus-xmlrpc-1.0-beta-4-src.tar.gz
-Source1: %{name}-1.0-build.xml
Patch0: %{name}-add-codec-dep.patch
@@ -56,7 +50,6 @@ BuildArch: noarch
BuildRequires: jpackage-utils >= 0:1.7.2
BuildRequires: ant >= 0:1.6
BuildRequires: ant-nodeps
-%if %{with_maven}
BuildRequires: maven
BuildRequires: maven-compiler-plugin
BuildRequires: maven-install-plugin
@@ -67,7 +60,6 @@ BuildRequires: maven-surefire-maven-plugin
BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-doxia
BuildRequires: maven-doxia-sitetools
-%endif
BuildRequires: classworlds >= 0:1.1
BuildRequires: apache-commons-codec
BuildRequires: plexus-container-default
@@ -91,7 +83,7 @@ is like a J2EE application server, without all the baggage.
%package javadoc
Summary: Javadoc for %{name}
-Group: Development/Documentation
+Group: Documentation
Requires: jpackage-utils
%description javadoc
@@ -100,30 +92,11 @@ Javadoc for %{name}.
%prep
%setup -q -n plexus-xmlrpc-1.0-beta-4
-cp %{SOURCE1} build.xml
%patch0 -b .sav
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL
-
-%if %{with_maven}
- mvn-rpmbuild \
- -e \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- install javadoc:aggregate
-%else
-mkdir -p target/lib
-build-jar-repository -s -p target/lib \
-classworlds \
-commons-codec \
-plexus/container-default \
-plexus/utils \
-xmlrpc \
-
-ant jar javadoc
-%endif
+mvn-rpmbuild -e install javadoc:aggregate
%install
# jars
@@ -136,19 +109,24 @@ install -Dpm 644 pom.xml
%{buildroot}/%{_mavenpomdir}/JPP.%{name}.pom
%add_maven_depmap JPP.%{name}.pom %{parent}/%{subname}.jar
# javadoc
-install -d -m 755 %{buildroot}/%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/apidocs/* %{buildroot}/%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} %{buildroot}/%{_javadocdir}/%{name}
+install -d -m 755 %{buildroot}/%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* %{buildroot}/%{_javadocdir}/%{name}
+
+%pre javadoc
+# workaround for rpm bug, can be removed in F-18
+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
+
%files
-%{_javadir}/*
-%{_mavenpomdir}/*
%doc LICENSE.txt
-%{_mavendepmapfragdir}/plexus-xmlrpc
+%{_javadir}/%{parent}
+%{_mavenpomdir}/JPP.%{name}.pom
+%{_mavendepmapfragdir}/%{name}
%files javadoc
-%doc %{_javadocdir}/*
+%doc %{_javadocdir}/%{name}
%changelog
* Thu Jul 28 2011 Jaromir Capik <jcapik(a)redhat.com> - 0:1.0-0.6.b4.3