diff --git a/apache-commons-configuration.spec b/apache-commons-configuration.spec index 439f5d4..1d31466 100644 --- a/apache-commons-configuration.spec +++ b/apache-commons-configuration.spec @@ -15,7 +15,6 @@ BuildArch: noarch BuildRequires: java-devel BuildRequires: jpackage-utils - BuildRequires: maven BuildRequires: maven-antrun-plugin BuildRequires: maven-assembly-plugin @@ -88,7 +87,7 @@ Obsoletes: jakarta-%{short_name}-javadoc < 0:%{version}-%{release} %prep %setup -q -n %{short_name}-%{version}-src -%{__sed} -i 's/\r//' LICENSE.txt +%{__sed} -i 's/\r//' LICENSE.txt NOTICE.txt %build # We skip tests because we don't have test deps (dbunit in particular). @@ -117,17 +116,18 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{short_name}.pom %files %{_mavendepmapfragdir}/* %{_mavenpomdir}/JPP-%{short_name}.pom -%doc LICENSE.txt +%doc LICENSE.txt NOTICE.txt %{_javadir}/*.jar %files javadoc -%doc LICENSE.txt +%doc LICENSE.txt NOTICE.txt %doc %{_javadocdir}/%{name} %changelog * Tue Jun 19 2012 Mikolaj Izdebski - 1.8-1 - Update to upstream 1.8 +- Install NOTICE.txt file * Wed Apr 18 2012 Alexander Kurtakov 1.6-7 - Update to current guidelines.