rpm packaging

.gitignore

@@ -1,5 +1,6 @@
 *~
 *.tmp
+*.swp
 .buildpath
 .project
 .settings/

ChangeLog

@@ -1,6 +1,9 @@
 Webacula ChangeLog
 ------------------
 
+=== 5.5.1 (Sat Sep 10 2011)
+    Small bugfixes.
+
 === 5.5.0
     Implemented Bacula ACLs : JobACL, ClientACL, StorageACL, PoolACL, FileSetACL, WhereACL.
     Implemented Webacula ACLs - access to main menu.

application/views/scripts/admin/index.phtml

@@ -0,0 +1 @@
+

application/views/scripts/index/index.phtml

@@ -0,0 +1 @@
+

install/apache/webacula.conf

@@ -1,6 +1,6 @@
-# Apache conf
 #
 # Webacula - Web interface of a Bacula backup system
+# Apache conf
 # 
 # Allows only localhost by default
 #
@@ -78,6 +78,8 @@ Alias /webacula  /usr/share/webacula/html
    Deny from all
 </Directory>
 
+
+
 #
 # test mod_rewrite
 #

packaging/Fedora/build.sh

@@ -48,15 +48,22 @@ cd ${SRC_DIR}
 mkdir -p "${RPM_TMP}/webacula-${VERSION}"
 
 echo "library/Zend
+nbproject
+docs/src
 library/Zend.arc
 library/runme
 library/Zend*.tar.gz
 packaging
 tests
+.htaccess
 .settings
 .git
 .gitignore
 .project
+.buildpath
+*~
+*.tmp
+*.swp
 " > "${RPM_TMP}/${F_EXCLUDE}"
 
 echo "create tarball..."
@@ -105,14 +112,16 @@ echo -e "\n*** exit=$?"
 echo -e "\n\n\n**************************************************************"
 echo -e "***** Next instruction :\n
 
-rpmlint ${RPM_RPMS}/noarch/webacula-
+rpmlint -i ${RPM_RPMS}/noarch/webacula-
 
 Install rpm and testing.
 rpm -ihv ${RPM_RPMS}/noarch/webacula-\n
 
-mock -r fedora-13-i386 rebuild  ${RPM_ROOT}/SRPMS/webacula-\n
 mock -r fedora-14-i386 rebuild  ${RPM_ROOT}/SRPMS/webacula-\n
+mock -r fedora-15-i386 rebuild  ${RPM_ROOT}/SRPMS/webacula-\n
+mock -r fedora-16-i386 rebuild  ${RPM_ROOT}/SRPMS/webacula-\n
 mock -r epel-5-i386    rebuild  ${RPM_ROOT}/SRPMS/webacula-\n
+mock -r epel-6-i386    rebuild  ${RPM_ROOT}/SRPMS/webacula-\n
 
 see result:
 

packaging/Fedora/webacula.spec

@@ -38,19 +38,12 @@ Webacula - Web Bacula - веб интерфейс для Bacula backup system.
 восстановление бэкапа для клиента сделанного перед указанным временем,
 монтирование/размонтирование Хранилищ, показ запланированных, 
 выполняющихся и завершенных Заданий и прочее.
-Поддерживаемые языки: английский, французский, немецкий, итальянский,
+Поддерживаемые языки: английский, чешский, французский, немецкий, итальянский,
 бразильский португальский, русский.
 
 
 %prep
 %setup -q
-rm -f ./application/.htaccess
-rm -f ./html/test_mod_rewrite/.htaccess
-rm -f ./html/.htaccess
-rm -f ./install/.htaccess
-rm -f ./languages/.htaccess
-rm -f ./application/.htaccess
-rm -f ./docs/.htaccess
 
 
 
@@ -74,12 +67,8 @@ cp ./application/config.ini  $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/config.ini
 rm -f ./application/config.ini
 ln -s %{_sysconfdir}/%{name}/config.ini  $RPM_BUILD_ROOT%{_datadir}/%{name}/application/config.ini 
 
-cp ./install/webacula.conf  $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/webacula.conf
-rm -f ./install/webacula.conf
-
-install -p -m 755 ./install/webacula_clean_tmp_files.sh \
-   $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/webacula_clean_tmp_files.sh
-rm -f ./install/webacula_clean_tmp_files.sh
+cp ./install/apache/webacula.conf  $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/webacula.conf
+rm -f ./install/apache/webacula.conf
 
 cp -pr ./application $RPM_BUILD_ROOT%{_datadir}/%{name}
 cp -pr ./html        $RPM_BUILD_ROOT%{_datadir}/%{name}
@@ -100,23 +89,23 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/html
 %{_datadir}/%{name}/library
 %{_datadir}/%{name}/install
-%{_sysconfdir}/cron.daily/webacula_clean_tmp_files.sh
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/languages
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/webacula.conf
 %config(noreplace) %{_sysconfdir}/%{name}/config.ini
+%lang(cs) %{_datadir}/%{name}/languages/cs
 %lang(de) %{_datadir}/%{name}/languages/de
 %lang(en) %{_datadir}/%{name}/languages/en
+%lang(es) %{_datadir}/%{name}/languages/es
 %lang(fr) %{_datadir}/%{name}/languages/fr
+%lang(it) %{_datadir}/%{name}/languages/it
 %lang(pt) %{_datadir}/%{name}/languages/pt
 %lang(ru) %{_datadir}/%{name}/languages/ru
-%lang(it) %{_datadir}/%{name}/languages/it
-%lang(es) %{_datadir}/%{name}/languages/es
 
 
 
 %changelog
-* Sat Aug 13 2011 Yuri Timofeev <[email protected]> 5.5.1-1
+* Sat Sep 10 2011 Yuri Timofeev <[email protected]> 5.5.1-1
 - Version 5.5.1
 
 * Mon Jan 24 2011 Yuri Timofeev <[email protected]> 5.5.0-1