[jcifs] Update to current packaging guidelines

[Mikolaj Izdebski]

commit d7b4725b8a62f4aac9c708708ec7a13ea0beeb21
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Fri Jun 14 20:01:39 2013 +0200

    Update to current packaging guidelines

 jcifs-1.3.17-pom.patch |   20 --------------------
 jcifs.spec             |   30 ++++++++++++------------------
 2 files changed, 12 insertions(+), 38 deletions(-)
---
diff --git a/jcifs.spec b/jcifs.spec
index 7d86f01..426e792 100644
--- a/jcifs.spec
+++ b/jcifs.spec
@@ -1,16 +1,13 @@
 Name:          jcifs
 Version:       1.3.17
-Release:       7%{?dist}
+Release:       8%{?dist}
 Summary:       Common Internet File System Client in 100% Java
-Group:         Development/Libraries
 License:       LGPLv2+ and BSD
-Url:           http://jcifs.samba.org/
+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 
 # fix javac executable
 Patch0:        %{name}-%{version}-build.patch
-# remove maven-gpg-plugin
-Patch1:        %{name}-%{version}-pom.patch
 BuildRequires: java-devel
 BuildRequires: jpackage-utils
 
@@ -25,9 +22,9 @@ BuildArch:     noarch
 
 %description
 The jCIFS SMB client library enables any Java application to remotely
-access shared files and directories on SMB file servers(i.e. a Microsoft
-Windows "share") in addition to domain, workgroup, and server
-enumeration of NetBIOS over TCP/IP networks. It is an advanced
+access shared files and directories on SMB file servers (i.e. a
+Microsoft Windows "share") in addition to domain, workgroup, and
+server enumeration of NetBIOS over TCP/IP networks. It is an advanced
 implementation of the CIFS protocol supporting Unicode, batching,
 multiplexing of threaded callers, encrypted authentication,
 transactions, the Remote Access Protocol (RAP), and much more. It is
@@ -38,16 +35,13 @@ reciprocation).
 
 %package javadoc
 Summary:       Javadocs for %{name}
-Group:         Documentation
 License:       LGPLv2+ and GPLv2+
-Requires:      jpackage-utils
 
 %description javadoc
 This package contains the API documentation for %{name}.
 
 %package demo
 Summary:       Demo for %{name}
-Group:         Development/Libraries
 License:       LGPLv2+ and GPLv2+ and BSD
 Requires:      %{name} = %{version}-%{release}
 
@@ -60,7 +54,7 @@ find -name '*.class' -delete
 find -name '*.jar' -delete
 %patch0 -p0
 cp -p %{SOURCE1} pom.xml
-%patch1 -p0
+%pom_remove_plugin :maven-gpg-plugin
 
 %build
 
@@ -75,7 +69,7 @@ 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 JPP-%{name}.pom %{name}.jar -a "org.samba.jcifs:jcifs"
+%add_maven_depmap -a org.samba.jcifs:jcifs
 
 mkdir -p %{buildroot}%{_javadocdir}/%{name}
 cp -pr docs/api/* %{buildroot}%{_javadocdir}/%{name}
@@ -83,10 +77,7 @@ cp -pr docs/api/* %{buildroot}%{_javadocdir}/%{name}
 mkdir -p %{buildroot}%{_datadir}/%{name}/examples
 cp -pr examples/*.java  %{buildroot}%{_datadir}/%{name}/examples
 
-%files
-%{_javadir}/%{name}.jar
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
+%files -f .mfiles
 %doc LICENSE.txt README.txt docs/*.{html,txt,gif}
 
 %files javadoc
@@ -98,6 +89,9 @@ cp -pr examples/*.java  %{buildroot}%{_datadir}/%{name}/examples
 %doc LICENSE.txt
 
 %changelog
+* Fri Jun 14 2013 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.3.17-8
+- Update to current packaging guidelines
+
 * Fri Feb 08 2013 Jon Ciesla <limburgher at gmail.com> 1.3.17-7
 - Rebuild to get update to mirror due to tagging issue,
 - see https://fedorahosted.org/rel-eng/ticket/5467
@@ -121,4 +115,4 @@ cp -pr examples/*.java  %{buildroot}%{_datadir}/%{name}/examples
 - add Requires: jpackage-utils to javadoc subpackage
 
 * Sun Mar 25 2012 gil cattaneo <puntogil at libero.it> 1.3.17-1
-- initial rpm
\ No newline at end of file
+- initial rpm