[felix-scr-annotations/f20] use manual installation on F20
by gil
commit ba71bf972e4757e1812f8213a13475a4479a5984
Author: gil <puntogil(a)libero.it>
Date: Wed Nov 6 22:24:12 2013 +0100
use manual installation on F20
felix-scr-annotations.spec | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/felix-scr-annotations.spec b/felix-scr-annotations.spec
index 9ce0124..ad19104 100644
--- a/felix-scr-annotations.spec
+++ b/felix-scr-annotations.spec
@@ -52,7 +52,7 @@ install -m 644 target/%{bundle}-%{version}.jar \
%{buildroot}%{_javadir}/%{project}/%{bundle}.jar
mkdir -p %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{project}-%{name}.pom
+install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{project}-%{bundle}.pom
%add_maven_depmap JPP.%{project}-%{bundle}.pom %{project}/%{bundle}.jar
mkdir -p %{buildroot}%{_javadocdir}/%{name}
10 years, 6 months
[thredds/f20] use manual installation on F20
by gil
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
10 years, 6 months
[felix-scr-annotations/f20] use manual installation on F20
by gil
commit 7ee18be26d2ecdb2ffdd627557dd9a7f76a295f3
Author: gil <puntogil(a)libero.it>
Date: Wed Nov 6 22:02:26 2013 +0100
use manual installation on F20
felix-scr-annotations.spec | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/felix-scr-annotations.spec b/felix-scr-annotations.spec
index 82184e4..9ce0124 100644
--- a/felix-scr-annotations.spec
+++ b/felix-scr-annotations.spec
@@ -64,7 +64,7 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
%else
%files
%{_javadir}/%{project}/%{bundle}.jar
-%{_mavenpomdir}/JPP.%{project}-%{name}.pom
+%{_mavenpomdir}/JPP.%{project}-%{bundle}.pom
%{_mavendepmapfragdir}/%{name}
%endif
%doc LICENSE NOTICE changelog.txt
10 years, 6 months
[felix-scr-annotations/f20] use manual installation on F20
by gil
commit a76e596a635a1ec98d6ed74de98019249adbe405
Author: gil <puntogil(a)libero.it>
Date: Wed Nov 6 22:01:21 2013 +0100
use manual installation on F20
felix-scr-annotations.spec | 35 +++++++++++++++++++++++++++++++++--
1 files changed, 33 insertions(+), 2 deletions(-)
---
diff --git a/felix-scr-annotations.spec b/felix-scr-annotations.spec
index 2c3aad3..82184e4 100644
--- a/felix-scr-annotations.spec
+++ b/felix-scr-annotations.spec
@@ -2,7 +2,7 @@
%global bundle org.apache.felix.scr.annotations
Name: felix-scr-annotations
Version: 1.9.6
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Annotations for SCR
License: ASL 2.0
URL: http://felix.apache.org/
@@ -18,7 +18,9 @@ BuildRequires: maven-surefire-plugin
# i dont know which package as missing this required...
BuildRequires: mvn(org.mockito:mockito-all)
-#Requires: mvn(org.apache.felix:org.apache.felix.scr.generator)
+%if %{?fedora} != 20
+Requires: mvn(org.apache.felix:org.apache.felix.scr.generator)
+%endif
BuildArch: noarch
@@ -41,15 +43,44 @@ This package contains javadoc for %{name}.
%mvn_build -- -Dproject.build.sourceEncoding=UTF-8
%install
+%if %{?fedora} != 20
%mvn_install
+%else
+mkdir -p %{buildroot}%{_javadir}/%{project}
+install -m 644 target/%{bundle}-%{version}.jar \
+ %{buildroot}%{_javadir}/%{project}/%{bundle}.jar
+
+mkdir -p %{buildroot}%{_mavenpomdir}
+install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{project}-%{name}.pom
+%add_maven_depmap JPP.%{project}-%{bundle}.pom %{project}/%{bundle}.jar
+
+mkdir -p %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
+%endif
+
+%if %{?fedora} != 20
%files -f .mfiles
+%else
+%files
+%{_javadir}/%{project}/%{bundle}.jar
+%{_mavenpomdir}/JPP.%{project}-%{name}.pom
+%{_mavendepmapfragdir}/%{name}
+%endif
%doc LICENSE NOTICE changelog.txt
+%if %{?fedora} != 20
%files javadoc -f .mfiles-javadoc
+%else
+%files javadoc
+%{_javadocdir}/%{name}
+%endif
%doc LICENSE NOTICE
%changelog
+* Wed Nov 06 2013 gil cattaneo <puntogil(a)libero.it> 1.9.6-3
+- use manual installation on F20
+
* Sat Oct 19 2013 gil cattaneo <puntogil(a)libero.it> 1.9.6-2
- add missing BR mockito
10 years, 6 months
[thredds/f20] cleanup spec file
by gil
commit 84ae8f0238c667c7ea6af888f18021a046bc3102
Author: gil <puntogil(a)libero.it>
Date: Wed Nov 6 20:48:09 2013 +0100
cleanup spec file
thredds.spec | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/thredds.spec b/thredds.spec
index f3b678d..3e7742d 100644
--- a/thredds.spec
+++ b/thredds.spec
@@ -168,7 +168,7 @@ sed -i 's/\r//' cdm/CHANGES.txt cdm/license.txt
%mvn_install
install -pm 644 cdm/target/netcdf-%{version}-tests.jar %{buildroot}%{_javadir}/%{name}/netcdf-tests.jar
-cdm/target/netcdf-4.3.19-tests.jar
+
%files -f .mfiles-%{name}-parent
%dir %{_javadir}/%{name}
%doc README.md cdm/license.txt
10 years, 6 months
[thredds/f20] fix BuildArch
by gil
commit 1b1131a74fd5c1684858a30cc6f2576863883c1c
Author: gil <puntogil(a)libero.it>
Date: Wed Nov 6 20:41:47 2013 +0100
fix BuildArch
thredds.spec | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/thredds.spec b/thredds.spec
index fec4a10..f3b678d 100644
--- a/thredds.spec
+++ b/thredds.spec
@@ -87,18 +87,21 @@ as well as to many other types of scientific data formats.
%if 0
%package -n bufr
Summary: BUFR IOSP
+BuildArch: noarch
%description -n bufr
Reading BUFR files with the NetCDF-java library.
%package -n grib
Summary: GRIB IOSP and Feature Collection
+BuildArch: noarch
%description -n grib
Decoder for the GRIB format.
%package -n tdm
Summary: THREDDS Data Manager (TDM)
+BuildArch: noarch
%description -n tdm
THREDDS Data Manager (TDM).
@@ -117,6 +120,7 @@ another, raising a unit to a power).
%package javadoc
Summary: Javadoc for %{name}
+BuildArch: noarch
%description javadoc
This package contains javadoc for %{name}.
10 years, 6 months
[thredds/f20] fix BuildArch
by gil
commit ff4a2a973e86db23b4f7014cd332b60fa69ea003
Author: gil <puntogil(a)libero.it>
Date: Wed Nov 6 20:40:38 2013 +0100
fix BuildArch
thredds.spec | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/thredds.spec b/thredds.spec
index 2232226..fec4a10 100644
--- a/thredds.spec
+++ b/thredds.spec
@@ -78,6 +78,7 @@ in a similarly convenient fashion.
%package -n netcdf-java
Summary: Java interface to NetCDF files
+BuildArch: noarch
%description -n netcdf-java
The NetCDF-Java Library is a Java interface to NetCDF files,
@@ -105,6 +106,7 @@ THREDDS Data Manager (TDM).
%package -n java-udunits
Summary: Java package for decoding and encoding unit specifications
+BuildArch: noarch
%description -n java-udunits
The ucar.units Java package is for decoding and encoding
@@ -162,7 +164,7 @@ sed -i 's/\r//' cdm/CHANGES.txt cdm/license.txt
%mvn_install
install -pm 644 cdm/target/netcdf-%{version}-tests.jar %{buildroot}%{_javadir}/%{name}/netcdf-tests.jar
-
+cdm/target/netcdf-4.3.19-tests.jar
%files -f .mfiles-%{name}-parent
%dir %{_javadir}/%{name}
%doc README.md cdm/license.txt
10 years, 6 months