[bacula/el5] bacula.spec
Simone Caronni
slaanesh at fedoraproject.org
Wed Jul 18 14:54:37 UTC 2012
commit cf1d2326208f2d04a5f295c7c7d8a8e61a0b39e1
Author: Simone Caronni <negativo17 at gmail.com>
Date: Wed Jul 18 16:54:31 2012 +0200
bacula.spec
bacula.spec | 37 ++++++++-----------------------------
1 files changed, 8 insertions(+), 29 deletions(-)
---
diff --git a/bacula.spec b/bacula.spec
index 91d433e..e062ca9 100644
--- a/bacula.spec
+++ b/bacula.spec
@@ -373,29 +373,7 @@ fi
# Build sqlite director
pushd %{name}-sqlite
-%if 0%{?fedora}%{?rhel}
- %if 0%{?fedora}
- %if "%{fedora}" >= "5"
- %define sqlite_suffix 3
- build --with-sqlite3
- %else
- build --with-sqlite
- %endif
- %endif
- %if 0%{?rhel}
- %if "%{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
popd
# Build MySQL director
@@ -910,12 +888,12 @@ fi
%{_sbindir}/%{name}-dir.sqlite
%{_sbindir}/dbcheck.sqlite
# DANGER Will Robinson. Bacula has versioned sqlite filenames
-%{_libexecdir}/%{name}/create_sqlite%{?sqlite_suffix}_database
-%{_libexecdir}/%{name}/drop_sqlite%{?sqlite_suffix}_database
-%{_libexecdir}/%{name}/drop_sqlite%{?sqlite_suffix}_tables
-%{_libexecdir}/%{name}/grant_sqlite%{?sqlite_suffix}_privileges
-%{_libexecdir}/%{name}/make_sqlite%{?sqlite_suffix}_tables
-%{_libexecdir}/%{name}/update_sqlite%{?sqlite_suffix}_tables
+%{_libexecdir}/%{name}/create_sqlite3_database
+%{_libexecdir}/%{name}/drop_sqlite3_database
+%{_libexecdir}/%{name}/drop_sqlite3_tables
+%{_libexecdir}/%{name}/grant_sqlite3_privileges
+%{_libexecdir}/%{name}/make_sqlite3_tables
+%{_libexecdir}/%{name}/update_sqlite3_tables
%{_libexecdir}/%{name}/create_%{name}_database.sqlite
%{_libexecdir}/%{name}/drop_%{name}_database.sqlite
%{_libexecdir}/%{name}/drop_%{name}_tables.sqlite
@@ -995,6 +973,7 @@ fi
- Add devel subpackage.
- Remove docs subpackage.
- Rename patches and delete unused ones from git.
+- Remove conditionals for sqlite versions as this package will die with RHEL 5.
* Wed Jul 18 2012 Simone Caronni <negativo17 at gmail.com> 2.4.4-3
- Removed commented stuff that will never come back.
More information about the scm-commits
mailing list