[smack/f20] revert install section
gil
gil at fedoraproject.org
Thu Aug 21 11:57:39 UTC 2014
commit f59fd6fcdcf3417fda6c489b2a0c2128d1f9cf7b
Author: gil <puntogil at libero.it>
Date: Thu Aug 21 13:57:26 2014 +0200
revert install section
smack.spec | 36 +++++++++++++++++++++++++++---------
1 files changed, 27 insertions(+), 9 deletions(-)
---
diff --git a/smack.spec b/smack.spec
index 269b26e..ee83073 100644
--- a/smack.spec
+++ b/smack.spec
@@ -49,8 +49,12 @@ BuildRequires: junit
BuildRequires: jzlib
BuildRequires: xmlunit
BuildRequires: xpp3
-BuildRequires: mvn(org.sonatype.oss:oss-parent)
+Requires: jzlib
+Requires: xpp3
+
+Requires: java
+Requires: jpackage-utils
BuildArch: noarch
%description
@@ -107,17 +111,31 @@ rm -r test/org/jivesoftware/smack/ChatTest.java \
%ant -f build/build.xml jar javadoc test
%install
-%mvn_artifact %{SOURCE1} target/%{name}.jar
-%mvn_artifact %{SOURCE2} target/%{name}x.jar
-%mvn_artifact %{SOURCE3} target/%{name}x-debug.jar
-%mvn_alias : jivesoftware:
-%mvn_install -J target/javadoc
-
-%files -f .mfiles
+mkdir -p %{buildroot}%{_javadir}/%{name}
+install -pm 644 target/%{name}.jar %{buildroot}%{_javadir}/%{name}/
+install -pm 644 target/%{name}x.jar %{buildroot}%{_javadir}/%{name}/
+install -pm 644 target/%{name}x-debug.jar %{buildroot}%{_javadir}/%{name}/
+
+mkdir -p %{buildroot}%{_mavenpomdir}
+install -pm 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}.pom
+%add_maven_depmap JPP.%{name}-%{name}.pom %{name}/%{name}.jar -a "jivesoftware:%{name}"
+install -pm 644 %{SOURCE2} %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}x.pom
+%add_maven_depmap JPP.%{name}-%{name}x.pom %{name}/%{name}x.jar -a "jivesoftware:%{name}x"
+install -pm 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}x-debug.pom
+%add_maven_depmap JPP.%{name}-%{name}x-debug.pom %{name}/%{name}x-debug.jar -a "jivesoftware:%{name}x-debug"
+
+mkdir -p %{buildroot}%{_javadocdir}/%{name}
+cp -rp target/javadoc/* %{buildroot}%{_javadocdir}/%{name}
+
+%files
%dir %{_javadir}/%{name}
+%{_javadir}/%{name}/%{name}*.jar
+%{_mavenpomdir}/JPP.%{name}-%{name}*.pom
+%{_mavendepmapfragdir}/%{name}
%doc README.html changelog.html
-%files javadoc -f .mfiles-javadoc
+%files javadoc
+%{_javadocdir}/%{name}
%doc README.html
%changelog
More information about the scm-commits
mailing list