[jakarta-commons-io/el5/master] * Mon Jan 11 2010 Andrew Overholt <overholt at redhat.com> 0:1.4-3 - Add dos2unix BR and fix line endin

Fri Aug 6 00:22:57 UTC 2010

commit 4bae26dbe732c7dfd0332eb88890ab6d99ad0503
Author: Ruediger Landmann <r.landmann at redhat.com>
Date:   Fri Aug 6 10:22:37 2010 +1000

    * Mon Jan 11 2010 Andrew Overholt <overholt at redhat.com> 0:1.4-3
    - Add dos2unix BR and fix line endings in .txt files

 .gitignore                |    1 +
 commons-io-1.2-src.tar.gz |  Bin 146580 -> 0 bytes
 dead.package              |    1 -
 jakarta-commons-io.spec   |  128 +++++++++++++++++++++++++++++++++++++--------
 sources                   |    2 +-
 5 files changed, 107 insertions(+), 25 deletions(-)
---

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..2bd265d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+commons-io-1.4-src.tar.gz
diff --git a/jakarta-commons-io.spec b/jakarta-commons-io.spec
index 753cad5..4dc4556 100644
--- a/jakarta-commons-io.spec
+++ b/jakarta-commons-io.spec
@@ -1,4 +1,4 @@
-# Copyright (c) 2000-2005, JPackage Project
+# Copyright (c) 2000-2007, JPackage Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -28,31 +28,46 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define base_name commons-io
+%global with_maven 0
+%global base_name commons-io
 
 Name:           jakarta-commons-io
-Version:        1.2
-Release:        3jpp.1%{?dist}
+Version:        1.4
+Release:        3%{?dist}
 Epoch:          0
 Summary:        Utilities to assist with developing IO functionality 
 
-Group:          Development/Libraries/Java
-License:        Apache Software License
-URL:            http://jakarta.apache.org/commons/io/
-# svn export http://svn.apache.org/repos/asf/jakarta/commons/proper/io/tags/IO_1_2/ commons-io-1.2-src
-# tar czf commons-io-1.2-src.tar.gz commons-io-1.2-src
-Source0:        commons-io-1.2-src.tar.gz
+Group:          Development/Libraries
+License:        ASL 2.0
+URL:            http://commons.apache.org/io/
+Source0:        http://archive.apache.org/dist/commons/io/source/commons-io-%{version}-src.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  jpackage-utils >= 0:1.6
+BuildRequires:  jpackage-utils >= 0:1.7.2
 BuildRequires:  ant >= 0:1.6
 BuildRequires:  ant-junit >= 0:1.6
 BuildRequires:  junit >= 0:3.8.1
+BuildRequires:  dos2unix
+%if %{with_maven}
+BuildRequires:  maven2 >= 2.0.4-10jpp
+BuildRequires:  maven2-plugin-assembly
+BuildRequires:  maven2-plugin-antrun
+BuildRequires:  maven-plugin-bundle
+BuildRequires:  maven2-plugin-compiler
+BuildRequires:  maven2-plugin-idea
+BuildRequires:  maven2-plugin-install
+BuildRequires:  maven2-plugin-jar
+BuildRequires:  maven2-plugin-javadoc
+BuildRequires:  maven2-plugin-resources
+BuildRequires:  maven-surefire-maven-plugin
+BuildRequires:  maven-surefire-provider-junit
+BuildRequires:  maven-doxia-sitetools
+%endif
 Requires:       jpackage-utils
-Requires(postun): jpackage-utils
-
+Requires(post):    jpackage-utils >= 0:1.7.2
+Requires(postun):  jpackage-utils >= 0:1.7.2
 %description
 Commons-IO contains utility classes, stream implementations, 
 file filters, and endian classes. It is a library of utilities 
@@ -61,21 +76,34 @@ to assist with developing IO functionality.
 %package        javadoc
 Summary:        Javadoc for %{name}
 Group:          Documentation
-Requires:       jpackage-utils
-Requires(postun): jpackage-utils
 
 %description    javadoc
 Javadoc for %{name}
 
 %prep
 %setup -q -n %{base_name}-%{version}-src
+dos2unix *.txt
 
 %build
-ant -Dbuild.sysclasspath=only dist
+%if %{with_maven}
+export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
+mkdir -p $MAVEN_REPO_LOCAL
+
+mvn-jpp \
+        -e \
+        -s $(pwd)/settings.xml \
+        -Dmaven2.jpp.mode=true \
+        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+        -Dmaven.test.skip=true \
+        install javadoc:javadoc
+%endif
+ant jar javadoc
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -Dpm 644 build/%{base_name}-%{version}.jar \
+# jars
+install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
+install -pm 644 target/%{base_name}-%{version}.jar \
   $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
 ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 ln -s %{name}-%{version}.jar \
@@ -83,29 +111,83 @@ ln -s %{name}-%{version}.jar \
 ln -s %{base_name}-%{version}.jar \
   $RPM_BUILD_ROOT%{_javadir}/%{base_name}.jar
 
+%if %{with_maven}
+%add_to_maven_depmap %{base_name} %{base_name} %{version} JPP %{base_name}
+
+# poms
+install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+install -pm 644 pom.xml \
+    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}.pom
+%endif
+
 install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-unzip -q build/dist/%{base_name}-%{version}.zip %{base_name}-%{version}/docs/* \
-    -d $RPM_BUILD_ROOT%{_javadocdir}
-mv $RPM_BUILD_ROOT%{_javadocdir}/%{base_name}-%{version}/docs/* \
-    $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-rm -r $RPM_BUILD_ROOT%{_javadocdir}/%{base_name}-%{version}
+%if %{with_maven}
+cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+%else
+cp -pr target/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+%endif
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%if %{with_maven}
+%post
+%update_maven_depmap
+
+%postun
+%update_maven_depmap
+%endif
+
 %files
 %defattr(-,root,root,-)
 %doc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt
 %{_javadir}/*.jar
+%if %{with_maven}
+%{_datadir}/maven2/poms/*
+%{_mavendepmapfragdir}
+%endif
 
 %files javadoc
 %defattr(-,root,root,-)
 %doc %{_javadocdir}/%{name}-%{version}
 %doc %{_javadocdir}/%{name}
 
-
 %changelog
+* Mon Jan 11 2010 Andrew Overholt <overholt at redhat.com> 0:1.4-3
+- Add dos2unix BR and fix line endings in .txt files
+
+* Mon Dec 14 2009 Andrew Overholt <overholt at redhat.com> 0:1.4-2
+- Build with ant.
+
+* Fri Sep 18 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.4-1
+- Update to upstream 1.4.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.3.2-3.2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.3.2-2.2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Wed Jul  9 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0:1.3.2-1.2 
+- drop repotag
+- fix license tag
+
+* Tue Jan 22 2008 Permaine Cheung <pcheung at redhat.com> - 0:1.3.2-1jpp.1
+- Merge with upstream
+
+* Fri Jul 20 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.3.2-1jpp
+- Upgrade to 1.3.2
+- Build with maven2 by default
+- Add pom and depmap frag
+
+* Tue May 15 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.2-4jpp
+- Make Vendor, Distribution based on macro
+
+* Tue Feb 13 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.2-3jpp
+- Add gcj_support option
+
+
 * Tue Feb 13 2007 Deepak Bhole <dbhole at redhat.com> - 0:1.2-3jpp.1.fc7
 - Fix spec per Fedora guidelines.
 
diff --git a/sources b/sources
index b067f58..2f441f5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d56086faed78f41fe5cc536914d4abf2  commons-io-1.2-src.tar.gz
+24b228f2d0c40ffed9204cdab015bccf  commons-io-1.4-src.tar.gz
