mizdebsk pushed to apache-commons-csv (master). "Cleanup spec file"

notifications at fedoraproject.org notifications at fedoraproject.org
Sun Apr 12 19:29:25 UTC 2015


>From fc706722768c1ca0aff5ce2094ccd9517e292fea Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Sun, 12 Apr 2015 21:28:46 +0200
Subject: Cleanup spec file


diff --git a/apache-commons-csv.spec b/apache-commons-csv.spec
index 1fc0d8e..4556f7f 100644
--- a/apache-commons-csv.spec
+++ b/apache-commons-csv.spec
@@ -1,22 +1,18 @@
-%global base_name       csv
-%global short_name      commons-%{base_name}
-
-Name:             apache-%{short_name}
-Version:          1.1
-Release:          1%{?dist}
-Summary:          Utilities to assist with handling of CSV files
-License:          ASL 2.0
-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:    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)
-
+Name:           apache-commons-csv
+Version:        1.1
+Release:        1%{?dist}
+Summary:        Utilities to assist with handling of CSV files
+License:        ASL 2.0
+URL:            https://commons.apache.org/proper/commons-csv/
+BuildArch:      noarch
+
+Source0:        http://www.apache.org/dist/commons/csv/source/commons-csv-%{version}-src.tar.gz
+
+BuildRequires:  maven-local
+BuildRequires:  mvn(com.h2database:h2)
+BuildRequires:  mvn(commons-io:commons-io)
+BuildRequires:  mvn(junit:junit)
+BuildRequires:  mvn(org.apache.commons:commons-parent:pom:)
 
 %description
 Commons CSV was started to unify a common and simple interface for
@@ -29,21 +25,19 @@ Summary:          API documentation for %{name}
 This package contains the API documentation for %{name}.
 
 %prep
-%setup -q -n %{short_name}-%{version}-src
+%setup -q -n commons-csv-%{version}-src
 sed -i 's/\r//' *.txt
+find -name profile.jacoco -delete
 
 # Unwanted plugins
 %pom_remove_plugin :maven-assembly-plugin
+%pom_remove_plugin :apache-rat-plugin
+%pom_remove_plugin :maven-checkstyle-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}
+%mvn_file ":{*}" %{name} @1
+%mvn_alias : commons-csv:
 
 %build
-
 %mvn_build
 
 %install
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/apache-commons-csv.git/commit/?h=master&id=fc706722768c1ca0aff5ce2094ccd9517e292fea


More information about the scm-commits mailing list