From 0db65d2949e8eeebd95e9a4be0868f76b5b4ef67 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Jul 02 2013 08:40:03 +0000
Subject: Merge scripts into main package


---

diff --git a/ant.spec b/ant.spec
index 8670afe..2150abe 100644
--- a/ant.spec
+++ b/ant.spec
@@ -58,6 +58,11 @@ BuildRequires:  xalan-j2
 
 Requires:       jpackage-utils >= 0:1.7.5
 Requires:       java-devel >= 0:1.5.0
+Requires:       perl
+Requires:       python
+
+Obsoletes:      %{name}-scripts < %{epoch}:%{version}-%{release}
+Provides:       %{name}-scripts = %{epoch}:%{version}-%{release}
 
 BuildArch:      noarch
 
@@ -287,19 +292,6 @@ Requires:       junit
 %description testutil
 Test utility tasks for %{name}.
 
-%package scripts
-Summary:        Additional scripts for %{name}
-AutoReqProv:    no
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires:       %{_bindir}/perl
-Requires:       %{_bindir}/python
-
-%description scripts
-Additional Perl and Python scripts for %{name}.
-
-%description scripts -l fr
-Scripts additionels pour %{name}.
-
 %package manual
 Summary:        Manual for %{name}
 
@@ -461,6 +453,8 @@ cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}.conf
 %attr(0755,root,root) %{_bindir}/ant
 %attr(0755,root,root) %{_bindir}/antRun
+%attr(0755,root,root) %{_bindir}/*.pl
+%attr(0755,root,root) %{_bindir}/*.py*
 %{_javadir}/%{name}.jar
 %{_javadir}/%{name}-launcher.jar
 %{_javadir}/%{name}-bootstrap.jar
@@ -589,10 +583,6 @@ cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 %{ant_home}/lib/%{name}-testutil.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/testutil
 
-%files scripts
-%attr(0755,root,root) %{_bindir}/*.pl
-%attr(0755,root,root) %{_bindir}/*.py*
-
 %files manual
 %doc LICENSE NOTICE
 %doc manual/*
@@ -617,6 +607,7 @@ cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 - Remove bootstrap code, resolves: rhbz#915437
 - Fail the build if any of JARs is empty
 - Skip running tests that fail on Koji, resolves: rhbz#979496
+- Merge scripts into main package, resolves: rhbz#798975
 
 * Mon Jun 03 2013 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.9.1-2
 - Enable unit tests