rpms/dbus/F-9 dbus.spec,1.148,1.149 sources,1.36,1.37

[Colin Walters]

Author: walters

Update of /cvs/pkgs/rpms/dbus/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4765

Modified Files:
	dbus.spec sources 
Log Message:
* Fri Dec 12 2008 Colin Walters <walters at redhat.com> - 1.2.4-1
- Revert to 1.2.4, add epoch
  Too many things broke with this, it looks like there's no way
  to avoid a flag day.



Index: dbus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dbus/F-9/dbus.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- dbus.spec	9 Dec 2008 16:25:36 -0000	1.148
+++ dbus.spec	13 Dec 2008 02:25:31 -0000	1.149
@@ -7,7 +7,8 @@
 
 Summary: D-BUS message bus
 Name: dbus
-Version: 1.2.8
+Epoch: 1
+Version: 1.2.4
 Release: 1%{?dist}
 URL: http://www.freedesktop.org/software/dbus/
 Source0: http://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz
@@ -30,7 +31,7 @@
 
 Requires: chkconfig >= 1.3.26
 Requires: libselinux >= %{libselinux_version}
-Requires: dbus-libs = %{version}-%{release}
+Requires: dbus-libs = %{epoch}:%{version}-%{release}
 Requires(pre): /usr/sbin/useradd
 
 # Conflict with cups prior to configuration file change, so that the
@@ -49,7 +50,7 @@
 %package libs
 Summary: Libraries for accessing D-BUS
 Group: Development/Libraries
-Requires: %name = %{version}-%{release}
+Requires: %name = %{epoch}:%{version}-%{release}
 Obsoletes: dbus < 1.1.2-3
 
 %description libs
@@ -58,7 +59,7 @@
 %package doc
 Summary: Developer documentation for D-BUS
 Group: Documentation
-Requires: %name = %{version}-%{release}
+Requires: %name = %{epoch}:%{version}-%{release}
 Requires: devhelp
 
 %description doc 
@@ -68,7 +69,7 @@
 %package devel
 Summary: Development files for D-BUS
 Group: Development/Libraries
-Requires: %name = %{version}-%{release}
+Requires: %name = %{epoch}:%{version}-%{release}
 Requires: pkgconfig
 
 %description devel
@@ -78,7 +79,7 @@
 %package x11
 Summary: X11-requiring add-ons for D-BUS
 Group: Development/Libraries
-Requires: %name = %{version}-%{release}
+Requires: %name = %{epoch}:%{version}-%{release}
 
 %description x11
 D-BUS contains some tools that require Xlib to be installed, those are
@@ -225,6 +226,11 @@
 %{_includedir}/*
 
 %changelog
+* Fri Dec 12 2008 Colin Walters <walters at redhat.com> - 1.2.4-1
+- Revert to 1.2.4, add epoch
+  Too many things broke with this, it looks like there's no way
+  to avoid a flag day.
+
 * Tue Dec 08 2008 Colin Walters <walters at redhat.com> - 1.2.8-1
 - New upstream 1.2.8
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dbus/F-9/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	9 Dec 2008 16:25:36 -0000	1.36
+++ sources	13 Dec 2008 02:25:31 -0000	1.37
@@ -1 +1 @@
-f8559a7a3b7cf5ec7e3eb80cfe44efe4  dbus-1.2.8.tar.gz
+2e643910a09f44b000a0d76038637999  dbus-1.2.4.tar.gz