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