[java-sig-commits] [ant] Make scripts executable.
Alexander Kurtakov
akurtakov at fedoraproject.org
Wed Jul 6 10:49:30 UTC 2011
commit a40f6fca1bf6469e6b80baea323108916f9029f2
Author: Alexander Kurtakov <akurtako at redhat.com>
Date: Wed Jul 6 13:49:01 2011 +0300
Make scripts executable.
Adapt to current guidelines.
ant.spec | 70 ++++++++++---------------------------------------------------
1 files changed, 12 insertions(+), 58 deletions(-)
---
diff --git a/ant.spec b/ant.spec
index f8ad41d..c532588 100644
--- a/ant.spec
+++ b/ant.spec
@@ -50,7 +50,7 @@
Name: ant
Version: 1.8.2
-Release: 5%{?dist}
+Release: 6%{?dist}
Epoch: 0
Summary: Build tool for java
Summary(it): Tool per la compilazione di programmi java
@@ -85,30 +85,15 @@ Requires: xml-commons-jaxp-1.3-apis
%endif
BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Obsoletes: ant-optional < %{epoch}:%{version}-%{release}
-Provides: ant-optional = %{epoch}:%{version}-%{release}
-Obsoletes: ant-optional-full < %{epoch}:%{version}-%{release}
-Provides: ant-optional-full = %{epoch}:%{version}-%{release}
# Allow subpackages not in RHEL to be installed from JPackage
Provides: %{name} = %{epoch}:%{version}-%{release}
-# RHUG
-Obsoletes: ant-devel < %{epoch}:%{version}-%{release}
-Provides: ant-devel = %{epoch}:%{version}-%{release}
-# Mandriva
-Conflicts: j2sdk-ant
-# RHEL3 and FC2
-Obsoletes: %{name}-libs < %{epoch}:%{version}-%{release}
-Provides: %{name}-libs = %{epoch}:%{version}-%{release}
-Obsoletes: %{name}-core < %{epoch}:%{version}-%{release}
-Provides: %{name}-core = %{epoch}:%{version}-%{release}
+#Drop in F-18
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
+
%description
Ant is a platform-independent build tool for java. It's used by apache
@@ -507,14 +492,12 @@ sh ./build.sh --noconfig jars
# -----------------------------------------------------------------------------
%install
-rm -rf $RPM_BUILD_ROOT
-
# ANT_HOME and subdirs
mkdir -p $RPM_BUILD_ROOT%{ant_home}/{lib,etc}
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
for jar in build/lib/*.jar
do
@@ -542,7 +525,7 @@ do
[ $jarname == ant-bootstrap ] && continue
#install pom
- install -m 644 src/etc/poms/${jarname}/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/${pomname}
+ install -m 644 src/etc/poms/${jarname}/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/${pomname}
%add_to_maven_depmap org.apache.ant ${jarname} %{version} JPP${destname} ${jarname}
done
@@ -551,7 +534,7 @@ done
%add_to_maven_depmap org.apache.ant ant-nodeps %{version} JPP ant
#ant-parent pom
-install -m 644 src/etc/poms/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}-parent.pom
+install -m 644 src/etc/poms/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-parent.pom
%add_to_maven_depmap org.apache.ant ant-parent %{version} JPP ant-parent
# scripts: remove dos and os/2 scripts
@@ -617,19 +600,7 @@ find $RPM_BUILD_ROOT%{_datadir}/ant/etc -type f -name "*.xsl" \
| xargs -t rm
%endif
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-# -----------------------------------------------------------------------------
-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
%files
-%defattr(-,root,root,-)
%doc KEYS LICENSE NOTICE README WHATSNEW
%config(noreplace) %{_sysconfdir}/%{name}.conf
%attr(0755,root,root) %{_bindir}/ant
@@ -660,13 +631,11 @@ rm -rf $RPM_BUILD_ROOT
%{_mavendepmapfragdir}/*
%files jmf
-%defattr(-,root,root,-)
%{_javadir}/%{name}/%{name}-jmf.jar
%{ant_home}/lib/%{name}-jmf.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/jmf
%files swing
-%defattr(-,root,root,-)
%{_javadir}/%{name}/%{name}-swing.jar
%{ant_home}/lib/%{name}-swing.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/swing
@@ -674,7 +643,6 @@ rm -rf $RPM_BUILD_ROOT
%if %without bootstrap
%if %{with_manifest_only}
%files manifest-only
-%defattr(-,root,root,-)
%{_javadir}/%{name}/ant-icontract.jar
%{_javadir}/%{name}/ant-netrexx.jar
%{_javadir}/%{name}/ant-starteam.jar
@@ -686,19 +654,16 @@ rm -rf $RPM_BUILD_ROOT
%endif
%files antlr
-%defattr(-,root,root,-)
%{_javadir}/%{name}/%{name}-antlr.jar
%{ant_home}/lib/%{name}-antlr.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/antlr
%files apache-bsf
-%defattr(-,root,root,-)
%{_javadir}/%{name}/%{name}-apache-bsf.jar
%{ant_home}/lib/%{name}-apache-bsf.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/apache-bsf
%files apache-resolver
-%defattr(-,root,root,-)
%{_javadir}/%{name}/%{name}-apache-resolver.jar
%{ant_home}/lib/%{name}-apache-resolver.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/apache-resolver
@@ -710,7 +675,6 @@ rm -rf $RPM_BUILD_ROOT
%config(noreplace) %{_sysconfdir}/%{name}.d/commons-logging
%files commons-net
-%defattr(-,root,root,-)
%{_javadir}/%{name}/%{name}-commons-net.jar
%{ant_home}/lib/%{name}-commons-net.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/commons-net
@@ -718,51 +682,43 @@ rm -rf $RPM_BUILD_ROOT
# Disable as we dont ship the dependencies
%if 0
%files jai
-%defattr(-,root,root,-)
%{_javadir}/%{name}/%{name}-jai.jar
%{ant_home}/lib/%{name}-jai.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/jai
%endif
%files apache-bcel
-%defattr(-,root,root,-)
%{_javadir}/%{name}/%{name}-apache-bcel.jar
%{ant_home}/lib/%{name}-apache-bcel.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/apache-bcel
%files apache-log4j
-%defattr(-,root,root,-)
%{_javadir}/%{name}/%{name}-apache-log4j.jar
%{ant_home}/lib/%{name}-apache-log4j.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/apache-log4j
%files apache-oro
-%defattr(-,root,root,-)
%{_javadir}/%{name}/%{name}-apache-oro.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(-,root,root,-)
%{_javadir}/%{name}/%{name}-apache-regexp.jar
%{ant_home}/lib/%{name}-apache-regexp.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/apache-regexp
%files apache-xalan2
-%defattr(-,root,root,-)
%{_javadir}/%{name}/%{name}-apache-xalan2.jar
%{ant_home}/lib/%{name}-apache-xalan2.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/apache-xalan2
%files javamail
-%defattr(-,root,root,-)
%{_javadir}/%{name}/%{name}-javamail.jar
%{ant_home}/lib/%{name}-javamail.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/javamail
%files jdepend
-%defattr(-,root,root,-)
%{_javadir}/%{name}/%{name}-jdepend.jar
%{ant_home}/lib/%{name}-jdepend.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/jdepend
@@ -770,13 +726,11 @@ rm -rf $RPM_BUILD_ROOT
%{ant_home}/etc/jdepend-frames.xsl
%files jsch
-%defattr(-,root,root,-)
%{_javadir}/%{name}/%{name}-jsch.jar
%{ant_home}/lib/%{name}-jsch.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/jsch
%files junit
-%defattr(-,root,root,-)
%{_javadir}/%{name}/%{name}-junit.jar
%{ant_home}/lib/%{name}-junit.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/junit
@@ -784,23 +738,19 @@ rm -rf $RPM_BUILD_ROOT
%{ant_home}/etc/junit-noframes.xsl
%files testutil
-%defattr(-,root,root,-)
%{_javadir}/%{name}/%{name}-testutil.jar
%{ant_home}/lib/%{name}-testutil.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/testutil
%files scripts
-%defattr(-,root,root,-)
-%{_bindir}/*.pl
-%{_bindir}/*.py*
+%attr(0755,root,root) %{_bindir}/*.pl
+%attr(0755,root,root) %{_bindir}/*.py*
%files manual
-%defattr(-,root,root,-)
%doc docs/*
%if %{build_javadoc}
%files javadoc
-%defattr(-,root,root,-)
%{_javadocdir}/%{name}
%endif
%endif
@@ -808,6 +758,10 @@ rm -rf $RPM_BUILD_ROOT
# -----------------------------------------------------------------------------
%changelog
+* Wed Jul 6 2011 Alexander Kurtakov <akurtako at redhat.com> 0:1.8.2-6
+- Make scripts executable.
+- Adapt to current guidelines.
+
* Thu Mar 10 2011 Alexander Kurtakov <akurtako at redhat.com> 0:1.8.2-5
- Fix xalan-j2 subpackage path.
More information about the java-sig-commits
mailing list