[jboss-marshalling] Remove unneeded BRs

[Mikolaj Izdebski]

commit 1bb841159594277da510d3469f36d3ebb0fed66b
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Tue Jun 18 18:10:56 2013 +0200

    Remove unneeded BRs
    
    - Use better descriptions
    - Update to current packaging guidelines

 .gitignore                            |    1 +
 jboss-marshalling-1.3.13.GA-pom.patch |   61 ---------------------
 jboss-marshalling.spec                |   96 +++++++++++----------------------
 sources                               |    1 +
 4 files changed, 33 insertions(+), 126 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 53973d0..d280baa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /jboss-marshalling-1.3.4.GA.tar.xz
 /jboss-marshalling-1.3.9.GA.tar.xz
 /jboss-marshalling-1.3.13.GA.tar.xz
+/jboss-marshalling-1.3.13.GA.tar.gz
diff --git a/jboss-marshalling.spec b/jboss-marshalling.spec
index fa8df8c..6ef2fee 100644
--- a/jboss-marshalling.spec
+++ b/jboss-marshalling.spec
@@ -3,58 +3,47 @@
 
 Name:             jboss-marshalling
 Version:          1.3.13
-Release:          7%{?dist}
+Release:          8%{?dist}
 Summary:          JBoss Marshalling
-Group:            Development/Libraries
 License:          LGPLv2+
 URL:              http://www.jboss.org/jbossmarshalling
-
-# git clone git://github.com/jboss-remoting/jboss-marshalling.git
-# cd jboss-marshalling/ && git archive --format=tar --prefix=jboss-marshalling-1.3.13.GA/ 1.3.13.GA | xz > jboss-marshalling-1.3.13.GA.tar.xz
-Source0:          %{name}-%{namedversion}.tar.xz
-Patch0:           %{name}-%{namedversion}-pom.patch
-
 BuildArch:        noarch
 
-BuildRequires:    jpackage-utils
-BuildRequires:    java-devel >= 1:1.6.0
+Source0:          http://github.com/jboss-remoting/%{name}/archive/%{namedversion}.tar.gz#/%{name}-%{namedversion}.tar.gz
+
 BuildRequires:    maven-local
 BuildRequires:    jboss-parent
-BuildRequires:    maven-compiler-plugin
-BuildRequires:    maven-install-plugin
-BuildRequires:    maven-jar-plugin
-BuildRequires:    maven-javadoc-plugin
-BuildRequires:    maven-release-plugin
-BuildRequires:    maven-resources-plugin
-BuildRequires:    maven-surefire-plugin
-BuildRequires:    maven-injection-plugin
-BuildRequires:    maven-enforcer-plugin
 BuildRequires:    jboss-modules
-BuildRequires:    qdox
-BuildRequires:    jdepend
-BuildRequires:    graphviz
+BuildRequires:    maven-injection-plugin
 %if 0%{?fedora}
 BuildRequires:    apiviz
 %endif
 
-Requires:         jboss-modules
-Requires:         jpackage-utils
-Requires:         java
-
 %description
-This package contains JBoss Marshalling
+JBoss Marshalling is an alternative serialization API that fixes many
+of the problems found in the JDK serialization API while remaining
+fully compatible with java.io.Serializable and its relatives, and adds
+several new tunable parameters and additional features, all of which
+are pluggable via factory configuration (externalizers, class/instance
+lookup tables, class resolution, and object replacement, to name a
+few).
 
 %package javadoc
-Summary:          Javadocs for %{name}
-Group:            Documentation
-Requires:         jpackage-utils
+Summary:          API documentation for %{name}
 
 %description javadoc
-This package contains the API documentation for %{name}.
+This package contains %{summary}.
 
 %prep
 %setup -q -n %{name}-%{namedversion}
-%patch0 -p1
+
+%pom_remove_plugin :maven-shade-plugin
+%pom_disable_module tests
+%pom_disable_module osgi
+
+# Compat symlinks.  TODO: remove once jboss-as is rebuilt to use the
+# new JAR names.
+%mvn_file :{*} %{name}/@1 @1
 
 # Conditionally remove dependency on apiviz
 if [ %{?rhel} ]; then
@@ -62,46 +51,23 @@ if [ %{?rhel} ]; then
 fi
 
 %build
-# Caused by: java.lang.ClassNotFoundException: com.thoughtworks.qdox.model.AbstractInheritableJavaEntity
-# But the clss exists in qdox WTF?
-mvn-rpmbuild install -Dmaven.test.skip=true javadoc:aggregate
+%mvn_build
 
 %install
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-
-for m in river serial; do
-  cp -p ${m}/target/%{name}-${m}-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-${m}.jar
-  install -pm 644 ${m}/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-${m}.pom
-  %add_maven_depmap JPP-%{name}-${m}.pom %{name}-${m}.jar
-done
-
-# JARS
-cp -p api/target/%{name}-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-
-# POMS
-install -pm 644 api/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
-install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-parent.pom
-
-# DEPMAP
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-%add_maven_depmap JPP-%{name}-parent.pom
-
-# JAVADOC
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-%files
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-%{_javadir}/*
+%mvn_install
+
+%files -f .mfiles
 %doc COPYING.txt
 
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
 %doc COPYING.txt
 
 %changelog
+* Tue Jun 18 2013 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.3.13-8
+- Remove unneeded BRs
+- Use better descriptions
+- Update to current packaging guidelines
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.13-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index c139e9f..b098b35 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 cd0fbc42d216524253c734de1e475624  jboss-marshalling-1.3.13.GA.tar.xz
+45be6ac52436eecdc48553927d7875df  jboss-marshalling-1.3.13.GA.tar.gz