[opencsv] fix build
Patrick Huang
pahuang at fedoraproject.org
Fri Mar 1 07:26:17 UTC 2013
commit 5729c8e8a4df639a6fa4c242234f8937ebea6af2
Author: Patrick Huang <pahuang at redhat.com>
Date: Fri Mar 1 02:25:50 2013 -0500
fix build
opencsv.spec | 18 +++---------------
1 files changed, 3 insertions(+), 15 deletions(-)
---
diff --git a/opencsv.spec b/opencsv.spec
index 80a8508..0d6d1d9 100644
--- a/opencsv.spec
+++ b/opencsv.spec
@@ -47,21 +47,16 @@ This package contains the API documentation for %{name}.
### making sure we dont use it
rm -rf lib/* doc deploy
-for j in $(find -name \*.jar); do
- if [ ! -L $j ] ; then
- rm $j
- fi
-done
%{__sed} -i 's/\r//' examples/MockResultSet.java
%{__sed} -i 's/\r//' examples/JdbcExample.java
%{__sed} -i 's/\r//' examples/addresses.csv
%{__sed} -i 's/\r//' examples/AddressExample.java
-%globle mvn_opts -Dgpg.skip=true -Dproject.build.sourceEncoding=UTF-8
-
%build
-mvn-rpmbuild package javadoc:aggregate %mvn_opts
+# skip test because it is not jdk 1.6 compatible
+%global mvn_opts -Dgpg.skip=true -Dproject.build.sourceEncoding=UTF-8 -Dmaven.test.skip=true
+mvn-rpmbuild package javadoc:aggregate %mvn_opts
%install
@@ -80,18 +75,11 @@ install -pm 644 pom.xml \
%clean
rm -rf $RPM_BUILD_ROOT
-%check
-mvn-rpmbuild verify %mvn_opts
-
%files -f .mfiles
%doc examples
-%{_javadir}/%{name}-%{version}.jar
%files javadoc
-%defattr(-,root,root,-)
-%dir %{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
-%{_javadocdir}/%{name}-%{version}/*
%changelog
More information about the scm-commits
mailing list