From bcb9c6d83d20df861e1be7efecffc43aac5f3118 Mon Sep 17 00:00:00 2001
From: gil <puntogil@libero.it>
Date: Sat, 11 Apr 2015 18:03:52 +0200
Subject: [PATCH] update to 1.1

Signed-off-by: Mikolaj Izdebski <mizdebsk@redhat.com>
---
 .gitignore              |  1 +
 apache-commons-csv.spec | 48 +++++++++++++++++++++++++----------------
 sources                 |  2 +-
 3 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/.gitignore b/.gitignore
index cebaa3d..cf16f4c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /apache-commons-csv-1.0.tar.xz
+/commons-csv-1.1-src.tar.gz
diff --git a/apache-commons-csv.spec b/apache-commons-csv.spec
index 33f98f4..1fc0d8e 100644
--- a/apache-commons-csv.spec
+++ b/apache-commons-csv.spec
@@ -2,22 +2,20 @@
 %global short_name      commons-%{base_name}
 
 Name:             apache-%{short_name}
-Version:          1.0
-Release:          0.11.svn1071189%{?dist}
+Version:          1.1
+Release:          1%{?dist}
 Summary:          Utilities to assist with handling of CSV files
 License:          ASL 2.0
-Group:            Development/Libraries
-URL:              http://commons.apache.org/sandbox/%{base_name}
-# svn export -r 1071189 http://svn.apache.org/repos/asf/commons/sandbox/csv/trunk/ apache-commons-csv-1.0
-# tar caf apache-commons-csv-1.0.tar.xz apache-commons-csv-1.0
-Source0:          %{name}-%{version}.tar.xz
+URL:              https://commons.apache.org/proper/%{short_name}/
+Source0:          http://www.apache.org/dist/commons/csv/source/%{short_name}-%{version}-src.tar.gz
 BuildArch:        noarch
 
 BuildRequires:    maven-local
-BuildRequires:    java-devel >= 1:1.6.0
-BuildRequires:    jpackage-utils
-BuildRequires:    junit
-BuildRequires:    apache-commons-parent
+BuildRequires:    mvn(com.h2database:h2)
+BuildRequires:    mvn(commons-io:commons-io)
+BuildRequires:    mvn(junit:junit)
+BuildRequires:    mvn(org.apache.commons:commons-parent:pom:)
+BuildRequires:    mvn(org.jacoco:jacoco-maven-plugin)
 
 
 %description
@@ -26,33 +24,45 @@ reading and writing CSV files under an ASL license.
 
 %package javadoc
 Summary:          API documentation for %{name}
-Group:            Documentation
-Requires:         jpackage-utils
-
 
 %description javadoc
 This package contains the API documentation for %{name}.
 
 %prep
-%setup -q
+%setup -q -n %{short_name}-%{version}-src
 sed -i 's/\r//' *.txt
-sed -i 's:commons-sandbox-parent:commons-parent:' pom.xml
 
-%build
+# Unwanted plugins
+%pom_remove_plugin :maven-assembly-plugin
+
+# Prevent build failure
+%pom_xpath_inject "pom:plugin[pom:artifactId='apache-rat-plugin']/pom:configuration/pom:excludes" "
+<exclude>**/.xmvn/**</exclude>"
+
 %mvn_file  : %{short_name} %{name}
 %mvn_alias : %{short_name}:%{short_name}
+
+%build
+
 %mvn_build
 
 %install
 %mvn_install
 
 %files -f .mfiles
-%doc LICENSE.txt NOTICE.txt
+%doc RELEASE-NOTES.txt
+%license LICENSE.txt NOTICE.txt
 
 %files javadoc -f .mfiles-javadoc
-%doc LICENSE.txt NOTICE.txt
+%license LICENSE.txt NOTICE.txt
 
 %changelog
+* Sat Apr 11 2015 gil cattaneo <puntogil@libero.it> 1.1-1
+- update to 1.1
+- adapt to current guideline
+- introduce license macro
+- fix Url and Source0 field
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-0.11.svn1071189
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index 5777cda..3a14519 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7f232c4904017dc5508e2e04e22ddca8  apache-commons-csv-1.0.tar.xz
+68e6552c6dedc1e5d3d362d77b8f9f7b  commons-csv-1.1-src.tar.gz