Cleanup spec file

apache-commons-cli.spec

@@ -1,17 +1,15 @@
-%global short_name      commons-cli
+Name:           apache-commons-cli
+Version:        1.4
+Release:        3%{?dist}
+Summary:        Command Line Interface Library for Java
+License:        ASL 2.0
+URL:            http://commons.apache.org/cli/
+BuildArch:      noarch
 
-Name:             apache-%{short_name}
-Version:          1.4
-Release:          2%{?dist}
-Summary:          Command Line Interface Library for Java
-License:          ASL 2.0
-URL:              http://commons.apache.org/cli/
-BuildArch:        noarch
-
-Source0:          http://www.apache.org/dist/commons/cli/source/%{short_name}-%{version}-src.tar.gz
+Source0:        http://www.apache.org/dist/commons/cli/source/commons-cli-%{version}-src.tar.gz
 
 # workaround for https://issues.apache.org/jira/browse/CLI-253
-Patch0:           CLI-253-workaround.patch
+Patch0:         CLI-253-workaround.patch
 
 BuildRequires:  maven-local
 BuildRequires:  mvn(junit:junit)
@@ -22,20 +20,14 @@ BuildRequires:  mvn(org.apache.maven.plugins:maven-antrun-plugin)
 The CLI library provides a simple and easy to use API for working with the
 command line arguments and options.
 
-%package javadoc
-Summary:          Javadoc for %{name}
-
-%description javadoc
-This package contains the API documentation for %{name}.
+%{?javadoc_package}
 
 %prep
-%setup -q -n %{short_name}-%{version}-src
-
-%patch0 -p1
+%autosetup -p1 -n commons-cli-%{version}-src
 
 # Compatibility links
-%mvn_alias "%{short_name}:%{short_name}" "org.apache.commons:%{short_name}"
-%mvn_file :commons-cli %{short_name} %{name}
+%mvn_alias : org.apache.commons:commons-cli
+%mvn_file : commons-cli %{name}
 
 %build
 %mvn_build
@@ -44,12 +36,13 @@ This package contains the API documentation for %{name}.
 %mvn_install
 
 %files -f .mfiles
-%doc LICENSE.txt NOTICE.txt README.md RELEASE-NOTES.txt
-
-%files javadoc -f .mfiles-javadoc
-%doc LICENSE.txt NOTICE.txt
+%license LICENSE.txt NOTICE.txt
+%doc README.md RELEASE-NOTES.txt
 
 %changelog
+* Mon Jan 29 2018 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.4-3
+- Cleanup spec file
+
 * Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild