[jsr-305] Fix pom filename (Resolves rhbz#655811)
Stanislav Ochotnicky
sochotni at fedoraproject.org
Fri Nov 26 15:49:45 UTC 2010
commit 151b0728953d4860022cb68f944ade13533edff2
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date: Fri Nov 26 16:41:47 2010 +0100
Fix pom filename (Resolves rhbz#655811)
Also:
- Use new maven plugin names
- Remove gcj support
- Few tweaks according to new guidelines
- Make jars and javadocs versionless
jsr-305.spec | 79 ++++++++++++++++++++++-----------------------------------
1 files changed, 31 insertions(+), 48 deletions(-)
---
diff --git a/jsr-305.spec b/jsr-305.spec
index adf14a0..620172e 100644
--- a/jsr-305.spec
+++ b/jsr-305.spec
@@ -1,11 +1,9 @@
-%define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
-
Name: jsr-305
Version: 0
-Release: 0.4.20090319svn%{?dist}
+Release: 0.5.20090319svn%{?dist}
Summary: Correctness annotations for Java code
-Group: Development/Libraries/Java
+Group: Development/Libraries
License: BSD
URL: http://jsr-305.googlecode.com/
# There has been no official release yet. This is a snapshot of the Subversion
@@ -15,29 +13,25 @@ URL: http://jsr-305.googlecode.com/
# tar -cvf jsr-305-0.4.20090319.tar jsr-305
# xz jsr-305-0.4.20090319.tar
Source0: jsr-305-0.4.20090319.tar.xz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# We need the OpenJDK javadoc because sinjdoc doesn't grok annotations.
BuildRequires: java-1.6.0-openjdk-devel
BuildRequires: jpackage-utils, maven2
-BuildRequires: maven2-plugin-compiler, maven2-plugin-install
-BuildRequires: maven2-plugin-jar, maven2-plugin-javadoc
-BuildRequires: maven2-plugin-resources, maven2-plugin-site
-BuildRequires: maven2-plugin-surefire, tomcat5
+BuildRequires: maven-compiler-plugin
+BuildRequires: maven-install-plugin
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-javadoc-plugin
+BuildRequires: maven-resources-plugin
+BuildRequires: maven-site-plugin
+BuildRequires: maven-surefire-plugin
+BuildRequires: tomcat5
Requires: java >= 1.5, jpackage-utils
-%if %{with_gcj}
-BuildRequires: java-gcj-compat-devel >= 1.0.31
-Requires(post): java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
-%else
BuildArch: noarch
-%endif
%package javadoc
Summary: Javadoc documentation for %{name}
-Group: Development/Documentation
-Requires: %{name} = %{version}-%{release}, jpackage-utils
+Group: Documentation
+Requires: jpackage-utils
%description
This package contains reference implementations, test cases, and other
@@ -49,6 +43,7 @@ This package contains the API documentation for %{name}.
%prep
%setup -q -n %{name}
+sed -i 's/\r//' sampleUses/pom.xml
%build
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
@@ -63,60 +58,48 @@ rm -rf $RPM_BUILD_ROOT
# JAR files
mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp -p ri/target/ri-0.1-SNAPSHOT.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+cp -p ri/target/ri-0.1-SNAPSHOT.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
# Javadocs
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-pushd ri/target/site/apidocs
-cp -rp . $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-popd
+mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -rp ri/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/
# pom
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/maven2/poms
-install -pm 644 ri/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.%{name}.pom
+mkdir -p $RPM_BUILD_ROOT%{_mavenpomdir}
+install -pm 644 ri/pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
%add_to_maven_depmap org.apache.maven %{name} %{version} JPP %{name}
-# Precompiled bits
-%if %{with_gcj}
-%{_bindir}/aot-compile-rpm
-%endif
-
-%clean
-rm -rf $RPM_BUILD_ROOT
%post
%update_maven_depmap
-%if %{with_gcj}
-if [ -x %{_bindir}/rebuild-gcj-db ]; then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
%postun
%update_maven_depmap
-%if %{with_gcj}
-if [ -x %{_bindir}/rebuild-gcj-db ]; then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
+
+%pre javadoc
+# workaround for rpm bug 646523 (can be removed in F-17)
+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%files
%defattr(-,root,root,-)
%doc ri/LICENSE sampleUses
-%{_datadir}/maven2/poms/JPP.jsr-305.pom
+%{_mavenpomdir}/JPP-jsr-305.pom
%{_javadir}/*
%{_mavendepmapfragdir}/jsr-305
-%if %{with_gcj}
-%{_libdir}/gcj/%{name}
-%endif
%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/*
%changelog
+* Fri Nov 26 2010 Stanislav Ochotnicky <sochotnicky at redhat.com> - 0-0.5.20090319svn
+- Fix pom filename (Resolves rhbz#655811)
+- Use new maven plugin names
+- Remove gcj support
+- Few tweaks according to new guidelines
+- Make jars and javadocs versionless
+
* Thu Jan 14 2010 Jerry James <loganjerry at gmail.com> - 0-0.4.20090319svn
- Update to 19 Mar 2009 snapshot
- Compress with xz instead of bzip2
More information about the scm-commits
mailing list