From 3fb52d3cd9a58cc2967af5147a19853405848502 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Jul 26 2019 10:22:29 +0000 Subject: disable hibernate support by default --- diff --git a/xstream.spec b/xstream.spec index 70fcac7..a1bf412 100644 --- a/xstream.spec +++ b/xstream.spec @@ -30,12 +30,11 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# Allow building with a minimal dependency set -%bcond_with jp_minimal +%bcond_with hibernate Name: xstream Version: 1.4.11.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java XML serialization library License: BSD URL: http://x-stream.github.io/ @@ -60,7 +59,7 @@ BuildRequires: mvn(stax:stax-api) BuildRequires: mvn(xpp3:xpp3) BuildRequires: mvn(xpp3:xpp3_min) -%if %{without jp_minimal} +%if %{with hibernate} BuildRequires: mvn(javassist:javassist) BuildRequires: mvn(org.codehaus.jettison:jettison) BuildRequires: mvn(org.hibernate:hibernate-core) @@ -97,7 +96,7 @@ Summary: Javadoc for %{name} %description javadoc %{name} API documentation. -%if %{without jp_minimal} +%if %{with hibernate} %package hibernate Summary: hibernate module for %{name} Requires: %{name} = %{version}-%{release} @@ -163,7 +162,7 @@ find . -name "*.jar" -print -delete %pom_xpath_inject "pom:project/pom:dependencies/pom:dependency[pom:groupId = 'junit' ]" "test" xstream-benchmark %pom_remove_plugin :maven-javadoc-plugin xstream-benchmark -%if %{with jp_minimal} +%if %{without hibernate} # Don't build hibernate module %pom_disable_module xstream-hibernate # Disable support for some lesser used XML backends @@ -192,7 +191,7 @@ rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/ %files parent -f .mfiles-%{name}-parent -%if %{without jp_minimal} +%if %{with hibernate} %files hibernate -f .mfiles-%{name}-hibernate %endif @@ -202,6 +201,9 @@ rm xstream-benchmark/src/java/com/thoughtworks/xstream/tools/benchmark/products/ %license LICENSE.txt %changelog +* Fri Jul 26 2019 Fabio Valentini - 1.4.11.1-3 +- Disable hibernate support by default. + * Tue Mar 05 2019 Mat Booth - 1.4.11.1-2 - Allow building with reduced dependency set