Create a gist now

Instantly share code, notes, and snippets.

*** bacula.spec 2013-09-17 12:58:53.211497049 +0000
--- bacula.spec.patch 2013-09-17 12:58:40.684052443 +0000
***************
*** 355,360 ****
--- 355,363 ----
%define mdv 0
%{?build_mdv:%define mdv 1}
%{?build_mdv:%define mdk 1}
+ # Amazon Linux AMI
+ %define alami 0
+ %{?build_alami:%define alami 1}
# client only build
%define client_only 0
***************
*** 381,386 ****
--- 384,392 ----
%if %{sl3} || %{sl4} || %{sl5}
%define scil 1
%endif
+ %if %{alami}
+ %define rhel 1
+ %endif
# test for a platform definition
***************
*** 450,455 ****
--- 456,464 ----
%if %{rhat} || %{rhel}
%define _dist %(grep Red /etc/redhat-release)
%endif
+ %if %{alami}
+ %define _dist %(grep Amazon /etc/system-release)
+ %endif
%{?DISTNAME:%define _dist %{DISTNAME}}
# only set Disribution if not in opensuse build service, as it sets it itself
***************
*** 574,581 ****
--- 583,594 ----
Conflicts: bacula
Requires: termcap
%else
+ %if %{alami}
+ Requires: compat-libtermcap
+ %else
Requires: libtermcap
%endif
+ %endif
%if %{mysql}
Requires: mysql
***************
*** 853,867 ****
# fixme - make installs the mysql scripts for sqlite build
%if %{sqlite}
! rm -f $RPM_BUILD_ROOT%{script_dir}/startmysql
! rm -f $RPM_BUILD_ROOT%{script_dir}/stopmysql
rm -f $RPM_BUILD_ROOT%{script_dir}/grant_mysql_privileges
%endif
# fixme - make installs the mysql scripts for postgresql build
%if %{postgresql}
! rm -f $RPM_BUILD_ROOT%{script_dir}/startmysql
! rm -f $RPM_BUILD_ROOT%{script_dir}/stopmysql
%endif
# install the init scripts
--- 866,880 ----
# fixme - make installs the mysql scripts for sqlite build
%if %{sqlite}
! #rm -f $RPM_BUILD_ROOT%{script_dir}/startmysql
! #rm -f $RPM_BUILD_ROOT%{script_dir}/stopmysql
rm -f $RPM_BUILD_ROOT%{script_dir}/grant_mysql_privileges
%endif
# fixme - make installs the mysql scripts for postgresql build
%if %{postgresql}
! #rm -f $RPM_BUILD_ROOT%{script_dir}/startmysql
! #rm -f $RPM_BUILD_ROOT%{script_dir}/stopmysql
%endif
# install the init scripts
***************
*** 938,945 ****
rm -f $RPM_BUILD_ROOT%{script_dir}/disk-changer
rm -f $RPM_BUILD_ROOT%{script_dir}/dvd-handler
rm -f $RPM_BUILD_ROOT%{script_dir}/mtx-changer
! rm -f $RPM_BUILD_ROOT%{script_dir}/startmysql
! rm -f $RPM_BUILD_ROOT%{script_dir}/stopmysql
rm -rf $RPM_BUILD_ROOT%{script_dir}/updatedb
rm -f $RPM_BUILD_ROOT%{script_dir}/bconsole
rm -f $RPM_BUILD_ROOT%{script_dir}/bpipe-fd.so
--- 951,958 ----
rm -f $RPM_BUILD_ROOT%{script_dir}/disk-changer
rm -f $RPM_BUILD_ROOT%{script_dir}/dvd-handler
rm -f $RPM_BUILD_ROOT%{script_dir}/mtx-changer
! #rm -f $RPM_BUILD_ROOT%{script_dir}/startmysql
! #rm -f $RPM_BUILD_ROOT%{script_dir}/stopmysql
rm -rf $RPM_BUILD_ROOT%{script_dir}/updatedb
rm -f $RPM_BUILD_ROOT%{script_dir}/bconsole
rm -f $RPM_BUILD_ROOT%{script_dir}/bpipe-fd.so
***************
*** 966,974 ****
%attr(-, root, %{daemon_group}) %{script_dir}/drop_mysql_tables
%attr(-, root, %{daemon_group}) %{script_dir}/update_mysql_tables
%attr(-, root, %{daemon_group}) %{script_dir}/grant_mysql_privileges
! %attr(-, root, %{daemon_group}) %{script_dir}/startmysql
! %attr(-, root, %{daemon_group}) %{script_dir}/stopmysql
%{_libdir}/libbacsql*
%endif
%if %{sqlite}
--- 979,988 ----
%attr(-, root, %{daemon_group}) %{script_dir}/drop_mysql_tables
%attr(-, root, %{daemon_group}) %{script_dir}/update_mysql_tables
%attr(-, root, %{daemon_group}) %{script_dir}/grant_mysql_privileges
! #%attr(-, root, %{daemon_group}) %{script_dir}/startmysql
! #%attr(-, root, %{daemon_group}) %{script_dir}/stopmysql
%{_libdir}/libbacsql*
+ %{_libdir}/libbaccats*
%endif
%if %{sqlite}
***************
*** 1042,1048 ****
%attr(-, root, %{daemon_group}) %config(noreplace) %{sysconf_dir}/bconsole.conf
%attr(-, root, %{daemon_group}) %config(noreplace) %{logwatch_dir}/conf/logfiles/bacula.conf
%attr(-, root, %{daemon_group}) %config(noreplace) %{logwatch_dir}/conf/services/bacula.conf
! %attr(-, root, %{daemon_group}) %config(noreplace) %{script_dir}/query.sql
%attr(-, root, %{daemon_group}) %{script_dir}/sample-query.sql
%attr(-, %{storage_daemon_user}, %{daemon_group}) %dir %{working_dir}
--- 1056,1062 ----
%attr(-, root, %{daemon_group}) %config(noreplace) %{sysconf_dir}/bconsole.conf
%attr(-, root, %{daemon_group}) %config(noreplace) %{logwatch_dir}/conf/logfiles/bacula.conf
%attr(-, root, %{daemon_group}) %config(noreplace) %{logwatch_dir}/conf/services/bacula.conf
! #%attr(-, root, %{daemon_group}) %config(noreplace) %{script_dir}/query.sql
%attr(-, root, %{daemon_group}) %{script_dir}/sample-query.sql
%attr(-, %{storage_daemon_user}, %{daemon_group}) %dir %{working_dir}
***************
*** 1073,1078 ****
--- 1087,1094 ----
%{_mandir}/man8/btape.8.%{manpage_ext}
%{_mandir}/man8/btraceback.8.%{manpage_ext}
%{_mandir}/man8/dbcheck.8.%{manpage_ext}
+ %{_mandir}/man8/bregex.8.%{manpage_ext}
+ %{_mandir}/man8/bwild.8.%{manpage_ext}
%{_mandir}/man1/bsmtp.1.%{manpage_ext}
%{_mandir}/man1/bat.1.%{manpage_ext}
%_prefix/share/doc/*
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment