rpms/jakarta-commons-io/devel jakarta-commons-io.spec,1.6,1.7

[Andrew Overholt]

Author: overholt

Update of /cvs/pkgs/rpms/jakarta-commons-io/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv355

Modified Files:
	jakarta-commons-io.spec 
Log Message:
* Mon Jan 11 2010 Andrew Overholt <overholt at redhat.com> 0:1.4-2
- Add dos2unix BR and fix line endings in .txt files
- Add if sections to allow building with ant


Index: jakarta-commons-io.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-io/devel/jakarta-commons-io.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- jakarta-commons-io.spec	18 Sep 2009 13:28:39 -0000	1.6
+++ jakarta-commons-io.spec	11 Jan 2010 17:53:50 -0000	1.7
@@ -28,11 +28,12 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define base_name commons-io
+%global with_maven 1
+%global base_name commons-io
 
 Name:           jakarta-commons-io
 Version:        1.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          0
 Summary:        Utilities to assist with developing IO functionality 
 
@@ -48,6 +49,8 @@ BuildRequires:  jpackage-utils >= 0:1.7.
 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
@@ -61,6 +64,7 @@ BuildRequires:  maven2-plugin-resources
 BuildRequires:  maven-surefire-maven-plugin
 BuildRequires:  maven-surefire-provider-junit
 BuildRequires:  maven-doxia-sitetools
+%endif
 Requires:       jpackage-utils
 Requires(post):    jpackage-utils >= 0:1.7.2
 Requires(postun):  jpackage-utils >= 0:1.7.2
@@ -78,8 +82,10 @@ Javadoc for %{name}
 
 %prep
 %setup -q -n %{base_name}-%{version}-src
+dos2unix *.txt
 
 %build
+%if %{with_maven}
 export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
 mkdir -p $MAVEN_REPO_LOCAL
 
@@ -90,6 +96,8 @@ mvn-jpp \
         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
         -Dmaven.test.skip=true \
         install javadoc:javadoc
+%endif
+ant jar javadoc
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -103,32 +111,42 @@ 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}
+%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,-)
@@ -136,6 +154,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Mon Jan 11 2010 Andrew Overholt <overholt at redhat.com> 0:1.4-2
+- Add dos2unix BR and fix line endings in .txt files
+- Add if sections to allow building with ant
+
 * Fri Sep 18 2009 Alexander Kurtakov <akurtako at redhat.com> 0:1.4-1
 - Update to upstream 1.4.