[Jpackage-commits] rpms/free/jakarta-commons-io jakarta-commons-io.spec, 1.7, 1.8

jpackage jpackage at ryu.zarb.org
Wed Feb 4 19:19:08 CET 2009


Update of /home/projects/jpackage/cvs/rpms/free/jakarta-commons-io
In directory ryu.zarb.org:/tmp/Aj03NHu860/rpms/free/jakarta-commons-io

Modified Files:
	jakarta-commons-io.spec 
Log Message:
1.4-7.jpp6

Index: jakarta-commons-io.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/jakarta-commons-io/jakarta-commons-io.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -C 2 -d -r1.7 -r1.8
*** jakarta-commons-io.spec	22 Jan 2009 00:19:48 -0000	1.7
--- jakarta-commons-io.spec	4 Feb 2009 18:19:06 -0000	1.8
***************
*** 34,38 ****
  %define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
  
! %bcond_without maven
  %bcond_without repolib
  
--- 34,38 ----
  %define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
  
! %bcond_with maven
  %bcond_without repolib
  
***************
*** 48,52 ****
  Name:           jakarta-commons-io
  Version:        1.4
! Release:        5%{?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
***************
*** 184,190 ****
  %{__install} -d -m 0755 %{buildroot}%{repodir}
  %{__install} -d -m 0755 %{buildroot}%{repodirlib}
! %{__install} -p -m 0644 %{SOURCE2} %{buildroot}%{repodir}/component-info.xml
  tag=`/bin/echo %{name}-%{version}-%{release} | %{__sed} 's|\.|_|g'`
  %{__sed} -i "s/@TAG@/$tag/g" %{buildroot}%{repodir}/component-info.xml
  %{__install} -d -m 0755 %{buildroot}%{repodirsrc}
  %{__install} -p -m 0644 %{SOURCE0} %{buildroot}%{repodirsrc}
--- 182,189 ----
  %{__install} -d -m 0755 %{buildroot}%{repodir}
  %{__install} -d -m 0755 %{buildroot}%{repodirlib}
! %{__install} -p -m 0644 %{SOURCE5} %{buildroot}%{repodir}/component-info.xml
  tag=`/bin/echo %{name}-%{version}-%{release} | %{__sed} 's|\.|_|g'`
  %{__sed} -i "s/@TAG@/$tag/g" %{buildroot}%{repodir}/component-info.xml
+ %{__sed} -i "s/@VERSION@/%{version}-brew/g" %{buildroot}%{repodir}/component-info.xml
  %{__install} -d -m 0755 %{buildroot}%{repodirsrc}
  %{__install} -p -m 0644 %{SOURCE0} %{buildroot}%{repodirsrc}
***************
*** 193,197 ****
  %{__install} -p -m 0644 %{SOURCE3} %{buildroot}%{repodirsrc}
  %{__install} -p -m 0644 %{SOURCE4} %{buildroot}%{repodirsrc}
- %{__install} -p -m 0644 %{SOURCE5} %{buildroot}%{repodirsrc}
  %{__cp} -p %{buildroot}%{_javadir}/%{name}-%{version}.jar %{buildroot}%{repodirlib}/%{base_name}.jar
  %endif
--- 192,195 ----
***************
*** 245,248 ****
--- 243,252 ----
  
  %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
+ 
  * Wed Jan 21 2009 David Walluck <dwalluck at redhat.com> 0:1.4-5
  - fix License




More information about the JPackage-commits mailing list