[virtuoso-opensource/f14/master: 2/2] - don't autogen.sh things by default
Rex Dieter
rdieter at fedoraproject.org
Fri Jan 14 13:08:02 UTC 2011
commit bf421228dacdc18f266854c8af928dc97dfdae65
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Fri Jan 14 07:09:29 2011 -0600
- don't autogen.sh things by default
virtuoso-opensource.spec | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/virtuoso-opensource.spec b/virtuoso-opensource.spec
index bc7e90b..bbe0c39 100644
--- a/virtuoso-opensource.spec
+++ b/virtuoso-opensource.spec
@@ -7,7 +7,7 @@
Name: virtuoso-opensource
Version: 6.1.2
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A high-performance object-relational SQL database
Group: Applications/Databases
@@ -26,7 +26,6 @@ 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
@@ -42,6 +41,7 @@ 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,9 +88,11 @@ Requires: %{name} = %{version}-%{release}
%setup -q -n virtuoso-opensource-%{!?snap:%{version}}%{?snap:6-%{snap}}
#patch51 -p1 -b .external_iodbc
-%patch52 -p1 -b .nodemos_buildfix
+%if 0%{?_disable_all_vads:1}
+%patch52 -p1 -b .nodemos_buildfix
./autogen.sh
+%endif
find -name "*.jar"
find -name "*.jar" -delete
@@ -196,6 +198,9 @@ rm -rf %{buildroot}
%changelog
+* Thu Jan 13 2011 Rex Dieter <rdieter at fedoraproject.org> 6.1.2-3
+- don't autogen.sh things by default
+
* Thu Oct 21 2010 Pierre-Yves Chibon <pingou at pingoured.fr> 6.1.2-2
- Enable creation subpackage -conductor
- Remove all .jar from sources before building
More information about the scm-commits
mailing list