From 463412bf91d8d5dbde4ef5e700d87935b7d947fb Mon Sep 17 00:00:00 2001
From: Mat Booth <fedora@matbooth.co.uk>
Date: Aug 21 2013 22:50:54 +0000
Subject: Update to latest upstream, rhbz #639893


- Update spec for latest guidelines

---

diff --git a/.gitignore b/.gitignore
index 887c2a9..7eef46b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 commons-digester-1.8.1-src.tar.gz
+/commons-digester-2.1-src.tar.gz
diff --git a/apache-commons-digester.spec b/apache-commons-digester.spec
index 799b7f4..e88f816 100644
--- a/apache-commons-digester.spec
+++ b/apache-commons-digester.spec
@@ -1,16 +1,13 @@
-%global base_name digester
-%global short_name commons-%{base_name}
+%global short_name commons-digester
 
 Name:          apache-%{short_name}
-Version:       1.8.1
-Release:       16%{?dist}
+Version:       2.1
+Release:       1%{?dist}
 Summary:       XML to Java object mapping module
 Group:         Development/Libraries
 License:       ASL 2.0
-URL:           http://commons.apache.org/%{base_name}/
-
-Source0:       http://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
-
+URL:           http://commons.apache.org/digester/
+Source0:       http://archive.apache.org/dist/commons/digester/source/%{short_name}-%{version}-src.tar.gz
 BuildArch:     noarch
 
 BuildRequires: java-devel
@@ -18,21 +15,6 @@ BuildRequires: jpackage-utils
 BuildRequires: apache-commons-beanutils >= 1.8
 BuildRequires: apache-commons-logging >= 1.1.1
 BuildRequires: maven-local
-BuildRequires: maven-antrun-plugin
-BuildRequires: maven-assembly-plugin
-BuildRequires: maven-compiler-plugin
-BuildRequires: maven-install-plugin
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-javadoc-plugin
-BuildRequires: maven-resources-plugin
-BuildRequires: maven-doxia-sitetools
-BuildRequires: maven-plugin-bundle
-BuildRequires: maven-surefire-maven-plugin
-BuildRequires: maven-surefire-provider-junit
-Requires:      java
-Requires:      jpackage-utils
-Requires:      apache-commons-beanutils >= 1.8
-Requires:      apache-commons-logging >= 1.1.1
 
 Provides:      jakarta-%{short_name} = %{version}-%{release}
 Obsoletes:     jakarta-%{short_name} < %{version}-%{release}
@@ -46,47 +28,35 @@ that can be used in many different projects
 %package javadoc
 Summary:       API documentation for %{name}
 Group:         Documentation
-Requires:      jpackage-utils
 Obsoletes:     jakarta-%{short_name}-javadoc < %{version}-%{release}
 
 %description javadoc
-%{summary}.
+This package contains the %{summary}.
 
 %prep
 %setup -q -n %{short_name}-%{version}-src
 
-sed -i 's/\r//' RELEASE-NOTES*.txt LICENSE.txt NOTICE.txt
+# Compatibility links
+%mvn_alias "%{short_name}:%{short_name}" "org.apache.commons:%{short_name}"
+%mvn_file :%{short_name} %{short_name} %{name}
 
 %build
-mvn-rpmbuild install javadoc:aggregate
+%mvn_build
 
 %install
-# jars
-install -d -m 755 %{buildroot}%{_javadir}
-install -p -m 644 target/%{short_name}-%{version}.jar \
-  %{buildroot}%{_javadir}/%{short_name}.jar
-ln -s %{short_name}.jar %{buildroot}/%{_javadir}/%{name}.jar
-
-# javadocs
-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-
-# pom
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -p -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom
-%add_maven_depmap JPP-%{short_name}.pom %{short_name}.jar -a "%{short_name}:%{short_name}"
-
-%files
-%doc LICENSE.txt NOTICE.txt RELEASE-NOTES*
-%{_mavendepmapfragdir}/*
-%{_mavenpomdir}/*
-%{_javadir}/*
-
-%files javadoc
+%mvn_install
+
+%files -f .mfiles
+%doc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt
+
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE.txt NOTICE.txt
-%{_javadocdir}/%{name}
 
 %changelog
+* Wed Aug 21 2013 Mat Booth <fedora@matbooth.co.uk> - 2.1-1
+- Update to latest upstream, rhbz #639893
+- Update spec for latest guidelines
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.1-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index b80ea0c..5f784dd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bf069f1d8908a66cb732a5c4260c86b7  commons-digester-1.8.1-src.tar.gz
+b189767c56adabbc74d6f40ba156f133  commons-digester-2.1-src.tar.gz