packages: bacula-web/apache.conf, bacula-web/bacula-web.spec - start updati...

glen glen at pld-linux.org
Sat Apr 7 13:27:45 CEST 2012 

Author: glen                         Date: Sat Apr  7 11:27:45 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- start updating to 5.2.2

---- Files affected:
packages/bacula-web:
   apache.conf (1.1 -> 1.2) , bacula-web.spec (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: packages/bacula-web/apache.conf
diff -u packages/bacula-web/apache.conf:1.1 packages/bacula-web/apache.conf:1.2
--- packages/bacula-web/apache.conf:1.1	Mon Jul 20 18:21:12 2009
+++ packages/bacula-web/apache.conf	Sat Apr  7 13:27:40 2012
@@ -1,4 +1,9 @@
 Alias /bacula-web /usr/share/bacula-web
 <Directory /usr/share/bacula-web>
-	Allow from all
+	allow from all
+</Directory>
+
+<Directory /usr/share/bacula-web/config>
+	order deny,allow
+	deny from all
 </Directory>

================================================================
Index: packages/bacula-web/bacula-web.spec
diff -u packages/bacula-web/bacula-web.spec:1.8 packages/bacula-web/bacula-web.spec:1.9
--- packages/bacula-web/bacula-web.spec:1.8	Mon Jul 20 23:33:36 2009
+++ packages/bacula-web/bacula-web.spec	Sat Apr  7 13:27:40 2012
@@ -1,134 +1,139 @@
 # $Revision$, $Date$
-# TODO
-# - package other GUI's:
-#   bimagemgr/ brestore/ bweb/
-Summary:	Bacula - The Network Backup Solution
-Summary(pl.UTF-8):	Bacula - rozwiązanie do wykonywania kopii zapasowych po sieci
-Name:		bacula-gui
-Version:	2.4.4
-Release:	0.11
-License:	Extended GPL v2
-Group:		Networking/Utilities
-Source0:	http://dl.sourceforge.net/bacula/%{name}-%{version}.tar.gz
-# Source0-md5:	1bf3cf1b9b51caaddf2468485044cd36
-Patch0:		bacula-web.patch
-Source1:	bacula-web.conf
-URL:		http://www.bacula.org/
+%define		php_min_version 5.2.4
+#%include	/usr/lib/rpm/macros.php
+Summary:	Open source monitoring and reporting tool for Bacula
+Name:		bacula-web
+Version:	5.2.2
+Release:	0.3
+License:	GPL v2
+Group:		Applications/WWW
+URL:		http://www.bacula-web.org/
+Source0:	http://www.bacula-web.org/tl_files/downloads/%{name}.%{version}.tar.gz
+# Source0-md5:	b52253963cc6edb6437a0dbe59c6051f
+Source1:	apache.conf
+BuildRequires:	rpm-php-pearprov >= 4.4.2-11
 BuildRequires:	rpmbuild(macros) >= 1.268
+BuildRequires:	sed >= 4.0
+#Requires:	php-Smarty
+Requires:	php-common >= 4:%{php_min_version}
+Requires:	php-gd
+Requires:	php-gettext
+Requires:	php-pdo
+Requires:	phplot
+Requires:	smarty-gettext
+Requires:	webserver(php)
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_webapps	/etc/webapps
-%define		_webapp		bacula-web
+%define		_webapp		%{name}
 %define		_sysconfdir	%{_webapps}/%{_webapp}
 %define		_appdir		%{_datadir}/%{_webapp}
-%define		_cachedir	/var/cache/%{_webapp}
 %define		_smartyplugindir	%{php_data_dir}/Smarty/plugins
-%define		_localedir		%{_datadir}/locale
-
-%description
-Bacula - It comes by night and sucks the vital essence from your
-computers.
-
-Sets of various Bacula GUIs.
-
-%description -l pl.UTF-8
-Bacula przychodzi nocą i wysysa żywotny ekstrakt z komputerów.
-
-Zbiór różnych graficzych interfejsów do Baculi.
-
-%package -n bacula-web
-Summary:	A Bacula web interface
-Summary(pl.UTF-8):	Interfejs WWW do Baculi
-Group:		Applications/WWW
-Requires:	Smarty
-# system pkg phplot causes dead loop
-#Requires:	phplot
-Requires:	php-pear-DB
-Requires:	php-gd
-Requires:	smarty-gettext
-Requires:	webapps
 
-%description -n bacula-web
-Bacula web apps.
+# bad depsolver
+%define		_noautopear	pear
+# put it together for rpmbuild
+%define		_noautoreq	%{?_noautophp} %{?_noautopear}
 
-%description -n bacula-web -l pl.UTF-8
-WWW dla Baculi.
+%description
+Bacula-Web is a web based tool written in PHP that provide you a
+summarized view of your bacula's backup infrastructure. It obtain his
+information from your bacula catalog's database.
 
 %prep
-%setup -q
-%patch0 -p1
+%setup -qc
 
-cd bacula-web
-install -d smarty-plugins
-mv external_packages/smarty/plugins/modifier.fsize_format.php smarty-plugins
+mv config/config.php{.sample,}
+rm locale/*/LC_MESSAGES/*.po
 
-# system pkg causes dead loop, keep it up cleanup first
-mv external_packages/phplot .
-rm -rf phplot/{doc,examples,LICENSE*,ChangeLog,README}
+# nonstandard plugins
+install -d smarty-plugins
+#mv core/external/smarty/libs/plugins/modifier.fsize_format.php smarty-plugins
 
-rm -rf templates_c external_packages configs/.htaccess test.php messages*.po array_fill.func.php
+%{__rm} -r templates_c
+#external_packages
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir},%{_cachedir},%{_smartyplugindir},%{_localedir}}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir}}
+cp -a *.php core locale style templates $RPM_BUILD_ROOT%{_appdir}
+#cp -a smarty-plugins/* $RPM_BUILD_ROOT%{_smartyplugindir}
 
-cd bacula-web
-cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
-cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
-cp -a . $RPM_BUILD_ROOT%{_appdir}
-cp -a smarty-plugins/* $RPM_BUILD_ROOT%{_smartyplugindir}
-mv $RPM_BUILD_ROOT{%{_appdir}/configs/*,%{_sysconfdir}}
-rm $RPM_BUILD_ROOT%{_appdir}/{tsmarty2c.php,ChangeLog,CONTACT,README,TODO,COPYING}
-rm -rf $RPM_BUILD_ROOT%{_appdir}/{locale,smarty-plugins}
-for a in locale/*/LC_MESSAGES/*.mo; do
-	l=${a#locale/}; l=${l%/LC_MESSAGES/*.mo}
-	install -d $RPM_BUILD_ROOT%{_localedir}/$l/LC_MESSAGES
-	cp -a $a $RPM_BUILD_ROOT%{_localedir}/$l/LC_MESSAGES/bacula-web.mo
-	echo "%%lang($l) %{_localedir}/$l/LC_MESSAGES/bacula-web.mo" >> bacula-web.lang
-done
+cp -a config/* $RPM_BUILD_ROOT%{_sysconfdir}
+ln -s %{_sysconfdir} $RPM_BUILD_ROOT%{_appdir}/config
+
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
+cp -p $RPM_BUILD_ROOT%{_sysconfdir}/{apache,httpd}.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -n bacula-web
-# cleanup cache from previous rpm
-echo %{_cachedir}/*.tpl.php | xargs rm -f
-
-%preun
-if [ "$1" = 0 ]; then
-	echo %{_cachedir}/*.tpl.php | xargs rm -f
-fi
-
-%triggerin -n bacula-web -- apache1 < 1.3.37-3, apache1-base
+%triggerin -- apache1 < 1.3.37-3, apache1-base
 %webapp_register apache %{_webapp}
 
-%triggerun -n bacula-web -- apache1 < 1.3.37-3, apache1-base
+%triggerun -- apache1 < 1.3.37-3, apache1-base
 %webapp_unregister apache %{_webapp}
 
-%triggerin -n bacula-web -- apache < 2.2.0, apache-base
+%triggerin -- apache < 2.2.0, apache-base
 %webapp_register httpd %{_webapp}
 
-%triggerun -n bacula-web -- apache < 2.2.0, apache-base
+%triggerun -- apache < 2.2.0, apache-base
 %webapp_unregister httpd %{_webapp}
 
-%files -n bacula-web -f bacula-web/bacula-web.lang
+%files
 %defattr(644,root,root,755)
-%doc bacula-web/{ChangeLog,CONTACT,README,TODO}
+%doc INSTALL README
 %dir %attr(750,root,http) %{_sysconfdir}
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apache.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf
-%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/bacula.conf
-%{_appdir}
-%{_smartyplugindir}/*.php
-%dir %attr(730,root,http) %{_cachedir}
+%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/config.php
+%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/global.inc.php
+
+%dir %{_appdir}
+%{_appdir}/backupjob-report.php
+%{_appdir}/client-report.php
+%{_appdir}/index.php
+%{_appdir}/jobs.php
+%{_appdir}/pools.php
+%{_appdir}/test.php
+%{_appdir}/config
+%{_appdir}/style
+%{_appdir}/templates
+
+%dir %{_appdir}/core
+%{_appdir}/core/bweb.inc.php
+%{_appdir}/core/app
+%{_appdir}/core/cfg
+%{_appdir}/core/db
+%{_appdir}/core/graph
+%{_appdir}/core/i18n
+%{_appdir}/core/utils
+
+%dir %{_appdir}/locale
+%lang(de) %{_appdir}/locale/de_DE
+%lang(en) %{_appdir}/locale/en_EN
+%lang(es) %{_appdir}/locale/es_ES
+%lang(fr) %{_appdir}/locale/fr_FR
+%lang(it) %{_appdir}/locale/it_IT
+%lang(sv) %{_appdir}/locale/sv_SV
+
+%dir %{_appdir}/core/external
+%{_appdir}/core/external/phplot
+%{_appdir}/core/external/smarty
+%{_appdir}/core/external/smarty_gettext-0.9
 
-%define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
+#%{_appdir}/templates_c
+
+%define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2012/04/07 11:27:40  glen
+- start updating to 5.2.2
+
 Revision 1.8  2009/07/20 21:33:36  glen
 - problem with system phplot
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/bacula-web/apache.conf?r1=1.1&r2=1.2
    http://cvs.pld-linux.org/packages/bacula-web/bacula-web.spec?r1=1.8&r2=1.9

More information about the pld-cvs-commit mailing list