[bacula/f16] Remove SQLlite 2 for RHEL 4

Simone Caronni slaanesh at fedoraproject.org
Fri Dec 23 09:44:47 UTC 2011


commit 46a44b99a16463d7bb405685bc27864a9be99e8b
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Fri Dec 23 10:44:35 2011 +0100

    Remove SQLlite 2 for RHEL 4

 bacula.spec |   42 ++++++++++--------------------------------
 1 files changed, 10 insertions(+), 32 deletions(-)
---
diff --git a/bacula.spec b/bacula.spec
index b7fd93c..b6a4867 100644
--- a/bacula.spec
+++ b/bacula.spec
@@ -410,38 +410,15 @@ fi
 
 # Build sqlite director
 pushd bacula-sqlite
-%if 0%{?fedora}%{?rhel}
-	%if 0%{?fedora}
-		%if 0%{fedora} >= 5
-			%define	sqlite_suffix 3
-			build --with-sqlite3
-		%else
-			build --with-sqlite
-		%endif
-	%endif
-	%if 0%{?rhel}
-		%if 0%{rhel} >=  5
-			%define	sqlite_suffix 3
-			build --with-sqlite3
-		%else
-			build --with-sqlite
-		%endif
-	%endif
-%else
-	echo 'Neither %%{fedora} nor %%{rhel} are defined.'
-	echo 'Please call rpmbuild with at least --define "fedora 7" or --define "rhel 5"'
-	echo 'depending on your release version you are building on.'
-	exit 1
-%endif
+	build --with-sqlite3
 
 #Regen bat qt project file and build
-pushd src
-pushd qt-console
-/usr/bin/qmake-qt4
-make
-popd
-popd
-
+	pushd src
+		pushd qt-console
+			/usr/bin/qmake-qt4
+			make
+		popd
+	popd
 popd
 
 # Build MySQL director
@@ -456,8 +433,8 @@ popd
 
 # Build the docs
 pushd bacula-docs-%{version}
- %configure --with-bacula=%{_builddir}/bacula-%{version}/bacula-%{version}
- make
+	%configure --with-bacula=%{_builddir}/bacula-%{version}/bacula-%{version}
+	make
 popd
 
 %install
@@ -962,6 +939,7 @@ fi
 - Enable POSIX.1e capabilities.
 - Enable LZO compression.
 - Enable readline support and tab completion in bconsole.
+- Remove SQLite 2 support for RHEL 4.
 
 * Thu Dec 22 2011 Lukáš Nykrýn <lnykryn at redhat.com> - 5.0.3-14
 - removed duplicity from logrotate file (#755970)


More information about the scm-commits mailing list