commit f886a13de30fc4d8f03103e6fc8e390f454347df
Author: gil <puntogil(a)libero.it>
Date: Wed Nov 6 22:11:43 2013 +0100
use manual installation on F20
thredds.spec | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 69 insertions(+), 1 deletions(-)
---
diff --git a/thredds.spec b/thredds.spec
index 3e7742d..f9be7af 100644
--- a/thredds.spec
+++ b/thredds.spec
@@ -1,6 +1,6 @@
Name: thredds
Version: 4.3.19
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Thematic Realtime Environmental Distributed Data Services (TDS)
# GPLv3: opendap/src/main/java/opendap/dap/parsers/DapParser.java
# LGPLv3: opendap/src/main/java/opendap/servlet/AsciiWriter.java
@@ -79,6 +79,23 @@ in a similarly convenient fashion.
%package -n netcdf-java
Summary: Java interface to NetCDF files
BuildArch: noarch
+%if %{?fedora} != 20
+Requires: mvn(com.google.protobuf:protobuf-java)
+Requires: mvn(com.sleepycat:je)
+Requires: mvn(joda-time:joda-time) >= 2.0
+Requires: mvn(log4j:log4j)
+Requires: mvn(net.java.dev.jna:jna)
+Requires: mvn(net.jcip:jcip-annotations)
+Requires: mvn(net.sf.ehcache:ehcache-core)
+Requires: mvn(org.apache.httpcomponents:httpclient)
+Requires: mvn(org.apache.httpcomponents:httpcore)
+Requires: mvn(org.apache.httpcomponents:httpmime)
+Requires: mvn(org.jdom:jdom2)
+Requires: mvn(org.quartz-scheduler:quartz)
+Requires: mvn(org.slf4j:jcl-over-slf4j)
+Requires: mvn(org.slf4j:slf4j-api)
+Requires: mvn(org.slf4j:slf4j-log4j12)
+%endif
%description -n netcdf-java
The NetCDF-Java Library is a Java interface to NetCDF files,
@@ -165,15 +182,51 @@ sed -i 's/\r//' cdm/CHANGES.txt cdm/license.txt
%mvn_build -s
%install
+%if %{?fedora} != 20
%mvn_install
+%else
+
+mkdir -p %{buildroot}%{_javadir}/%{name}
+install -m 644 cdm/target/netcdf-%{version}.jar \
+ %{buildroot}%{_javadir}/%{name}/netcdf.jar
+
+install -m 644 udunits/target/udunits-%{version}.jar \
+ %{buildroot}%{_javadir}/%{name}/udunits.jar
+
+mkdir -p %{buildroot}%{_mavenpomdir}
+install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}-parent.pom
+%add_maven_depmap JPP.%{name}-%{name}-parent.pom -f parent
+
+install -pm 644 cdm/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-netcdf.pom
+%add_maven_depmap JPP.%{name}-netcdf.pom %{name}/netcdf.jar -f netcdf
+
+install -pm 644 udunits/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-udunits.pom
+%add_maven_depmap JPP.%{name}-udunits.pom %{name}/udunits.jar -f udunits
+
+mkdir -p %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
+%endif
install -pm 644 cdm/target/netcdf-%{version}-tests.jar
%{buildroot}%{_javadir}/%{name}/netcdf-tests.jar
+%if %{?fedora} != 20
%files -f .mfiles-%{name}-parent
+%else
+%files
+%{_mavenpomdir}/JPP.%{name}-%{name}-parent.pom
+%{_mavendepmapfragdir}/%{name}-parent
+%endif
%dir %{_javadir}/%{name}
%doc README.md cdm/license.txt
+%if %{?fedora} != 20
%files -n netcdf-java -f .mfiles-netcdf
+%else
+%files -n netcdf-java
+%{_javadir}/%{name}/netcdf.jar
+%{_mavenpomdir}/JPP.%{name}-netcdf.pom
+%{_mavendepmapfragdir}/%{name}-netcdf
+%endif
%{_javadir}/%{name}/netcdf-tests.jar
%doc cdm/CHANGES.txt cdm/license.txt
@@ -188,13 +241,28 @@ install -pm 644 cdm/target/netcdf-%{version}-tests.jar
%{buildroot}%{_javadir}/%
%doc cdm/license.txt
%endif
+%if %{?fedora} != 20
%files -n java-udunits -f .mfiles-udunits
+%else
+%files -n java-udunits
+%{_javadir}/%{name}/udunits.jar
+%{_mavenpomdir}/JPP.%{name}-udunits.pom
+%{_mavendepmapfragdir}/%{name}-udunits
+%endif
%doc cdm/license.txt
+%if %{?fedora} != 20
%files javadoc -f .mfiles-javadoc
+%else
+%files javadoc
+%{_javadocdir}/%{name}
+%endif
%doc cdm/license.txt
%changelog
+* Wed Nov 06 2013 gil cattaneo <puntogil(a)libero.it> 4.3.19-5
+- use manual installation on F20
+
* Wed Oct 23 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 4.3.19-4
- Rebuild to regenerate broken POMs
- Related: rhbz#1021484
Show replies by date