[Jpackage-commits] dist/ant-contrib/JPP-5 ant-contrib.spec, 1.6, 1.7

David Walluck david at ryu.zarb.org
Fri Feb 27 00:47:22 CET 2009


Update of /home/projects/jpackage/cvs/dist/ant-contrib/JPP-5
In directory ryu.zarb.org:/tmp/cvs-serv30759

Modified Files:
	ant-contrib.spec 
Log Message:
- spec cleanup
- bump release to make this newer than Fedora version


Index: ant-contrib.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/ant-contrib/JPP-5/ant-contrib.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -C 2 -d -r1.6 -r1.7
*** ant-contrib.spec	1 Feb 2009 14:05:53 -0000	1.6
--- ant-contrib.spec	26 Feb 2009 23:47:19 -0000	1.7
***************
*** 33,42 ****
  %define section free
  
- Summary:        Collection of tasks for Ant
  Name:           ant-contrib
  Version:        1.0
! Release:        0.b3.2%{dist}
  Epoch:          0
! License:        Apache Software License
  URL:            http://ant-contrib.sourceforge.net/
  Group:          Development/Libraries/Java
--- 33,42 ----
  %define section free
  
  Name:           ant-contrib
  Version:        1.0
! Release:        1.b3.1%{?dist}
  Epoch:          0
! Summary:        Collection of tasks for Ant
! License:        ASL 2.0
  URL:            http://ant-contrib.sourceforge.net/
  Group:          Development/Libraries/Java
***************
*** 44,52 ****
  Source1:        ant-contrib-1.0b3.pom
  Patch0:         ant-contrib-build_xml.patch
! 
! BuildRequires:  jpackage-utils >= 0:1.7.5
! BuildRequires:  java-devel >= 0:1.5.0
  BuildRequires:  ant >= 0:1.6.5
  BuildRequires:  ant-junit
  BuildRequires:  bcel >= 0:5.1
  BuildRequires:  ivy >= 0:1.3.1
--- 44,63 ----
  Source1:        ant-contrib-1.0b3.pom
  Patch0:         ant-contrib-build_xml.patch
! Requires(post): jpackage-utils >= 0:1.7.5
! Requires(postun): jpackage-utils >= 0:1.7.5
! Requires:       ant >= 0:1.6.5
! Requires:       bcel >= 0:5.1
! Requires:       ivy >= 0:1.3.1
! Requires:       jakarta-commons-cli
! Requires:       jakarta-commons-codec
! Requires:       jakarta-commons-httpclient
! Requires:       jakarta-commons-logging
! Requires:       java >= 0:1.5.0
! Requires:       junit >= 0:3.8.2
! Requires:       oro
! Requires:       xerces-j2
  BuildRequires:  ant >= 0:1.6.5
  BuildRequires:  ant-junit
+ BuildRequires:  ant-nodeps
  BuildRequires:  bcel >= 0:5.1
  BuildRequires:  ivy >= 0:1.3.1
***************
*** 55,84 ****
  BuildRequires:  jakarta-commons-httpclient
  BuildRequires:  jakarta-commons-logging
  BuildRequires:  junit >= 0:3.8.2
  BuildRequires:  oro
  BuildRequires:  xerces-j2
- Requires:  java >= 0:1.5.0
- Requires:  ant >= 0:1.6.5
- Requires:  bcel >= 0:5.1
- Requires:  ivy >= 0:1.3.1
- Requires:  jakarta-commons-cli
- Requires:  jakarta-commons-codec
- Requires:  jakarta-commons-httpclient
- Requires:  jakarta-commons-logging
- Requires:  junit >= 0:3.8.2
- Requires:  oro
- Requires:  xerces-j2
  %if %{gcj_support}
! BuildRequires:          java-gcj-compat-devel
! Requires(post):         java-gcj-compat
! Requires(postun):       java-gcj-compat
! %endif
! %if ! %{gcj_support}
  BuildArch:      noarch
  %endif
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
! Requires(post):   jpackage-utils >= 0:1.7.5
! Requires(postun): jpackage-utils >= 0:1.7.5
! 
  
  %description
--- 66,80 ----
  BuildRequires:  jakarta-commons-httpclient
  BuildRequires:  jakarta-commons-logging
+ BuildRequires:  java-devel >= 0:1.5.0
+ BuildRequires:  jpackage-utils >= 0:1.7.5
  BuildRequires:  junit >= 0:3.8.2
  BuildRequires:  oro
  BuildRequires:  xerces-j2
  %if %{gcj_support}
! BuildRequires:  java-gcj-compat-devel
! %else
  BuildArch:      noarch
  %endif
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  
  %description
***************
*** 87,125 ****
  for Apache Ant.
  
! %package        javadoc
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
  
! %description    javadoc
  %{summary}.
  
! %package        manual
  Summary:        Docs for %{name}
  Group:          Development/Documentation
  
! %description    manual
  %{summary}.
  
  %prep
  %setup -q -n %{name}
! for j in $(find . -name "*.jar"); do
!     mv $j $j.no
! done
! ln -sf $(build-classpath ant) lib/ant/jars/ant-1.6.5.jar
! ln -sf $(build-classpath bcel) lib/bcel/jars/bcel-5.1.jar
! ln -sf $(build-classpath commons-cli) lib/commons-cli/jars/commons-cli-1.0.jar
! ln -sf $(build-classpath commons-codec) lib/commons-codec/jars/commons-codec-1.3.jar
! ln -sf $(build-classpath commons-httpclient) lib/commons-httpclient/jars/commons-httpclient-3.0.1.jar
! ln -sf $(build-classpath commons-logging) lib/commons-logging/jars/commons-logging-1.0.4.jar
! ln -sf $(build-classpath ivy) lib/ivy/jars/ivy-1.3.1.jar
! ln -sf $(build-classpath junit) lib/junit/jars/junit-3.8.1.jar
! ln -sf $(build-classpath oro) lib/oro/jars/oro-2.0.8.jar
! ln -sf $(build-classpath xerces-j2) lib/xercesImpl/jars/xercesImpl-2.6.2.jar
  
! %patch0 -b .sav
  
  %build
! ant
! ant test
  
  %install
--- 83,122 ----
  for Apache Ant.
  
! %package javadoc
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
  
! %description javadoc
  %{summary}.
  
! %package manual
  Summary:        Docs for %{name}
  Group:          Development/Documentation
  
! %description manual
  %{summary}.
  
  %prep
  %setup -q -n %{name}
! %patch0 -p0
  
! find . -name "*.jar" | xargs -t rm
! 
! ln -s $(build-classpath ant) lib/ant/jars/ant-1.6.5.jar
! ln -s $(build-classpath bcel) lib/bcel/jars/bcel-5.1.jar
! ln -s $(build-classpath commons-cli) lib/commons-cli/jars/commons-cli-1.0.jar
! ln -s $(build-classpath commons-codec) lib/commons-codec/jars/commons-codec-1.3.jar
! ln -s $(build-classpath commons-httpclient) lib/commons-httpclient/jars/commons-httpclient-3.0.1.jar
! ln -s $(build-classpath commons-logging) lib/commons-logging/jars/commons-logging-1.0.4.jar
! ln -s $(build-classpath ivy) lib/ivy/jars/ivy-1.3.1.jar
! ln -s $(build-classpath junit) lib/junit/jars/junit-3.8.1.jar
! ln -s $(build-classpath oro) lib/oro/jars/oro-2.0.8.jar
! ln -s $(build-classpath xerces-j2) lib/xercesImpl/jars/xercesImpl-2.6.2.jar
  
  %build
! export CLASSPATH=$(build-classpath bcel)
! export OPT_JAR_LIST="`%{__cat} %{_sysconfdir}/ant.d/{junit,nodeps}`"
! %{ant}
! %{ant} -Dbuild.sysclasspath=first test
  
  %install
***************
*** 128,132 ****
  # jars
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
! install -m 644 target/%{name}.jar \
        $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
  ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
--- 125,129 ----
  # jars
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
! install -p -m 644 target/%{name}.jar \
        $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
  ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
***************
*** 134,138 ****
  # poms
  install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
! install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-ant-contrib.pom
  %add_to_maven_depmap %{name} %{name} 1.0b3 JPP %{name}
  
--- 131,135 ----
  # poms
  install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
! install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
  %add_to_maven_depmap %{name} %{name} 1.0b3 JPP %{name}
  
***************
*** 140,144 ****
  install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
  cp -pr target/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
  rm -rf target/docs/api
  
--- 137,142 ----
  install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
  cp -pr target/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
! # FIXME: (dwalluck): breaks -bi --short-circuit
  rm -rf target/docs/api
  
***************
*** 174,181 ****
  %files
  %defattr(0644,root,root,0755)
! %{_javadir}/*.jar
! %doc %{_docdir}/%{name}-%{version}/LICENSE.txt
! %{_datadir}/maven2/poms/*
! %{_mavendepmapfragdir}/*
  %if %{gcj_support}
  %attr(-,root,root) %dir %{_libdir}/gcj/%{name}
--- 172,180 ----
  %files
  %defattr(0644,root,root,0755)
! %doc docs/LICENSE.txt
! %{_javadir}/%{name}-%{version}.jar
! %{_javadir}/%{name}.jar
! %{_datadir}/maven2/poms/JPP-%{name}.pom
! %{_mavendepmapfragdir}/%{name}
  %if %{gcj_support}
  %attr(-,root,root) %dir %{_libdir}/gcj/%{name}
***************
*** 185,197 ****
  
  %files javadoc
! %defattr(-,root,root,-)
! %doc %{_javadocdir}/%{name}-%{version}
! %doc %{_javadocdir}/%{name}
  
  %files manual
! %defattr(-,root,root,-)
  %doc %{_docdir}/%{name}-%{version}
  
  %changelog
  * Mon Jan 12 2009 Ralph Apel <r.apel at r-apel.de> - 0:1.0-0.b3.2.jpp5
  - Relax java-devel BR to >= 1.5.0
--- 184,200 ----
  
  %files javadoc
! %defattr(0644,root,root,0755)
! %{_javadocdir}/%{name}-%{version}
! %{_javadocdir}/%{name}
  
  %files manual
! %defattr(0644,root,root,0755)
  %doc %{_docdir}/%{name}-%{version}
  
  %changelog
+ * Thu Feb 19 2009 David Walluck <dwalluck at redhat.com> 0:1.0-1.b3.1
+ - spec cleanup
+ - bump release to make this newer than Fedora version
+ 
  * Mon Jan 12 2009 Ralph Apel <r.apel at r-apel.de> - 0:1.0-0.b3.2.jpp5
  - Relax java-devel BR to >= 1.5.0




More information about the JPackage-commits mailing list