Author: arekm Date: Sat Oct 27 21:41:12 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- build with bat (qt4 console)
---- Files affected:
SPECS:
bacula.spec (1.71 -> 1.72)
---- Diffs:
================================================================
Index: SPECS/bacula.spec
diff -u SPECS/bacula.spec:1.71 SPECS/bacula.spec:1.72
--- SPECS/bacula.spec:1.71 Thu Oct 11 21:53:33 2007
+++ SPECS/bacula.spec Sat Oct 27 23:41:07 2007
@@ -8,7 +8,7 @@
%bcond_without console_wx # wx-console program
%bcond_without gnome # gnome-console program
%bcond_without sqlite # use sqlite
-%bcond_with bat # bat Qt4 GUI
+%bcond_without bat # bat Qt4 GUI
%bcond_with mysql # use mysql
%bcond_with pgsql # use PostgreSQL
%bcond_with python
@@ -86,7 +86,9 @@
BuildRequires: python-static
%endif
%if %{with bat}
-BuildRequires: qwt-devel
+BuildRequires: qt4-qmake
+BuildRequires: qwt-devel >= 5.0.2-2
+BuildRequires: QtCore-devel
BuildRequires: QtGui-devel
%endif
BuildRequires: readline-devel
@@ -276,6 +278,27 @@
użytkownikowi komunikowanie się z programem Bacula Director. To jest
interfejs graficzny oparty na GNOME.
+%package console-qt4
+Summary: Bacula QT4 Console
+Summary(pl.UTF-8): Konsola Baculi oparta na QT4
+Group: Networking/Utilities
+Requires(post): sed >= 4.0
+Requires: %{name}-common = %{epoch}:%{version}-%{release}
+
+%description console-qt4
+Bacula - It comes by night and sucks the vital essence from your
+computers.
+
+Bacula Console is the program that allows the administrator or user to
+communicate with the Bacula Director. This is the QT4 GUI interface.
+
+%description console-qt4 -l pl.UTF-8
+Bacula - przychodzi nocą i wysysa żywotny ekstrakt z komputerów.
+
+Bacula Console to program umożliwiający administratorowi lub
+użytkownikowi komunikowanie się z programem Bacula Director. To jest
+interfejs graficzny oparty na QT4.
+
%package tray-monitor
Summary: Bacula Tray Monitor
Group: Networking/Utilities
@@ -451,6 +474,13 @@
--with-mon-fd-password="#FAKE-mon-fd-password#" \
--with-mon-sd-password="#FAKE-mon-sd-password#" \
--with-openssl
+
+%if %{with bat}
+cd src/qt-console
+qt4-qmake bat.pro
+cd ../..
+%endif
+
%{__make}
%if %{with rescue}
@@ -496,6 +526,11 @@
scripts/bacula-tray-monitor.desktop >
$RPM_BUILD_ROOT%{_desktopdir}/bacula-tray-monitor.desktop
%endif
+%if %{with bat}
+install src/qt-console/bat $RPM_BUILD_ROOT%{_sbindir}
+install scripts/bat.desktop $RPM_BUILD_ROOT%{_desktopdir}
+%endif
+
%if %{with rescue}
# install the rescue stuff, these are the rescue scripts
install rescue/linux/floppy/backup.etc.list
$RPM_BUILD_ROOT%{_sysconfdir}/rescue
@@ -677,6 +712,15 @@
done
sed -i -e"s:--hostname--:`hostname`:" *.conf *.conf.rpmnew 2>/dev/null || :
+%post console-qt4
+echo "Updating Bacula passwords and names..."
+cd /etc/bacula
+for f in *-password ; do
+ p=`cat $f`
+ sed -i -e"s:#FAKE-$f#:$p:" *.conf *.conf.rpmnew 2>/dev/null || :
+done
+sed -i -e"s:--hostname--:`hostname`:" *.conf *.conf.rpmnew 2>/dev/null || :
+
%post tray-monitor
echo "Updating Bacula passwords and names..."
cd /etc/bacula
@@ -840,6 +884,17 @@
%{_mandir}/man1/bacula-bgnome-console.1*
%endif
+%if %{with bat}
+%files console-qt4
+%defattr(644,root,root,755)
+%doc LICENSE
+%{_pixmapsdir}/%{name}.png
+%{_desktopdir}/bat.desktop
+%attr(600,root,root) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/bat.conf
+%attr(755,root,root) %{_sbindir}/bat
+%{_mandir}/man1/bat.1*
+%endif
+
%if %{with console_wx}
%files tray-monitor
%defattr(644,root,root,755)
@@ -874,6 +929,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.72 2007/10/27 21:41:07 arekm
+- build with bat (qt4 console)
+
Revision 1.71 2007/10/11 19:53:33 areq
- 2.2.5
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/bacula.spec?r1=1.71&r2=1.72&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
