commit f72a8d9634c905060d4caf3502f935a8351ee2ff
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Tue Jan 8 17:09:57 2013 +0100
Build with xmvn
- Update to current packaging guidelines
apache-commons-io.spec | 83 +++++++++++++++++++-----------------------------
1 files changed, 33 insertions(+), 50 deletions(-)
---
diff --git a/apache-commons-io.spec b/apache-commons-io.spec
index 1ecd3e5..c025250 100644
--- a/apache-commons-io.spec
+++ b/apache-commons-io.spec
@@ -1,28 +1,25 @@
%global base_name io
%global short_name commons-%{base_name}
-Name: apache-%{short_name}
-Version: 2.4
-Release: 3%{?dist}
-Epoch: 1
-Summary: Utilities to assist with developing IO functionality
-License: ASL 2.0
-Group: Development/Libraries
-URL:
http://commons.apache.org/%{base_name}
-Source0:
http://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-...
-BuildArch: noarch
-
-BuildRequires: java-devel >= 1:1.6.0
-BuildRequires: jpackage-utils
-BuildRequires: junit4
-BuildRequires: maven
-BuildRequires: maven-surefire-provider-junit4
-BuildRequires: apache-commons-parent
-
-Requires: java >= 1:1.6.0
-Requires: jpackage-utils
-Provides: jakarta-%{short_name} = %{epoch}:%{version}-%{release}
-Obsoletes: jakarta-%{short_name} < %{epoch}:%{version}-%{release}
+Name: apache-%{short_name}
+Version: 2.4
+Release: 4%{?dist}
+Epoch: 1
+Summary: Utilities to assist with developing IO functionality
+License: ASL 2.0
+Group: Development/Libraries
+URL:
http://commons.apache.org/%{base_name}
+Source0:
http://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-...
+BuildArch: noarch
+
+BuildRequires: java-devel >= 1:1.6
+BuildRequires: xmvn >= 0.2.1
+BuildRequires: javapackages-tools >= 0.10.0
+BuildRequires: apache-commons-parent
+BuildRequires: maven-surefire-provider-junit
+
+Provides: jakarta-%{short_name} = %{epoch}:%{version}-%{release}
+Obsoletes: jakarta-%{short_name} < %{epoch}:%{version}-%{release}
%description
Commons-IO contains utility classes, stream implementations,
@@ -30,50 +27,36 @@ file filters, and endian classes. It is a library of utilities
to assist with developing IO functionality.
%package javadoc
-Summary: API documentation for %{name}
-Group: Documentation
-Requires: jpackage-utils
-Provides: jakarta-%{short_name}-javadoc = %{epoch}:%{version}-%{release}
-Obsoletes: jakarta-%{short_name}-javadoc < %{epoch}:%{version}-%{release}
+Summary: API documentation for %{name}
+Group: Documentation
+Provides: jakarta-%{short_name}-javadoc = %{epoch}:%{version}-%{release}
+Obsoletes: jakarta-%{short_name}-javadoc < %{epoch}:%{version}-%{release}
%description javadoc
-This package contains the API documentation for %{name}.
+This package provides %{summary}.
%prep
%setup -q -n %{short_name}-%{version}-src
sed -i 's/\r//' *.txt
%build
-mvn-rpmbuild install javadoc:javadoc
+%mvn_file : %{short_name} %{name}
+%mvn_alias : org.apache.commons:
+%mvn_build
%install
+%mvn_install
-# jars
-install -d -m 755 %{buildroot}%{_javadir}
-install -p -m 644 target/%{short_name}-%{version}.jar
%{buildroot}%{_javadir}/%{name}.jar
-ln -sf %{name}.jar %{buildroot}%{_javadir}/%{short_name}.jar
-
-# pom
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom
-
-%add_maven_depmap JPP-%{short_name}.pom %{short_name}.jar -a
"org.apache.commons:commons-io"
-
-# javadoc
-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-
-%files
+%files -f .mfiles
%doc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt
-%{_javadir}/*.jar
-%{_mavenpomdir}/JPP-%{short_name}.pom
-%{_mavendepmapfragdir}/*
-%files javadoc
+%files javadoc -f .mfiles-javadoc
%doc LICENSE.txt NOTICE.txt
-%doc %{_javadocdir}/%{name}
%changelog
+* Tue Jan 8 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1:2.4-4
+- Build with xmvn
+
* Mon Nov 19 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1:2.4-3
- Add Provides/Obsoletes for jakarta-commons-io