From 2751f9e78aad28bfb7db6dd7d9cca459ec7c252c Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Mon, 3 Jan 2011 10:09:33 +0200 Subject: [PATCH] Update to new upstream version. Guidelines fixes. --- .gitignore | 1 + ant.spec | 197 ++++++++---------------- apache-ant-class-path-in-manifest.patch | 12 +- sources | 2 +- 4 files changed, 76 insertions(+), 136 deletions(-) diff --git a/.gitignore b/.gitignore index 01c4031..2aae8a9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ apache-ant-1.7.1-src.tar.bz2 /apache-ant-1.8.1-src.tar.bz2 +apache-ant-1.8.2-src.tar.bz2 diff --git a/ant.spec b/ant.spec index c61005c..7e1dd2e 100644 --- a/ant.spec +++ b/ant.spec @@ -28,10 +28,10 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -%define with() %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}} -%define without() %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}} -%define bcond_with() %{expand:%%{?_with_%{1}:%%global with_%{1} 1}} -%define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}} +%global with() %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}} +%global without() %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}} +%global bcond_with() %{expand:%%{?_with_%{1}:%%global with_%{1} 1}} +%global bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}} %bcond_with bootstrap @@ -46,18 +46,18 @@ %global ant_home %{_datadir}/ant %global major_version 1.8 -%global cvs_version 1.8.1 +%global cvs_version 1.8.2 Name: ant -Version: 1.8.1 -Release: 9%{?dist} +Version: 1.8.2 +Release: 1%{?dist} Epoch: 0 Summary: Build tool for java Summary(it): Tool per la compilazione di programmi java Summary(fr): Outil de compilation pour java License: ASL 2.0 URL: http://ant.apache.org/ -Group: Development/Build Tools +Group: Development/Tools Source0: http://www.apache.org/dist/ant/source/apache-ant-%{cvs_version}-src.tar.bz2 Source2: apache-ant-%{major_version}.ant.conf @@ -102,6 +102,10 @@ Obsoletes: %{name}-libs < %{epoch}:%{version}-%{release} Provides: %{name}-libs = %{epoch}:%{version}-%{release} Obsoletes: %{name}-core < %{epoch}:%{version}-%{release} Provides: %{name}-core = %{epoch}:%{version}-%{release} +Obsoletes: %{name}-nodeps < %{epoch}:%{version}-%{release} +Provides: %{name}-nodeps = %{epoch}:%{version}-%{release} +Obsoletes: %{name}-trax < %{epoch}:%{version}-%{release} +Provides: %{name}-trax = %{epoch}:%{version}-%{release} Requires(post): jpackage-utils >= 0:1.7.5 Requires(postun): jpackage-utils >= 0:1.7.5 @@ -122,7 +126,7 @@ apache xml. %package jmf Summary: Optional jmf tasks for %{name} -Group: Development/Build Tools +Group: Development/Tools Requires: %{name} = %{epoch}:%{version}-%{release} Requires: %{name}-nodeps = %{epoch}:%{version}-%{release} Provides: ant-jmf = %{epoch}:%{version}-%{release} @@ -133,23 +137,9 @@ Optional jmf tasks for %{name}. %description jmf -l fr Taches jmf optionelles pour %{name}. -%package nodeps -Summary: Optional tasks for %{name} -Group: Development/Build Tools -Requires: %{name} = %{epoch}:%{version}-%{release} -Provides: ant-nodeps = %{epoch}:%{version}-%{release} -Obsoletes: %{name}-trax < %{epoch}:%{version}-%{release} -Provides: %{name}-trax = %{epoch}:%{version}-%{release} - -%description nodeps -Optional tasks for %{name}. - -%description nodeps -l fr -Taches optionelles pour %{name}. - %package swing Summary: Optional swing tasks for %{name} -Group: Development/Build Tools +Group: Development/Tools Requires: %{name} = %{epoch}:%{version}-%{release} Provides: ant-swing = %{epoch}:%{version}-%{release} @@ -163,9 +153,8 @@ Taches swing optionelles pour %{name}. %if %{with_manifest_only} %package manifest-only Summary: Manifest-only jars for %{name} -Group: Development/Build Tools +Group: Development/Tools Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: %{name}-nodeps = %{epoch}:%{version}-%{release} Provides: %{name}-icontract = %{epoch}:%{version}-%{release} Provides: %{name}-netrexx = %{epoch}:%{version}-%{release} Provides: %{name}-starteam = %{epoch}:%{version}-%{release} @@ -181,9 +170,8 @@ Manifest-only jars for %{name}. %package antlr Summary: Optional antlr tasks for %{name} -Group: Development/Build Tools +Group: Development/Tools Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: %{name}-nodeps = %{epoch}:%{version}-%{release} Requires: antlr BuildRequires: antlr Provides: ant-antlr = %{epoch}:%{version}-%{release} @@ -196,9 +184,8 @@ Taches antlr optionelles pour %{name}. %package apache-bsf Summary: Optional apache bsf tasks for %{name} -Group: Development/Build Tools +Group: Development/Tools Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: %{name}-nodeps = %{epoch}:%{version}-%{release} Requires: bsf BuildRequires: bsf Provides: ant-apache-bsf = %{epoch}:%{version}-%{release} @@ -211,9 +198,8 @@ Taches apache bsf optionelles pour %{name}. %package apache-resolver Summary: Optional apache resolver tasks for %{name} -Group: Development/Build Tools +Group: Development/Tools Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: %{name}-nodeps = %{epoch}:%{version}-%{release} Requires: xml-commons-resolver BuildRequires: xml-commons-resolver Provides: ant-apache-resolver = %{epoch}:%{version}-%{release} @@ -226,9 +212,8 @@ Taches apache resolver optionelles pour %{name}. %package commons-logging Summary: Optional commons logging tasks for %{name} -Group: Development/Build Tools +Group: Development/Tools Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: %{name}-nodeps = %{epoch}:%{version}-%{release} Requires: jakarta-commons-logging BuildRequires: jakarta-commons-logging Provides: ant-commons-logging = %{epoch}:%{version}-%{release} @@ -241,9 +226,8 @@ Taches commons logging optionelles pour %{name}. %package commons-net Summary: Optional commons net tasks for %{name} -Group: Development/Build Tools +Group: Development/Tools Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: %{name}-nodeps = %{epoch}:%{version}-%{release} Requires: jakarta-commons-net BuildRequires: jakarta-commons-net Provides: ant-commons-net = %{epoch}:%{version}-%{release} @@ -258,9 +242,8 @@ Taches commons net optionelles pour %{name}. %if 0 %package jai Summary: Optional jai tasks for %{name} -Group: Development/Build Tools +Group: Development/Tools Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: %{name}-nodeps = %{epoch}:%{version}-%{release} Requires: jai BuildRequires: jai Provides: ant-jai = %{epoch}:%{version}-%{release} @@ -274,9 +257,8 @@ Taches jai optionelles pour %{name}. %package apache-bcel Summary: Optional apache bcel tasks for %{name} -Group: Development/Build Tools +Group: Development/Tools Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: %{name}-nodeps = %{epoch}:%{version}-%{release} Requires: bcel BuildRequires: bcel Provides: ant-apache-bcel = %{epoch}:%{version}-%{release} @@ -291,9 +273,8 @@ Taches apache bcel optionelles pour %{name}. %package apache-log4j Summary: Optional apache log4j tasks for %{name} -Group: Development/Build Tools +Group: Development/Tools Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: %{name}-nodeps = %{epoch}:%{version}-%{release} Requires: log4j BuildRequires: log4j Provides: ant-apache-log4j = %{epoch}:%{version}-%{release} @@ -308,9 +289,8 @@ Taches apache log4j optionelles pour %{name}. %package apache-oro Summary: Optional apache oro tasks for %{name} -Group: Development/Build Tools +Group: Development/Tools Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: %{name}-nodeps = %{epoch}:%{version}-%{release} Requires: oro BuildRequires: oro Provides: ant-apache-oro = %{epoch}:%{version}-%{release} @@ -325,9 +305,8 @@ Taches apache oro optionelles pour %{name}. %package apache-regexp Summary: Optional apache regexp tasks for %{name} -Group: Development/Build Tools +Group: Development/Tools Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: %{name}-nodeps = %{epoch}:%{version}-%{release} Requires: regexp BuildRequires: regexp Provides: ant-apache-regexp = %{epoch}:%{version}-%{release} @@ -342,9 +321,8 @@ Taches apache regexp optionelles pour %{name}. %package apache-xalan2 Summary: Optional apache xalan2 tasks for %{name} -Group: Development/Build Tools +Group: Development/Tools Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: %{name}-nodeps = %{epoch}:%{version}-%{release} Requires: regexp BuildRequires: regexp Provides: ant-apache-xalan2 = %{epoch}:%{version}-%{release} @@ -357,9 +335,8 @@ Taches apache xalan2 optionelles pour %{name}. %package javamail Summary: Optional javamail tasks for %{name} -Group: Development/Build Tools +Group: Development/Tools Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: %{name}-nodeps = %{epoch}:%{version}-%{release} Requires: javamail >= 0:1.2-5jpp BuildRequires: javamail >= 0:1.2-5jpp Provides: ant-javamail = %{epoch}:%{version}-%{release} @@ -372,9 +349,8 @@ Taches javamail optionelles pour %{name}. %package jdepend Summary: Optional jdepend tasks for %{name} -Group: Development/Build Tools +Group: Development/Tools Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: %{name}-nodeps = %{epoch}:%{version}-%{release} Requires: jdepend BuildRequires: jdepend Provides: ant-jdepend = %{epoch}:%{version}-%{release} @@ -387,9 +363,8 @@ Taches jdepend optionelles pour %{name}. %package jsch Summary: Optional jsch tasks for %{name} -Group: Development/Build Tools +Group: Development/Tools Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: %{name}-nodeps = %{epoch}:%{version}-%{release} Requires: jsch BuildRequires: jsch Provides: ant-jsch = %{epoch}:%{version}-%{release} @@ -402,9 +377,8 @@ Taches jsch optionelles pour %{name}. %package junit Summary: Optional junit tasks for %{name} -Group: Development/Build Tools +Group: Development/Tools Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: %{name}-nodeps = %{epoch}:%{version}-%{release} Requires: junit Requires: xalan-j2 Provides: ant-junit = %{epoch}:%{version}-%{release} @@ -417,9 +391,8 @@ Taches junit optionelles pour %{name}. %package testutil Summary: Test utility classes for %{name} -Group: Development/Build Tools +Group: Development/Tools Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: %{name}-nodeps = %{epoch}:%{version}-%{release} Requires: junit Provides: ant-testutil = %{epoch}:%{version}-%{release} @@ -428,7 +401,7 @@ Test utility tasks for %{name}. %package scripts Summary: Additional scripts for %{name} -Group: Development/Build Tools +Group: Development/Tools AutoReqProv: no Requires: %{name} = %{epoch}:%{version}-%{release} Requires: %{_bindir}/perl @@ -442,7 +415,7 @@ Scripts additionels pour %{name}. %package manual Summary: Manual for %{name} -Group: Development/Build Tools +Group: Development/Tools %description manual Documentation for %{name}. @@ -455,7 +428,7 @@ Documentation pour %{name}. %package javadoc Summary: Javadoc for %{name} -Group: Development/Documentation +Group: Documentation %description javadoc Javadoc for %{name}. @@ -481,7 +454,7 @@ sed -i -e "s|IMAGE_FILE_TYPE|BINARY_FILE_TYPE|g" src/main/org/apache/tools/ant/t %patch3 -p1 # Fix class-path-in-manifest rpmlint warning -%patch4 -p1 +%patch4 # clean jar files find . -name "*.jar" | %{_bindir}/xargs -t rm @@ -549,20 +522,19 @@ do #Determine where to put it case $jarname in -#These go into %{_javadir}, pom files have different names +#These go into %%{_javadir}, pom files have different names ant | ant-bootstrap | ant-launcher) destdir=$RPM_BUILD_ROOT%{_javadir}; destname="";pomname="JPP-$jarname.pom";; #Bootstracp builds an incomplete ant-junit, don't ship it %if %with bootstrap ant-junit) continue;; %endif -#These go into %{_javadir}/ant +#These go into %%{_javadir}/ant *) destdir=$RPM_BUILD_ROOT%{_javadir}/%{name}; destname="/%{name}"; esac #instal jar - install -m 644 ${jar} ${destdir}/${jarname}-%{version}.jar + install -m 644 ${jar} ${destdir}/${jarname}.jar # jar aliases - ln -sf ${jarname}-%{version}.jar ${destdir}/${jarname}.jar ln -sf ../../java${destname}/${jarname}.jar $RPM_BUILD_ROOT%{ant_home}/lib/${jarname}.jar #bootstrap does not have a pom @@ -599,7 +571,6 @@ cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.conf # OPT_JAR_LIST fragments mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d echo "ant/ant-jmf" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jmf -echo "ant/ant-nodeps" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/nodeps echo "ant/ant-swing" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/swing %if %without bootstrap echo "antlr ant/ant-antlr" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/antlr @@ -607,7 +578,7 @@ echo "bsf ant/ant-apache-bsf" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-b echo "xml-commons-resolver ant/ant-apache-resolver" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-resolver echo "jakarta-commons-logging ant/ant-commons-logging" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/commons-logging echo "jakarta-commons-net ant/ant-commons-net" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/commons-net -#echo "jai ant/ant-jai" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jai +#echo "jai ant/ant-jai" > $RPM_BUILD_ROOT%%{_sysconfdir}/%%{name}.d/jai echo "bcel ant/ant-apache-bcel" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-bcel echo "log4j ant/ant-apache-log4j" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-log4j echo "oro ant/ant-apache-oro" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-oro @@ -653,17 +624,14 @@ rm -rf $RPM_BUILD_ROOT %update_maven_depmap %files -%defattr(0644,root,root,0755) +%defattr(-,root,root,-) %doc KEYS LICENSE NOTICE README WHATSNEW %config(noreplace) %{_sysconfdir}/%{name}.conf %attr(0755,root,root) %{_bindir}/ant %attr(0755,root,root) %{_bindir}/antRun %{_javadir}/%{name}.jar -%{_javadir}/%{name}-%{version}.jar %{_javadir}/%{name}-launcher.jar -%{_javadir}/%{name}-launcher-%{version}.jar %{_javadir}/%{name}-bootstrap.jar -%{_javadir}/%{name}-bootstrap-%{version}.jar %dir %{_javadir}/%{name} %dir %{ant_home} %dir %{ant_home}/etc @@ -683,184 +651,151 @@ rm -rf $RPM_BUILD_ROOT %{ant_home}/lib/%{name}-launcher.jar %{ant_home}/lib/%{name}-bootstrap.jar %dir %{_sysconfdir}/%{name}.d -%{_datadir}/maven2/poms/* +%{_mavenpomdir}/* %{_mavendepmapfragdir}/* %files jmf -%defattr(0644,root,root,0755) +%defattr(-,root,root,-) %{_javadir}/%{name}/%{name}-jmf.jar -%{_javadir}/%{name}/%{name}-jmf-%{version}.jar %{ant_home}/lib/%{name}-jmf.jar %config(noreplace) %{_sysconfdir}/%{name}.d/jmf -%files nodeps -%defattr(0644,root,root,0755) -%{_javadir}/%{name}/%{name}-nodeps.jar -%{_javadir}/%{name}/%{name}-nodeps-%{version}.jar -%{ant_home}/lib/%{name}-nodeps.jar -%config(noreplace) %{_sysconfdir}/%{name}.d/nodeps - %files swing -%defattr(0644,root,root,0755) +%defattr(-,root,root,-) %{_javadir}/%{name}/%{name}-swing.jar -%{_javadir}/%{name}/%{name}-swing-%{version}.jar %{ant_home}/lib/%{name}-swing.jar %config(noreplace) %{_sysconfdir}/%{name}.d/swing %if %without bootstrap %if %{with_manifest_only} %files manifest-only -%defattr(0644,root,root,0755) -%{_javadir}/%{name}/ant-icontract-%{version}.jar +%defattr(-,root,root,-) %{_javadir}/%{name}/ant-icontract.jar -%{_javadir}/%{name}/ant-netrexx-%{version}.jar %{_javadir}/%{name}/ant-netrexx.jar -%{_javadir}/%{name}/ant-starteam-%{version}.jar %{_javadir}/%{name}/ant-starteam.jar -%{_javadir}/%{name}/ant-stylebook-%{version}.jar %{_javadir}/%{name}/ant-stylebook.jar -%{_javadir}/%{name}/ant-vaj-%{version}.jar %{_javadir}/%{name}/ant-vaj.jar -%{_javadir}/%{name}/ant-weblogic-%{version}.jar %{_javadir}/%{name}/ant-weblogic.jar -%{_javadir}/%{name}/ant-xalan1-%{version}.jar %{_javadir}/%{name}/ant-xalan1.jar -%{_javadir}/%{name}/ant-xslp-%{version}.jar %{_javadir}/%{name}/ant-xslp.jar %endif %files antlr -%defattr(0644,root,root,0755) +%defattr(-,root,root,-) %{_javadir}/%{name}/%{name}-antlr.jar -%{_javadir}/%{name}/%{name}-antlr-%{version}.jar %{ant_home}/lib/%{name}-antlr.jar %config(noreplace) %{_sysconfdir}/%{name}.d/antlr %files apache-bsf -%defattr(0644,root,root,0755) +%defattr(-,root,root,-) %{_javadir}/%{name}/%{name}-apache-bsf.jar -%{_javadir}/%{name}/%{name}-apache-bsf-%{version}.jar %{ant_home}/lib/%{name}-apache-bsf.jar %config(noreplace) %{_sysconfdir}/%{name}.d/apache-bsf %files apache-resolver -%defattr(0644,root,root,0755) +%defattr(-,root,root,-) %{_javadir}/%{name}/%{name}-apache-resolver.jar -%{_javadir}/%{name}/%{name}-apache-resolver-%{version}.jar %{ant_home}/lib/%{name}-apache-resolver.jar %config(noreplace) %{_sysconfdir}/%{name}.d/apache-resolver %files commons-logging -%defattr(0644,root,root,0755) +%defattr(-,root,root,-) %{_javadir}/%{name}/%{name}-commons-logging.jar -%{_javadir}/%{name}/%{name}-commons-logging-%{version}.jar %{ant_home}/lib/%{name}-commons-logging.jar %config(noreplace) %{_sysconfdir}/%{name}.d/commons-logging %files commons-net -%defattr(0644,root,root,0755) +%defattr(-,root,root,-) %{_javadir}/%{name}/%{name}-commons-net.jar -%{_javadir}/%{name}/%{name}-commons-net-%{version}.jar %{ant_home}/lib/%{name}-commons-net.jar %config(noreplace) %{_sysconfdir}/%{name}.d/commons-net # Disable as we dont ship the dependencies %if 0 %files jai -%defattr(0644,root,root,0755) +%defattr(-,root,root,-) %{_javadir}/%{name}/%{name}-jai.jar -%{_javadir}/%{name}/%{name}-jai-%{version}.jar %{ant_home}/lib/%{name}-jai.jar %config(noreplace) %{_sysconfdir}/%{name}.d/jai %endif %files apache-bcel -%defattr(0644,root,root,0755) +%defattr(-,root,root,-) %{_javadir}/%{name}/%{name}-apache-bcel.jar -%{_javadir}/%{name}/%{name}-apache-bcel-%{version}.jar %{ant_home}/lib/%{name}-apache-bcel.jar %config(noreplace) %{_sysconfdir}/%{name}.d/apache-bcel %files apache-log4j -%defattr(0644,root,root,0755) +%defattr(-,root,root,-) %{_javadir}/%{name}/%{name}-apache-log4j.jar -%{_javadir}/%{name}/%{name}-apache-log4j-%{version}.jar %{ant_home}/lib/%{name}-apache-log4j.jar %config(noreplace) %{_sysconfdir}/%{name}.d/apache-log4j %files apache-oro -%defattr(0644,root,root,0755) +%defattr(-,root,root,-) %{_javadir}/%{name}/%{name}-apache-oro.jar -%{_javadir}/%{name}/%{name}-apache-oro-%{version}.jar %{ant_home}/lib/%{name}-apache-oro.jar %config(noreplace) %{_sysconfdir}/%{name}.d/apache-oro %{ant_home}/etc/maudit-frames.xsl %files apache-regexp -%defattr(0644,root,root,0755) +%defattr(-,root,root,-) %{_javadir}/%{name}/%{name}-apache-regexp.jar -%{_javadir}/%{name}/%{name}-apache-regexp-%{version}.jar %{ant_home}/lib/%{name}-apache-regexp.jar %config(noreplace) %{_sysconfdir}/%{name}.d/apache-regexp %files apache-xalan2 -%defattr(0644,root,root,0755) +%defattr(-,root,root,-) %{_javadir}/%{name}/%{name}-apache-xalan2.jar -%{_javadir}/%{name}/%{name}-apache-xalan2-%{version}.jar %{ant_home}/lib/%{name}-apache-xalan2.jar %config(noreplace) %{_sysconfdir}/%{name}.d/apache-xalan2 %files javamail -%defattr(0644,root,root,0755) +%defattr(-,root,root,-) %{_javadir}/%{name}/%{name}-javamail.jar -%{_javadir}/%{name}/%{name}-javamail-%{version}.jar %{ant_home}/lib/%{name}-javamail.jar %config(noreplace) %{_sysconfdir}/%{name}.d/javamail %files jdepend -%defattr(0644,root,root,0755) +%defattr(-,root,root,-) %{_javadir}/%{name}/%{name}-jdepend.jar -%{_javadir}/%{name}/%{name}-jdepend-%{version}.jar %{ant_home}/lib/%{name}-jdepend.jar %config(noreplace) %{_sysconfdir}/%{name}.d/jdepend %{ant_home}/etc/jdepend.xsl %{ant_home}/etc/jdepend-frames.xsl %files jsch -%defattr(0644,root,root,0755) +%defattr(-,root,root,-) %{_javadir}/%{name}/%{name}-jsch.jar -%{_javadir}/%{name}/%{name}-jsch-%{version}.jar %{ant_home}/lib/%{name}-jsch.jar %config(noreplace) %{_sysconfdir}/%{name}.d/jsch %files junit -%defattr(0644,root,root,0755) +%defattr(-,root,root,-) %{_javadir}/%{name}/%{name}-junit.jar -%{_javadir}/%{name}/%{name}-junit-%{version}.jar %{ant_home}/lib/%{name}-junit.jar %config(noreplace) %{_sysconfdir}/%{name}.d/junit %{ant_home}/etc/junit-frames.xsl %{ant_home}/etc/junit-noframes.xsl %files testutil -%defattr(0644,root,root,0755) +%defattr(-,root,root,-) %{_javadir}/%{name}/%{name}-testutil.jar -%{_javadir}/%{name}/%{name}-testutil-%{version}.jar %{ant_home}/lib/%{name}-testutil.jar %config(noreplace) %{_sysconfdir}/%{name}.d/testutil %files scripts -%defattr(0755,root,root,0755) +%defattr(-,root,root,-) %{_bindir}/*.pl %{_bindir}/*.py* %files manual -%defattr(0644,root,root,0755) +%defattr(-,root,root,-) %doc docs/* %if %{build_javadoc} %files javadoc -%defattr(0644,root,root,0755) +%defattr(-,root,root,-) %{_javadocdir}/%{name} %endif %endif @@ -868,6 +803,10 @@ rm -rf $RPM_BUILD_ROOT # ----------------------------------------------------------------------------- %changelog +* Mon Jan 3 2011 Alexander Kurtakov 0:1.8.2-1 +- Update to new upstream version. +- Guidelines fixes. + * Sun Nov 28 2010 Ville Skyttä - 0:1.8.1-9 - Install javadocs into unversioned dir (#657879). @@ -907,7 +846,7 @@ rm -rf $RPM_BUILD_ROOT - Fix compile with commons-net 2.0. * Fri Aug 7 2009 Orion Poplawski - 0:1.1.7-11 -- Add links to jar files into %{ant_home} (Bug #179759) +- Add links to jar files into %%{ant_home} (Bug #179759) * Fri Jul 24 2009 Fedora Release Engineering - 0:1.7.1-10.2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/apache-ant-class-path-in-manifest.patch b/apache-ant-class-path-in-manifest.patch index b6ece6a..ef5b592 100644 --- a/apache-ant-class-path-in-manifest.patch +++ b/apache-ant-class-path-in-manifest.patch @@ -1,15 +1,15 @@ ---- apache-ant-1.8.1/build.xml.orig 2010-08-16 14:57:53.000000000 -0600 -+++ apache-ant-1.8.1/build.xml 2010-08-16 14:58:52.066167872 -0600 -@@ -696,10 +696,10 @@ +--- build.xml.orig 2010-12-28 14:45:24.000000000 +0200 ++++ build.xml 2010-12-28 14:46:40.843377673 +0200 +@@ -730,10 +730,10 @@ - -+ ++ - diff --git a/sources b/sources index 0af1f4d..1de48fb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8c31b30f6b9863d1fef4bdf484fc8507 apache-ant-1.8.1-src.tar.bz2 +0d9e108afcd15b820150b8085c96d2b1 apache-ant-1.8.2-src.tar.bz2