Changes - j0ke.net Open Build Service

Changes of Revision 22

[-] [+]	Changed	bacula.spec
@@ -182,8 +182,7 @@ touch platforms/suse/bacula.spec.in %install Build() { -# ##CFLAGS="-fno-strict-aliasing $RPM_OPT_FLAGS $(ncurses5-config --cflags)" LDFLAGS="-L/usr/%{_lib}/mysql $(ncurses5-config --libs)" ./configure \ -./configure \ +CFLAGS="-fno-strict-aliasing $RPM_OPT_FLAGS $(ncurses5-config --cflags)" LDFLAGS="-L/usr/%{_lib}/mysql $(ncurses5-config --libs)" ./configure \ --prefix=%{_prefix} \ --libexecdir=%{_libdir} \ --sbindir=%{_sbindir} \ @@ -205,19 +204,20 @@ # ##make CFLAGS="$RPM_OPT_FLAGS" %{__make} make DESTDIR=$RPM_BUILD_ROOT install -mv $RPM_BUILD_ROOT%{_sbindir}/bacula-sd $RPM_BUILD_ROOT%{_sbindir}/bacula-sd.mysql +##mv $RPM_BUILD_ROOT%{_sbindir}/bacula-sd $RPM_BUILD_ROOT%{_sbindir}/bacula-sd.mysql mv $RPM_BUILD_ROOT%{_sbindir}/bacula-dir $RPM_BUILD_ROOT%{_sbindir}/bacula-dir.mysql -mv $RPM_BUILD_ROOT%{_sbindir}/bcopy $RPM_BUILD_ROOT%{_sbindir}/bcopy.mysql +##mv $RPM_BUILD_ROOT%{_sbindir}/bcopy $RPM_BUILD_ROOT%{_sbindir}/bcopy.mysql mv $RPM_BUILD_ROOT%{_sbindir}/bscan $RPM_BUILD_ROOT%{_sbindir}/bscan.mysql # build postgresql version +%{__make} clean Build --with-postgresql --with-mysql=no # ##make CFLAGS="$RPM_OPT_FLAGS" %{__make} make DESTDIR=$RPM_BUILD_ROOT install -mv $RPM_BUILD_ROOT%{_sbindir}/bacula-sd $RPM_BUILD_ROOT%{_sbindir}/bacula-sd.postgresql +#mv $RPM_BUILD_ROOT%{_sbindir}/bacula-sd $RPM_BUILD_ROOT%{_sbindir}/bacula-sd.postgresql mv $RPM_BUILD_ROOT%{_sbindir}/bacula-dir $RPM_BUILD_ROOT%{_sbindir}/bacula-dir.postgresql -mv $RPM_BUILD_ROOT%{_sbindir}/bcopy $RPM_BUILD_ROOT%{_sbindir}/bcopy.postgresql +#mv $RPM_BUILD_ROOT%{_sbindir}/bcopy $RPM_BUILD_ROOT%{_sbindir}/bcopy.postgresql mv $RPM_BUILD_ROOT%{_sbindir}/bscan $RPM_BUILD_ROOT%{_sbindir}/bscan.postgresql # build nagios plugin @@ -277,30 +277,30 @@ if [ -f %{_sbindir}/bacula-dir.mysql ] ;then ln -sf %{_sbindir}/bacula-dir.mysql %{_sbindir}/bacula-dir fi -if [ -f %{_sbindir}/bacula-sd.mysql ] ; then -ln -sf %{_sbindir}/bacula-sd.mysql %{_sbindir}/bacula-sd -fi +##if [ -f %{_sbindir}/bacula-sd.mysql ] ; then +##ln -sf %{_sbindir}/bacula-sd.mysql %{_sbindir}/bacula-sd +##fi if [ -f %{_sbindir}/bscan.mysql ] ; then ln -sf %{_sbindir}/bscan.mysql %{_sbindir}/bscan fi -if [ -f %{_sbindir}/bcopy.mysql ] ; then -ln -sf %{_sbindir}/bcopy.mysql %{_sbindir}/bcopy -fi +##if [ -f %{_sbindir}/bcopy.mysql ] ; then +##ln -sf %{_sbindir}/bcopy.mysql %{_sbindir}/bcopy +##fi %post server-postgresql if [ -f %{_sbindir}/bacula-dir.postgresql ] ;then ln -sf %{_sbindir}/bacula-dir.postgresql %{_sbindir}/bacula-dir fi -if [ -f %{_sbindir}/bacula-sd.postgresql ] ; then -ln -sf %{_sbindir}/bacula-sd.postgresql %{_sbindir}/bacula-sd -fi +##if [ -f %{_sbindir}/bacula-sd.postgresql ] ; then +##ln -sf %{_sbindir}/bacula-sd.postgresql %{_sbindir}/bacula-sd +##fi if [ -f %{_sbindir}/bscan.postgresql ] ; then ln -sf %{_sbindir}/bscan.postgresql %{_sbindir}/bscan fi -if [ -f %{_sbindir}/bcopy.postgresql ] ; then -ln -sf %{_sbindir}/bcopy.postgresql %{_sbindir}/bcopy -fi +##if [ -f %{_sbindir}/bcopy.postgresql ] ; then +##ln -sf %{_sbindir}/bcopy.postgresql %{_sbindir}/bcopy +##fi %postun server-mysql @@ -312,13 +312,13 @@ %preun server-mysql if [ $1 == 0 ] ; then rm -f %{_sbindir}/bacula-dir -rm -f %{_sbindir}/bacula-sd +##rm -f %{_sbindir}/bacula-sd fi %preun server-postgresql if [ $1 == 0 ] ; then rm -f %{_sbindir}/bacula-dir -rm -f %{_sbindir}/bacula-sd +##rm -f %{_sbindir}/bacula-sd fi @@ -361,6 +361,8 @@ %{_sbindir}/btape %{_sbindir}/bwild %{_sbindir}/dbcheck +%{_sbindir}/bcopy +%{_sbindir}/bacula-sd %exclude %{_sbindir}/bacula-sd* %exclude %{_sbindir}/bacula-dir* %exclude %{_sbindir}/bscan* @@ -386,17 +388,17 @@ %files server-postgresql %defattr(-,root,root) -%{_sbindir}/bacula-sd.postgresql +##%{_sbindir}/bacula-sd.postgresql %{_sbindir}/bacula-dir.postgresql %{_sbindir}/bscan.postgresql -%{_sbindir}/bcopy.postgresql +##%{_sbindir}/bcopy.postgresql %files server-mysql %defattr(-,root,root) -%{_sbindir}/bacula-sd.mysql +##%{_sbindir}/bacula-sd.mysql %{_sbindir}/bacula-dir.mysql %{_sbindir}/bscan.mysql -%{_sbindir}/bcopy.mysql +##%{_sbindir}/bcopy.mysql %files -n libbaccfg-%{_libver} %defattr(-,root,root)