[smack] disable bosh and resolver-minidns modules

gil gil at fedoraproject.org
Fri Jan 2 11:59:06 UTC 2015


commit 72390fb53057ffa5d347f3dc31d464c05fbb97d8
Author: gil <puntogil at libero.it>
Date:   Fri Jan 2 12:59:06 2015 +0100

    disable bosh and resolver-minidns modules

 smack.spec |   36 +++++++++++++++++++++++++++---------
 1 files changed, 27 insertions(+), 9 deletions(-)
---
diff --git a/smack.spec b/smack.spec
index 51aa146..3bd4b3c 100644
--- a/smack.spec
+++ b/smack.spec
@@ -1,3 +1,7 @@
+%if 0%{?fedora}
+%bcond_with bosh
+%bcond_with minidns
+%endif
 Name:          smack
 Version:       4.0.6
 Release:       1%{?dist}
@@ -17,22 +21,17 @@ Source9:       http://repo1.maven.org/maven2/org/igniterealtime/smack/smack-tcp/
 Source10:      http://repo1.maven.org/maven2/org/igniterealtime/smack/smack-bosh/%{version}/smack-bosh-%{version}.pom
 Source11:      http://repo1.maven.org/maven2/org/igniterealtime/smack/smack-resolver-minidns/%{version}/smack-resolver-minidns-%{version}.pom
 
-# http://repo1.maven.org/maven2/org/igniterealtime/smack/smack-jingle/4.0.0/smack-jingle-4.0.0.pom
-# javax.media:jmf:2.1.1e
+# http://repo1.maven.org/maven2/org/igniterealtime/smack/smack-jingle/4.0.6/smack-jingle-4.0.6.pom
+# smack-jingle use NON free javax.media:jmf:2.1.1e
 
 # Default use gradle
 Source12:      smack-pom.xml
 
+BuildRequires: maven-local
 BuildRequires: mvn(com.jamesmurty.utils:java-xmlbuilder)
 BuildRequires: mvn(com.jcraft:jzlib)
-# https://bugzilla.redhat.com/show_bug.cgi?id=1177451
-BuildRequires: mvn(de.measite.minidns:minidns)
 BuildRequires: mvn(dnsjava:dnsjava)
 BuildRequires: mvn(junit:junit)
-# https://bugzilla.redhat.com/show_bug.cgi?id=1177442
-BuildRequires: mvn(org.igniterealtime.jbosh:jbosh)
-# https://bugzilla.redhat.com/show_bug.cgi?id=1177453
-BuildRequires: mvn(org.igniterealtime.jxmpp:jxmpp-util-cache)
 BuildRequires: mvn(org.mockito:mockito-core)
 BuildRequires: mvn(org.powermock:powermock-api-mockito)
 BuildRequires: mvn(org.powermock:powermock-module-junit4)
@@ -40,7 +39,18 @@ BuildRequires: mvn(org.powermock:powermock-reflect)
 BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:)
 BuildRequires: mvn(xmlunit:xmlunit)
 BuildRequires: mvn(xpp3:xpp3)
-BuildRequires: maven-local
+
+%if %{with bosh}
+# https://bugzilla.redhat.com/show_bug.cgi?id=1177442
+BuildRequires: mvn(org.igniterealtime.jbosh:jbosh)
+%endif
+
+%if %{with minidns}
+# https://bugzilla.redhat.com/show_bug.cgi?id=1177451
+BuildRequires: mvn(de.measite.minidns:minidns)
+# https://bugzilla.redhat.com/show_bug.cgi?id=1177453
+BuildRequires: mvn(org.igniterealtime.jxmpp:jxmpp-util-cache)
+%endif
 
 BuildArch:     noarch
 
@@ -82,6 +92,14 @@ cp -p %{SOURCE11} %{name}-resolver-minidns/pom.xml
 cp -p %{SOURCE12} pom.xml
 sed -i "s|@VERSION@|%{version}|" pom.xml
 
+# Disabled for now. Unavailable deps
+%if %{without bosh}
+%pom_disable_module %{name}-bosh
+%endif
+%if %{without minidns}
+%pom_disable_module %{name}-resolver-minidns
+%endif
+
 for m in core compression-jzlib debug experimental extensions legacy resolver-dnsjava resolver-javax tcp bosh resolver-minidns; do
 
 %pom_add_plugin org.apache.maven.plugins:maven-jar-plugin %{name}-${m} "


More information about the scm-commits mailing list