Changes - j0ke.net Open Build Service

Changes of Revision 21

[-] [+]	Changed	bacula.spec
@@ -182,7 +182,8 @@ 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 \ +# ##CFLAGS="-fno-strict-aliasing $RPM_OPT_FLAGS $(ncurses5-config --cflags)" LDFLAGS="-L/usr/%{_lib}/mysql $(ncurses5-config --libs)" ./configure \ +./configure \ --prefix=%{_prefix} \ --libexecdir=%{_libdir} \ --sbindir=%{_sbindir} \ @@ -201,7 +202,8 @@ } # build mysql version Build --with-mysql --with-postgresql=no -make CFLAGS="$RPM_OPT_FLAGS" +# ##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-dir $RPM_BUILD_ROOT%{_sbindir}/bacula-dir.mysql @@ -210,7 +212,8 @@ # build postgresql version Build --with-postgresql --with-mysql=no -make CFLAGS="$RPM_OPT_FLAGS" +# ##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-dir $RPM_BUILD_ROOT%{_sbindir}/bacula-dir.postgresql @@ -307,12 +310,16 @@ %restart_on_update bacula-dir bacula-sd %preun server-mysql +if [ $1 == 0 ] ; then rm -f %{_sbindir}/bacula-dir rm -f %{_sbindir}/bacula-sd +fi %preun server-postgresql +if [ $1 == 0 ] ; then rm -f %{_sbindir}/bacula-dir rm -f %{_sbindir}/bacula-sd +fi %files