[Jpackage-commits] dist/jakarta-commons-io/JPP-6 jakarta-commons-io.spec, 1.6, 1.7

David Walluck david at ryu.zarb.org
Wed Feb 4 19:13:43 CET 2009


Update of /home/projects/jpackage/cvs/dist/jakarta-commons-io/JPP-6
In directory ryu.zarb.org:/tmp/cvs-serv17821

Modified Files:
	jakarta-commons-io.spec 
Log Message:
- fix ant build

Index: jakarta-commons-io.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/jakarta-commons-io/JPP-6/jakarta-commons-io.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -C 2 -d -r1.6 -r1.7
*** jakarta-commons-io.spec	2 Feb 2009 22:56:23 -0000	1.6
--- jakarta-commons-io.spec	4 Feb 2009 18:13:41 -0000	1.7
***************
*** 48,52 ****
  Name:           jakarta-commons-io
  Version:        1.4
! Release:        6%{?dist}
  Epoch:          0
  Summary:        Commons IO Package
--- 48,52 ----
  Name:           jakarta-commons-io
  Version:        1.4
! Release:        7%{?dist}
  Epoch:          0
  Summary:        Commons IO Package
***************
*** 138,147 ****
          install javadoc:javadoc
  %else
- 
  export OPT_JAR_LIST="ant/ant-junit junit"
  export CLASSPATH=
  CLASSPATH=target/classes:target/test-classes:$CLASSPATH
! ant -Dbuild.sysclasspath=only dist
! 
  %endif
  
--- 138,145 ----
          install javadoc:javadoc
  %else
  export OPT_JAR_LIST="ant/ant-junit junit"
  export CLASSPATH=
  CLASSPATH=target/classes:target/test-classes:$CLASSPATH
! %{ant} -Dbuild.sysclasspath=only dist
  %endif
  
***************
*** 155,159 ****
    $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
  %else
! install -pm 644 build/%{base_name}-%{version}.jar \
    $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
  %endif
--- 153,157 ----
    $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
  %else
! install -pm 644 target/dist/%{base_name}-%{version}.jar \
    $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
  %endif
***************
*** 175,180 ****
  cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
  %else
! 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}
  %endif
--- 173,178 ----
  cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
  %else
! unzip -qq target/dist/%{base_name}-%{version}.zip %{base_name}-%{version}/apidocs/* -d $RPM_BUILD_ROOT%{_javadocdir}
! mv $RPM_BUILD_ROOT%{_javadocdir}/%{base_name}-%{version}/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
  rm -r $RPM_BUILD_ROOT%{_javadocdir}/%{base_name}-%{version}
  %endif
***************
*** 245,248 ****
--- 243,249 ----
  
  %changelog
+ * Wed Feb 04 2009 David Walluck <dwalluck at redhat.com> 0:1.4-7
+ - fix ant build
+ 
  * Mon Feb 02 2009 David Walluck <dwalluck at redhat.com> 0:1.4-6
  - fix component-info.xml




More information about the JPackage-commits mailing list