From af266da2da91668551202dabb4a442cda1143f43 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:43:12 +0000 Subject: [PATCH 1/7] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ff5fcc5..044c4fc 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := webacula SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 0903ab0494ce5cdeebfbdad54e865aef91740d0d Mon Sep 17 00:00:00 2001 From: tim4dev Date: Wed, 2 Dec 2009 09:54:05 +0000 Subject: [PATCH 2/7] v 3.4 --- .cvsignore | 2 +- sources | 2 +- webacula.spec | 13 +++++++++---- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 262d30b..b190b9c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -webacula-3.3.tar.gz +webacula-3.4.tar.gz diff --git a/sources b/sources index 8bb871b..12fd11c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d6ffafa3315758fb8d6b313e50c5c78c webacula-3.3.tar.gz +76f5e04f18be112941386c5d7e71a771 webacula-3.4.tar.gz diff --git a/webacula.spec b/webacula.spec index 39dee10..dad1aa3 100644 --- a/webacula.spec +++ b/webacula.spec @@ -1,6 +1,6 @@ Name: webacula -Version: 3.3 -Release: 6%{?dist} +Version: 3.4 +Release: 1%{?dist} Summary: Web interface of a Bacula backup system Summary(ru): Веб интерфейс для Bacula backup system @@ -28,7 +28,8 @@ Supports the run Job, restore all files or selected files, restore the most recent backup for a client, restore backup for a client before a specified time, mount/umount Storages, show scheduled, running and terminated Jobs and more. -Supported languages: English, French, German, Portuguese Brazil, Russian. +Supported languages: English, French, German, Italian, +Portuguese Brazil, Russian. %description -l ru Webacula - Web Bacula - веб интерфейс для Bacula backup system. @@ -37,7 +38,7 @@ Webacula - Web Bacula - веб интерфейс для Bacula backup system. восстановление бэкапа для клиента сделанного перед указанным временем, монтирование/размонтирование Хранилищ, показ запланированных, выполняющихся и завершенных Заданий и прочее. -Поддерживаемые языки: английский, французский, немецкий, +Поддерживаемые языки: английский, французский, немецкий, итальянский, бразильский португальский, русский. @@ -109,10 +110,14 @@ rm -rf $RPM_BUILD_ROOT %lang(fr) %{_datadir}/%{name}/languages/fr %lang(pt) %{_datadir}/%{name}/languages/pt %lang(ru) %{_datadir}/%{name}/languages/ru +%lang(it) %{_datadir}/%{name}/languages/it %changelog +* Fri Oct 16 2009 Yuri Timofeev 3.4-1 +- Version 3.4 + * Tue Oct 13 2009 Yuri Timofeev 3.3-6 - Fix #526855. From 7bb6f3b971becada770af3d3b5089c4df45dc6f2 Mon Sep 17 00:00:00 2001 From: tim4dev Date: Tue, 16 Feb 2010 09:01:09 +0000 Subject: [PATCH 3/7] new version v3.5 --- .cvsignore | 2 +- sources | 2 +- webacula.spec | 8 +++++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index b190b9c..23c0d76 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -webacula-3.4.tar.gz +webacula-3.5.tar.gz diff --git a/sources b/sources index 12fd11c..afed7d9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -76f5e04f18be112941386c5d7e71a771 webacula-3.4.tar.gz +60a37ac71f58676215a04fa5c3fd3fe2 webacula-3.5.tar.gz diff --git a/webacula.spec b/webacula.spec index dad1aa3..c7490f4 100644 --- a/webacula.spec +++ b/webacula.spec @@ -1,5 +1,5 @@ Name: webacula -Version: 3.4 +Version: 3.5 Release: 1%{?dist} Summary: Web interface of a Bacula backup system Summary(ru): Веб интерфейс для Bacula backup system @@ -115,6 +115,12 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Feb 16 2010 Yuri Timofeev 3.5-1 +- Version 3.5 + +* Wed Dec 9 2009 Yuri Timofeev 3.4.1-1 +- Version 3.4.1 + * Fri Oct 16 2009 Yuri Timofeev 3.4-1 - Version 3.4 From ea5a26ffec3d8e26c80e5d1f33191d4525ed6383 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 17 Feb 2010 03:26:31 +0000 Subject: [PATCH 4/7] Initialize branch F-13 for webacula --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..baa94ef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-13 From fb76728159fdec7ddf58fcb676403b2cfe3e52d8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:14:02 +0000 Subject: [PATCH 5/7] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 1 - 4 files changed, 23 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 044c4fc..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: webacula -# $Id$ -NAME := webacula -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index baa94ef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-13 diff --git a/import.log b/import.log deleted file mode 100644 index 0dacd46..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -webacula-3_3-6_fc11:HEAD:webacula-3.3-6.fc11.src.rpm:1255676669 From 957f9d6f1d654f202ecd3aa2b2c5333077d57dfe Mon Sep 17 00:00:00 2001 From: Yuri Timofeev Date: Thu, 19 Aug 2010 09:01:48 +0300 Subject: [PATCH 6/7] v.5.0.2 --- .gitignore | 1 + sources | 2 +- webacula.spec | 14 ++++++++++++-- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 23c0d76..be9d644 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ webacula-3.5.tar.gz +webacula-5.0.2.tar.gz diff --git a/sources b/sources index afed7d9..f7ad02d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -60a37ac71f58676215a04fa5c3fd3fe2 webacula-3.5.tar.gz +4c6ce9e6edba9352c3980768cb0beb29 webacula-5.0.2.tar.gz diff --git a/webacula.spec b/webacula.spec index c7490f4..75443f9 100644 --- a/webacula.spec +++ b/webacula.spec @@ -1,5 +1,5 @@ Name: webacula -Version: 3.5 +Version: 5.0.2 Release: 1%{?dist} Summary: Web interface of a Bacula backup system Summary(ru): Веб интерфейс для Bacula backup system @@ -13,7 +13,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: webserver -Requires: bacula-console >= 2.4.0 +Requires: bacula-console >= 5.0 Requires: php-ZendFramework >= 1.8.3 Requires: php >= 5.2.4 Requires: php-pdo @@ -111,10 +111,20 @@ rm -rf $RPM_BUILD_ROOT %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 +* Tue Aug 10 2010 Yuri Timofeev 5.0.2-1 +- Version 5.0.2 + +* Thu May 12 2010 Yuri Timofeev 5.0.1-1 +- Version 5.0.1 + +* Thu Feb 20 2010 Yuri Timofeev 5.0-1 +- Version 5.0 + * Tue Feb 16 2010 Yuri Timofeev 3.5-1 - Version 3.5 From 8a90baaeea03f9cd1fb17c35aae9ca5a32655f07 Mon Sep 17 00:00:00 2001 From: Yuri Timofeev Date: Tue, 1 Feb 2011 23:27:22 +0200 Subject: [PATCH 7/7] v.5.0.3 --- .gitignore | 3 +-- sources | 2 +- webacula.spec | 5 ++++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index be9d644..3f6fb3e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -webacula-3.5.tar.gz -webacula-5.0.2.tar.gz +/webacula-5.0.3.tar.gz diff --git a/sources b/sources index f7ad02d..8ef78c8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4c6ce9e6edba9352c3980768cb0beb29 webacula-5.0.2.tar.gz +0a3b91e35d3bf55457f4c78b3882c2c2 webacula-5.0.3.tar.gz diff --git a/webacula.spec b/webacula.spec index 75443f9..00f8ad0 100644 --- a/webacula.spec +++ b/webacula.spec @@ -1,5 +1,5 @@ Name: webacula -Version: 5.0.2 +Version: 5.0.3 Release: 1%{?dist} Summary: Web interface of a Bacula backup system Summary(ru): Веб интерфейс для Bacula backup system @@ -116,6 +116,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jan 24 2011 Yuri Timofeev 5.0.3-1 +- Version 5.0.3 + * Tue Aug 10 2010 Yuri Timofeev 5.0.2-1 - Version 5.0.2