From aec0ff061618f3c59490fce2ae45177edb121dc7 Mon Sep 17 00:00:00 2001
From: zhuchunyi <zhuchunyi@huawei.com>
Date: Wed, 6 Nov 2019 19:38:53 +0800
Subject: [PATCH] update code

---
 libidn.spec | 32 ++++++++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/libidn.spec b/libidn.spec
index 0acc643..e5a33cf 100644
--- a/libidn.spec
+++ b/libidn.spec
@@ -1,6 +1,7 @@
+%bcond_with java 
 Name:     libidn
 Version:  1.35
-Release:  5
+Release:  7
 Summary:  GNU IDN Library - Libidn
 License:  LGPLv2+ and GPLv3+ and GFDL
 URL:	  http://www.gnu.org/software/libidn/
@@ -35,6 +36,7 @@ Requires: pkgconfig
 This package includes header files and libraries necessary for
 developing programs which use the GNU libidn library.
 
+%if %{with java}
 %package java
 Summary:       Java port of the GNU Libidn library
 BuildRequires: java-devel javapackages-local
@@ -52,6 +54,7 @@ BuildArch:     noarch
 
 %description javadoc
 This package contains javadoc for %{name}-java.
+%endif
 
 %package_help
 
@@ -62,7 +65,12 @@ autoreconf -vif
 touch src/idn_cmd.c src/idn_cmd.h
 
 %build
-%configure --disable-csharp --enable-java --enable-emacs
+%configure --disable-csharp --enable-emacs \
+%if %{with java}
+    --enable-java
+%else
+    --disable-java
+%endif
 
 %make_build
 
@@ -74,12 +82,14 @@ rm -rf %{buildroot}%{_datadir}/info/dir
 rm -rf %{buildroot}%{_libdir}/*.la \
        %{buildroot}%{_datadir}/info/*.png
 
+%if %{with java}
 rm -rf doc/java/*
 %javadoc -source 1.6 -d doc/java $(find java/src/main/java -name "*.java")
 rm -rf $RPM_BUILD_ROOT%{_javadir}/libidn*.jar
 %mvn_artifact java/pom.xml java/libidn-%{version}.jar
 %mvn_file org.gnu.inet:libidn libidn
 %mvn_install -J doc/java
+%endif
 
 %find_lang %{name}
 
@@ -99,11 +109,13 @@ rm -rf $RPM_BUILD_ROOT%{_javadir}/libidn*.jar
 %{_includedir}/*.h
 %{_libdir}/pkgconfig/*.pc
 
+%if %{with java}
 %files java -f .mfiles
 %license COPYING* java/LICENSE-2.0.txt
 
 %files javadoc -f .mfiles-javadoc
 %license COPYING* java/LICENSE-2.0.txt
+%endif
 
 %files help
 %{_mandir}/man1/idn.1*
@@ -111,12 +123,24 @@ rm -rf $RPM_BUILD_ROOT%{_javadir}/libidn*.jar
 %{_infodir}/%{name}.info.gz
 
 %changelog
-* Mon Sep 23 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.35-5
+* Thu Oct 17 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.35-7
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:add bcondwith java 
+
+* Thu Oct 17 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.35-6
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:add libidn_enables_java
+
+* Mon Sep 23 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.35-3
 - Type:bugfix
 - ID:NA
 - SUG:NA
 - DESC: Fix build failure in csharp
 
-* Mon Sep 2 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.35-4
+* Mon Sep 2 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.35-1
 - Package init