[apache-log4j-extras] introduce license macro

gil gil at fedoraproject.org
Tue Mar 3 23:19:02 UTC 2015


commit d3bd03e9893eb9f16b8e927a2a54c975964289a5
Author: gil <puntogil at libero.it>
Date:   Wed Mar 4 00:18:49 2015 +0100

    introduce license macro

 apache-log4j-extras.spec | 73 ++++++++++++++++++++++--------------------------
 1 file changed, 34 insertions(+), 39 deletions(-)
---
diff --git a/apache-log4j-extras.spec b/apache-log4j-extras.spec
index 4fd252f..2123a95 100644
--- a/apache-log4j-extras.spec
+++ b/apache-log4j-extras.spec
@@ -3,39 +3,24 @@
 
 %bcond_with javadoc
 
-Name:		apache-log4j-extras
-Version:	1.2.17.1
-Release:	4%{?dist}
-Summary:	Apache Extras Companion for Apache log4j
-
-License:	ASL 2.0
-URL:		http://logging.apache.org/log4j/extras
-Source0:	https://github.com/apache/log4j-extras/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz
-BuildArch:	noarch
-BuildRequires:	ant
-BuildRequires:	ant-contrib
-BuildRequires:	ant-junit
-BuildRequires:	apache-rat-plugin
-BuildRequires:	hsqldb
-BuildRequires:	java-devel
-BuildRequires:	jpackage-utils
-BuildRequires:	log4j12
-BuildRequires:	maven-antrun-plugin
-BuildRequires:	maven-changes-plugin
-BuildRequires:	maven-compiler-plugin
-BuildRequires:	maven-install-plugin
-BuildRequires:	maven-jar-plugin
-%if %{with javadoc}
-BuildRequires:	maven-javadoc-plugin
-%endif
-BuildRequires:	maven-local
-BuildRequires:	maven-plugin-jxr
-BuildRequires:	maven-release-plugin
-BuildRequires:	maven-resources-plugin
-BuildRequires:	maven-site-plugin
-BuildRequires:	maven-skins
-BuildRequires:	maven-surefire-plugin
-
+Name:          apache-log4j-extras
+Version:       1.2.17.1
+Release:       5%{?dist}
+Summary:       Apache Extras Companion for Apache log4j
+
+License:       ASL 2.0
+URL:           http://logging.apache.org/log4j/extras
+Source0:       https://github.com/apache/log4j-extras/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz
+BuildArch:     noarch
+BuildRequires: maven-local
+BuildRequires: mvn(junit:junit)
+BuildRequires: mvn(log4j:log4j:1.2.17)
+BuildRequires: mvn(org.apache:apache:pom:)
+BuildRequires: mvn(org.apache.geronimo.specs:specs:pom:)
+BuildRequires: mvn(org.apache.geronimo.specs:geronimo-jms_1.1_spec)
+BuildRequires: mvn(org.apache.rat:apache-rat-plugin)
+BuildRequires: mvn(org.hsqldb:hsqldb)
+Requires:      mvn(log4j:log4j:1.2.17)
 
 %description
 Apache Extras Companion for Apache log4j is a collection of appenders, 
@@ -43,8 +28,7 @@ filters, layouts, and receivers for Apache log4j 1.2
 
 %if %{with javadoc}
 %package javadoc
-Summary:	Javadoc for %{name}
-Group:		Documentation
+Summary:       Javadoc for %{name}
 
 %description javadoc
 This package contains the API documentation for %{name}.
@@ -53,8 +37,15 @@ This package contains the API documentation for %{name}.
 
 %prep
 %setup -qn log4j-extras-%{commit}
-find -name '*.class' -exec rm -f '{}' \;
-find -name '*.jar' -exec rm -f '{}' \;
+# Cleanup
+find . -name '*.class' -delete
+find . -name '*.jar' -delete
+
+# Unnecessary plugins
+%pom_remove_plugin :maven-assembly-plugin
+%pom_remove_plugin :maven-changes-plugin
+%pom_remove_plugin :maven-pmd-plugin
+%pom_remove_plugin :maven-site-plugin
 
 %pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:groupId='hsqldb']/pom:groupId" org.hsqldb
 
@@ -69,15 +60,19 @@ args="-j"
 %mvn_install
 
 %files -f .mfiles
-%doc LICENSE NOTICE
+%license LICENSE NOTICE
 %dir %{_javadir}/%{name}
 
 %if %{with javadoc}
 %files javadoc -f .mfiles-javadoc
-%doc LICENSE NOTICE
+%license LICENSE NOTICE
 %endif
 
 %changelog
+* Tue Mar 03 2015 gil cattaneo <puntogil at libero.it> 1.2.17.1-5
+- introduce license macro
+- fix BR list
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.17.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 


More information about the scm-commits mailing list