SPECS: bacula.spec - unified

[qboosh]

Author: qboosh                       Date: Sun Dec 18 23:21:12 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unified

---- Files affected:
SPECS:
   bacula.spec (1.36 -> 1.37) 

---- Diffs:

================================================================
Index: SPECS/bacula.spec
diff -u SPECS/bacula.spec:1.36 SPECS/bacula.spec:1.37
--- SPECS/bacula.spec:1.36	Tue Dec 13 19:51:25 2005
+++ SPECS/bacula.spec	Mon Dec 19 00:21:07 2005
@@ -95,15 +95,15 @@
 Summary:	Common files for bacula package
 Summary(pl):	Pliki wspólne dla pakietu bacula
 Group:		Networking/Utilities
-Conflicts:	bacula-dir < 0:1.34.6
-Conflicts:	bacula-fd < 0:1.34.6
-Conflicts:	bacula-sd < 0:1.34.6
-Conflicts:	bacula-console < 0:1.34.6
 Requires(post):	openssl-tools
 Requires(post):	sed >= 4.0
 Requires(post,preun):	/sbin/chkconfig
 Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/useradd
+Conflicts:	bacula-console < 0:1.34.6
+Conflicts:	bacula-dir < 0:1.34.6
+Conflicts:	bacula-fd < 0:1.34.6
+Conflicts:	bacula-sd < 0:1.34.6
 
 %description common
 Bacula - It comes by night and sucks the vital essence from your
@@ -133,9 +133,9 @@
 Summary:	Bacula Director and Catalog services
 Summary(pl):	Usługi Bacula Director i Catalog
 Group:		Networking/Utilities
-Obsoletes:	%{name}-updatedb
 Requires(post):	sed >= 4.0
-Requires:	bacula-common = %{epoch}:%{version}-%{release}
+Requires:	%{name}-common = %{epoch}:%{version}-%{release}
+Obsoletes:	bacula-updatedb
 
 %description dir
 Bacula - It comes by night and sucks the vital essence from your
@@ -172,7 +172,7 @@
 Summary(pl):	Konsola Baculi
 Group:		Networking/Utilities
 Requires(post):	sed >= 4.0
-Requires:	bacula-common = %{epoch}:%{version}-%{release}
+Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 
 %description console
 Bacula - It comes by night and sucks the vital essence from your
@@ -194,7 +194,7 @@
 Summary(pl):	Konsola Baculi oparta na wxWidgets
 Group:		Networking/Utilities
 Requires(post):	sed >= 4.0
-Requires:	bacula-common = %{epoch}:%{version}-%{release}
+Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 
 %description console-wx
 Bacula - It comes by night and sucks the vital essence from your
@@ -216,7 +216,7 @@
 Summary(pl):	Konsola Baculi oparta dla GNOME
 Group:		Networking/Utilities
 Requires(post):	sed >= 4.0
-Requires:	bacula-common = %{epoch}:%{version}-%{release}
+Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 
 %description console-gnome
 Bacula - It comes by night and sucks the vital essence from your
@@ -236,7 +236,7 @@
 Summary:	Bacula Tray Monitor
 Group:		Networking/Utilities
 Requires(post):	sed >= 4.0
-Requires:	bacula-common = %{epoch}:%{version}-%{release}
+Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 
 %description tray-monitor
 Bacula - It comes by night and sucks the vital essence from your
@@ -253,7 +253,7 @@
 Summary(pl):	Usługi Bacula File (klient)
 Group:		Networking/Utilities
 Requires(post):	sed >= 4.0
-Requires:	bacula-common = %{epoch}:%{version}-%{release}
+Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 
 %description fd
 Bacula - It comes by night and sucks the vital essence from your
@@ -288,7 +288,7 @@
 Summary(pl):	Usługi Bacula Storage
 Group:		Networking/Utilities
 Requires(post):	sed >= 4.0
-Requires:	bacula-common = %{epoch}:%{version}-%{release}
+Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Conflicts:	dvd+rw-tools <= 5.21.4.10.8-1
 
 %description sd
@@ -800,6 +800,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.37  2005/12/18 23:21:07  qboosh
+- unified
+
 Revision 1.36  2005/12/13 18:51:25  qboosh
 - no source3-md5
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/bacula.spec?r1=1.36&r2=1.37&f=u