[virtuoso-opensource/f15/master] Revert "- don't autogen.sh things by default"

[Rex Dieter]

commit 02d25e6cc49d35a44ded3a152484914635b1971e
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Feb 15 13:59:22 2011 -0600

    Revert "- don't autogen.sh things by default"
    
    This reverts commit 2495aeb8abb41997ed7b4a0444e791e279227e99.

 virtuoso-opensource.spec |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)
---
diff --git a/virtuoso-opensource.spec b/virtuoso-opensource.spec
index 4e08375..3f368f1 100644
--- a/virtuoso-opensource.spec
+++ b/virtuoso-opensource.spec
@@ -7,7 +7,7 @@
 
 Name:    virtuoso-opensource
 Version: 6.1.3
-Release: 0.2.%{pre}.%{snap}%{?dist}
+Release: 0.1.%{pre}.%{snap}%{?dist}
 Summary: A high-performance object-relational SQL database
 
 Group:   Applications/Databases
@@ -26,6 +26,7 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Patch51: virtuoso-opensource-6.1.0-external_iodbc.patch
 Patch52: virtuoso-opensource-6.1.0-nodemos_buildfix.patch
 
+BuildRequires: automake libtool
 BuildRequires: bison
 BuildRequires: flex
 BuildRequires: gperf
@@ -41,7 +42,6 @@ BuildRequires: zlib-devel
 Provides: virtuoso = %{version}-%{release}
 
 %if 0%{?_disable_all_vads:1}
-BuildRequires: automake libtool
 Obsoletes: virtuoso-opensource-apps < %{version}-%{release} 
 Obsoletes: virtuoso-opensource-conductor < %{version}-%{release} 
 Obsoletes: virtuoso-opensource-doc < %{version}-%{release} 
@@ -88,11 +88,9 @@ Requires: %{name} = %{version}-%{release}
 %setup -q -n virtuoso-opensource-%{!?snap:%{version}}%{?snap:6-%{snap}}
 
 #patch51 -p1 -b .external_iodbc
-
-%if 0%{?_disable_all_vads:1}
 %patch52 -p1 -b .nodemos_buildfix
+
 ./autogen.sh
-%endif
 
 find -name "*.jar"
 find -name "*.jar" -delete
@@ -198,9 +196,6 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Thu Jan 13 2011 Rex Dieter <rdieter at fedoraproject.org> 6.1.3-0.2.rc3.20110105
-- don't autogen.sh things by default
-
 * Thu Jan 06 2011 Rex Dieter <rdieter at fedoraproject.org> 6.1.3-0.1.rc3.20110105
 - virtuoso-opensource-6-20110105 snapshot