[jcifs] update to 1.3.18 (rhbz#1159488)

[gil]

commit a2019342566af1104b8a85d316c7287576e0701f
Author: gil <puntogil at libero.it>
Date:   Sun Nov 2 01:50:26 2014 +0100

    update to 1.3.18 (rhbz#1159488)

 .gitignore |    1 +
 jcifs.spec |   42 +++++++++++++++++-------------------------
 sources    |    2 +-
 3 files changed, 19 insertions(+), 26 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9274e7d..dffd0a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /jcifs-1.3.17.tgz
+/jcifs-1.3.18.tgz
diff --git a/jcifs.spec b/jcifs.spec
index 7c8de6f..adc004c 100644
--- a/jcifs.spec
+++ b/jcifs.spec
@@ -1,6 +1,6 @@
 Name:          jcifs
-Version:       1.3.17
-Release:       12%{?dist}
+Version:       1.3.18
+Release:       1%{?dist}
 Summary:       Common Internet File System Client in 100% Java
 # Licenses:
 #   src/jcifs/util/DES.java: BSD and MIT
@@ -9,19 +9,12 @@ Summary:       Common Internet File System Client in 100% Java
 License:       LGPLv2+ and BSD and MIT
 URL:           http://jcifs.samba.org/
 Source0:       http://jcifs.samba.org/src/%{name}-%{version}.tgz
-Source1:       http://mirrors.ibiblio.org/pub/mirrors/maven2/%{name}/%{name}/%{version}/%{name}-%{version}.pom 
+Source1:       http://mirrors.ibiblio.org/pub/mirrors/maven2/jcifs/jcifs/1.3.17/jcifs-1.3.17.pom 
 # fix javac executable
-Patch0:        %{name}-%{version}-build.patch
-BuildRequires: java-devel
-BuildRequires: jpackage-utils
-
+Patch0:        %{name}-1.3.17-build.patch
 BuildRequires: ant
-
+BuildRequires: javapackages-local
 BuildRequires: tomcat-servlet-3.0-api
-Requires:      tomcat-servlet-3.0-api
-
-Requires:      java-headless
-Requires:      jpackage-utils
 BuildArch:     noarch
 
 %description
@@ -38,7 +31,7 @@ give away a modified binary only version of the library itself without
 reciprocation).
 
 %package javadoc
-Summary:       Javadocs for %{name}
+Summary:       Javadoc for %{name}
 # Neither DES.java nor MD4.java (see License comment) are documented here
 License:       LGPLv2+
 
@@ -61,24 +54,21 @@ find -name '*.jar' -delete
 %patch0 -p0
 cp -p %{SOURCE1} pom.xml
 %pom_remove_plugin :maven-gpg-plugin
+%pom_remove_dep javax.servlet:servlet-api
+%pom_add_dep org.apache.tomcat:tomcat-servlet-api
 
 %build
 
+%mvn_file %{name}:%{name} %{name}
+%mvn_alias %{name}:%{name} org.samba.jcifs:jcifs
 export CLASSPATH=$(build-classpath tomcat-servlet-3.0-api)
 export OPT_JAR_LIST=:
 %ant jar javadoc docs
 
-%install
-
-mkdir -p %{buildroot}%{_javadir}
-install -p -m 644 %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-
-mkdir -p %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap -a org.samba.jcifs:jcifs
+%mvn_artifact pom.xml %{name}-%{version}.jar
 
-mkdir -p %{buildroot}%{_javadocdir}/%{name}
-cp -pr docs/api/* %{buildroot}%{_javadocdir}/%{name}
+%install
+%mvn_install -J docs/api
 
 mkdir -p %{buildroot}%{_datadir}/%{name}/examples
 cp -pr examples/*.java  %{buildroot}%{_datadir}/%{name}/examples
@@ -86,8 +76,7 @@ cp -pr examples/*.java  %{buildroot}%{_datadir}/%{name}/examples
 %files -f .mfiles
 %doc LICENSE.txt README.txt docs/*.{html,txt,gif}
 
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE.txt
 
 %files demo
@@ -95,6 +84,9 @@ cp -pr examples/*.java  %{buildroot}%{_datadir}/%{name}/examples
 %doc LICENSE.txt
 
 %changelog
+* Sat Nov 01 2014 gil cattaneo <puntogil at libero.it> 1.3.18-1
+- update to 1.3.18
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.17-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index 441e67f..831ccac 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-17883a896bf93e5942eb781a66ba4b7a  jcifs-1.3.17.tgz
+dcffe78d2a08de951b6119fa36017c37  jcifs-1.3.18.tgz