Merge branch 'f12/master' of ssh://tim4dev@pkgs.fedoraproject.org/webacula into f12

Conflicts: webacula.spec
Merge branch 'master' of ssh://tim4dev@pkgs.fedoraproject.org/webacula into f12
2010-09-14 08:07:16 +03:00 · 2010-09-14 08:03:24 +03:00 · 2010-09-14 07:51:48 +03:00 · 2010-09-13 13:22:46 -05:00 · 2010-09-13 13:19:29 -05:00 · 2010-09-13 13:18:41 -05:00
2 changed files with 7 additions and 13 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-4c6ce9e6edba9352c3980768cb0beb29  webacula-5.0.2.tar.gz
+60a37ac71f58676215a04fa5c3fd3fe2  webacula-3.5.tar.gz
--- a/webacula.spec
+++ b/webacula.spec
@ -1,6 +1,7 @@
 Name:          webacula
-Version:       5.0.2
-Release:       1%{?dist}
+Epoch:         2
+Version:       3.5
+Release:       2%{?dist}
 Summary:       Web interface of a Bacula backup system
 Summary(ru):   Веб интерфейс для Bacula backup system

@ -13,7 +14,7 @@ BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:  noarch

 Requires: webserver
-Requires: bacula-console >= 5.0
+Requires: bacula-console >= 2.4.0
 Requires: php-ZendFramework >= 1.8.3
 Requires: php >= 5.2.4
 Requires: php-pdo
@ -111,19 +112,12 @@ 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 <tim4dev@gmail.com> 5.0.2-1
- Version 5.0.2
-
-* Thu May 12 2010 Yuri Timofeev <tim4dev@gmail.com> 5.0.1-1
- Version 5.0.1
-
-* Thu Feb 20 2010 Yuri Timofeev <tim4dev@gmail.com> 5.0-1
- Version 5.0
+* Tue Sep 14 2010 Yuri Timofeev <tim4dev@gmail.com> 3.5-2
+- fix #630359 - Epoch bump to version 3.5

 * Tue Feb 16 2010 Yuri Timofeev <tim4dev@gmail.com> 3.5-1
 - Version 3.5
Author	SHA1	Message	Date
Yuri Timofeev	19727e9629	Merge branch 'f12/master' of ssh://tim4dev@pkgs.fedoraproject.org/webacula into f12 Conflicts: webacula.spec	2010-09-14 08:07:16 +03:00
Yuri Timofeev	0102560cfe	Merge branch 'master' of ssh://tim4dev@pkgs.fedoraproject.org/webacula into f12 Conflicts: sources webacula.spec	2010-09-14 08:03:24 +03:00
Yuri Timofeev	2fdb23ae48	fix #630359 - Epoch bump to version 3.5-2	2010-09-14 07:51:48 +03:00
Jon Ciesla	609e2c3218	Bumped release.	2010-09-13 13:22:46 -05:00
Jon Ciesla	441c5b5756	Date fix in changelog.	2010-09-13 13:19:29 -05:00
Jon Ciesla	61d4415088	Changelog correction.	2010-09-13 13:18:41 -05:00
Yuri Timofeev	27f0cc4cab	epoch bump version revert from 5 to 3.5 package: webacula-5.0.2-1.fc12.noarch from fedora-updates-12-i386 unresolved deps: bacula-console >= 0:5.0 package: webacula-5.0.2-1.fc12.noarch from fedora-updates-12-ppc unresolved deps: bacula-console >= 0:5.0 package: webacula-5.0.2-1.fc12.noarch from fedora-updates-12-ppc64 unresolved deps: bacula-console >= 0:5.0 package: webacula-5.0.2-1.fc12.noarch from fedora-updates-12-x86_64 unresolved deps: bacula-console >= 0:5.0	2010-08-24 08:25:26 +03:00
Yuri Timofeev	a7f4150ed4	v.5.0.2	2010-08-19 12:28:24 +03:00
Fedora Release Engineering	640a6673de	dist-git conversion	2010-07-29 15:14:02 +00:00
tim4dev	1e234d9275	new version	2010-02-16 09:20:26 +00:00
tim4dev	5b410b7fad	v 3.4	2009-12-02 10:03:10 +00:00
Bill Nottingham	e23be2082b	Fix typo that causes a failure to update the common directory. (releng #2781)	2009-11-26 01:15:52 +00:00
tim4dev	6c4168aa35	commit	2009-10-16 12:12:31 +00:00
tim4dev	5c61465e7f	Initial commit (#526855 )	2009-10-16 09:55:43 +00:00
Kevin Fenzi	a65b3e0b6c	Initialize branch F-12 for webacula	2009-10-15 17:31:30 +00:00