ref: refs/heads/master
commit 149c1adcc89dc2c1e67330161682f58cdac79804
Author: Klaus Kämpf
Date: Mon Oct 26 15:50:19 2009 +0100
Depend on Rails 2.3.4
---
webservice/package/yast2-webservice.changes | 5 +++++
webservice/package/yast2-webservice.spec | 8 ++++++--
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/webservice/package/yast2-webservice.changes b/webservice/package/yast2-webservice.changes
index 1df2623..ce07fcb 100644
--- a/webservice/package/yast2-webservice.changes
+++ b/webservice/package/yast2-webservice.changes
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Mon Oct 26 15:49:52 CET 2009 - kkaempf@suse.de
+
+- Enforce rubygem-rails 2.3.4
+
+-------------------------------------------------------------------
Fri Oct 23 14:42:00 CEST 2009 - jreidinger@suse.cz
- fix unescaped shell param in login (bnc#514382)
diff --git a/webservice/package/yast2-webservice.spec b/webservice/package/yast2-webservice.spec
index 5ba2c07..fd768bb 100644
--- a/webservice/package/yast2-webservice.spec
+++ b/webservice/package/yast2-webservice.spec
@@ -25,7 +25,9 @@ Recommends: avahi-utils
Requires: yast2-dbus-server
# gamin gives problems with lighttpd, so better conflict with it for now
Conflicts: gamin
-PreReq: lighttpd, PolicyKit, PackageKit, rubygem-rake, rubygem-sqlite3, rubygem-rails-2_3, ruby-rpam, ruby-polkit, rubygem-test-unit
+PreReq: lighttpd, PolicyKit, PackageKit, rubygem-rake, rubygem-sqlite3
+PreReq: rubygem-rails-2_3 = 2.3.4
+PreReq: ruby-rpam, ruby-polkit, rubygem-test-unit
License: MIT
Group: Productivity/Networking/Web/Utilities
Autoreqprov: on
@@ -48,7 +50,9 @@ BuildRequires: ruby, pkg-config, rubygem-mocha
# except for deployment specific stuff
BuildRequires: rubygem-yast2-webservice-tasks, rubygem-restility
BuildRequires: yast2-core, yast2-dbus-server, ruby-dbus, sqlite, avahi-utils dbus-1
-BuildRequires: PolicyKit, PackageKit, rubygem-sqlite3, rubygem-rails-2_3, ruby-rpam, ruby-polkit
+BuildRequires: PolicyKit, PackageKit, rubygem-sqlite3
+BuildRequires: rubygem-rails-2_3 = 2.3.4
+BuildRequires: ruby-rpam, ruby-polkit
# This is for Hudson (build service) to setup the build env correctly
%if 0
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org