moved bat & tray monitor out of /usr/sbin to /usr/bin and added some doc files in a docs-package

• Files Changed
• Browse Source

changelog adapted

• Files Changed
• Browse Source

changed location of mtx-changer.conf to _syscondir/bacula/

• Files Changed
• Browse Source

added suse specific files, changed some paths, patch mx-changer.conf

• Files Changed
• Browse Source

fixed some version dependent ifs and remove bacula-gui-source (containing baculum)
-This line, and those below, will be ignored--

D    bacula-gui-13.0.4.tar.gz
M    bacula.spec

Diff for working copy: .
Index: bacula.spec
===================================================================

--- bacula.spec	(revision 10)
+++ bacula.spec	(working copy)
@@ -18,7 +18,7 @@
 BuildRequires: readline-devel libacl-devel libattr-devel openssl-devel
 BuildRequires: lzo-devel zlib-devel
 BuildRequires: postgresql-devel mysql-devel
-%if 0%{?suse_version} > 150000
+%if 0%{?suse_version} > 1500
 BuildRequires: pkgconfig(Qt5Gui)
 BuildRequires: libqt5-qtbase-common-devel
 BuildRequires: libQt5Widgets-devel
@@ -114,9 +114,7 @@
 The Bacula Console service is the program that allows the administrator
 or user to communicate with the Bacula Director.
 
-# %if  (0%{?suse_version} > 1500) || (0%{?sle_version} >= 150300 && 0%{?is_opensuse} )
-# do nothing
-#%else
+%if  (0%{?suse_version} > 1500) || (0%{?sle_version} >= 150300 )
 %package console-bat
 Group:         Productivity/Archiving/Backup
 Summary:       Qt-based Bacula console
@@ -127,7 +125,7 @@
 or user to communicate with the Bacula Director.
 
 This package contains Qt5-based console.
-#%endif
+%endif
 
 %package mysql
 Group:         Productivity/Archiving/Backup
@@ -187,8 +185,6 @@
 %setup -q -n %{realname}-%{realver}
 echo "/bin/true" > src/cats/install-default-backend.in
 sed -ri '/^\s{8}/ s/^\s{8}/\t/' platforms/systemd/Makefile.in
-echo suse_version = %{?suse_version} sle_verson = %{?sle_version} is_opensuse = %{?is_opensuse} 
-
 
 %build
 export QTVER=5
@@ -196,22 +192,21 @@
 export DISTNAME='openSUSE'
 
 %if 0%{?suse_version} > 1500
-%if 0%{?sle_version} == 150300 && 0%{?is_opensuse}
+%if 0%{?sle_version} == 150300 
 export DISTVER='15.3'
 export QMAKE="qmake-qt${QTVER}"
 %else
-%if 0%{?sle_version} == 150400 && 0%{?is_opensuse} 
+%if 0%{?sle_version} == 150400 
 export DISTVER='15.4'
 export QMAKE="qmake-qt${QTVER}"
-%if 0%{?sle_version} == 150500 && 0%{?is_opensuse} 
+%if 0%{?sle_version} == 150500 
 export DISTVER='15.5'
 export QMAKE="qmake-qt${QTVER}"
-%else
-export DISTVER='15.2'
-%endif
-%endif
-%endif
-%endif
+%endif
+%endif
+%endif
+%endif
+
 %configure \
  --sysconfdir=%{_sysconfdir}/bacula \
  --disable-static \
@@ -282,22 +277,16 @@
 ### we need this to install the binary and not the libtool script for bat and tray-monitor
 %define libtool_install ./libtool --tag=CXX --mode=install install
 
-#%if (0%{?suse_version} > 1500) || (0%{?sle_version} > 150200 && 0%{?is_opensuse})
-#find %{buildroot}%{_mandir}/man1/ -name "bat.1*" -exec rm -f {} \;
-#%if (0%{?suse_version} > 1500 )
-#rm %{buildroot}/usr/libexec/bacula/bacula-tray-monitor.desktop
-#%else
-#rm %{buildroot}/usr/lib/bacula/bacula-tray-monitor.desktop
-#%endif
-#%else
-### this to installs the binary and not the libtool script for bat and tray-monitor
+%if (0%{?suse_version} > 1500) || (0%{?sle_version} > 150200 && 0%{?is_opensuse})
+### this is needed to install the binary and not the libtool script for bat and tray-monitor
 %{libtool_install} -D -m750 src/qt-console/bat %{buildroot}%{_sbindir}/bat
 %{libtool_install} -D -m750 src/qt-console/tray-monitor/bacula-tray-monitor %{buildroot}%{_sbindir}/bacula-tray-monitor
 %{__install} -D -m644 scripts/bat.desktop                %{buildroot}%{_datadir}/applications/bat.desktop
 %{__install} -D -m644 src/qt-console/images/bat_icon.png %{buildroot}%{_datadir}/pixmaps/bat_icon.png
 %suse_update_desktop_file -r -G "Bacula console" bat System Backup Qt
 rm %{buildroot}/usr/lib/bacula/bacula-tray-monitor.desktop
-#%endif
+%endif
+
 %if 0%{!?_unitdir:1} && 0%{?suse_version}
 %{__ln_s} %{_initrddir}/bacula-dir %{buildroot}%{_sbindir}/rcbacula-dir
 %{__ln_s} %{_initrddir}/bacula-fd  %{buildroot}%{_sbindir}/rcbacula-fd
@@ -328,7 +317,7 @@
 %files common
 %defattr(-,root,root)
 %doc AUTHORS LICENSE LICENSE-FAQ LICENSE-FOSS ReleaseNotes SUPPORT
-%dir %attr(0755,root,root) %{_sysconfdir}/bacula/bsr/
+%dir %attr(0755,root,root) %{_rundir}/bacula/bsr/
 %dir %attr(0755,root,root) %{_sysconfdir}/bacula/
 %dir %attr(0755,root,root) %{_libdir}/bacula/
 %dir %attr(0755,root,root) %{_libexecdir}/bacula/
@@ -470,9 +459,7 @@
 %attr(0755,bacula,bacula) %{_libexecdir}/bacula/baculabackupreport
 %doc %{_mandir}/man8/bconsole.8*
 
-#%if (0%{?suse_version} > 1500) || (0%{?sle_version} >= 150300 && 0%{?is_opensuse})
-# do nothing
-#%else
+%if (0%{?suse_version} > 1500) || (0%{?sle_version} >= 150300 && 0%{?is_opensuse})
 %files console-bat
 %defattr(-,root,root)
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/bacula/bat.conf
@@ -483,7 +470,7 @@
 %{_datadir}/applications/bat.desktop
 %{_datadir}/pixmaps/bat_icon.png
 %doc %{_mandir}/man1/bat.1*
-#%endif
+%endif
 
 %files mysql
 %defattr(-,root,root)

Index: bacula-gui-13.0.4.tar.gz
===================================================================
Binary file 'bacula-gui-13.0.4.tar.gz' deleted.

• Files Changed
• Browse Source

added rpmlintrc to prevent errors due to the dummy libs needed

• Files Changed
• Browse Source

fixed a typo in spec-file

• Files Changed
• Browse Source

added missing QT-5 requirements, fixed the libtool install of bat and bacula-tray-monitor

• Files Changed
• Browse Source

fixed worng ..lib/qt4/bin path

• Files Changed
• Browse Source

4ce all instances of qmake by libqt5-qtbase-common-devel

• Files Changed
• Browse Source

use libqt5-qtbase-common-devel instead of qmake

• Files Changed
• Browse Source

added qmake directly

• Files Changed
• Browse Source

added qt

• Files Changed
• Browse Source

• Files Changed
• Browse Source

- initial version

• Browse Source