fix the package for Factory

Susanne Oberhauser · Susanne Oberhauser · commit 290d4a711da1 · 2008-11-18T07:50:57.000Z
diff --git a/dist/buildservice-1.0.0-active_support-for-builder.patch b/dist/buildservice-1.0.0-active_support-for-builder.patch
@@ -0,0 +1,27 @@
+Take ruby gem builder from active_support, as it's not packaged
+individually anymore.Index: buildservice-1.0.0/docs/api/restility/bin/rest_doc
+===================================================================
+--- buildservice-1.0.0.orig/docs/api/restility/bin/rest_doc
++++ buildservice-1.0.0/docs/api/restility/bin/rest_doc
+@@ -2,7 +2,7 @@
+ 
+ require 'optparse'
+ require 'rubygems'
+-require 'builder'
++require 'active_support'
+ 
+ require 'erb'
+ include ERB::Util
+Index: buildservice-1.0.0/src/common/lib/activexml/transport.rb
+===================================================================
+--- buildservice-1.0.0.orig/src/common/lib/activexml/transport.rb
++++ buildservice-1.0.0/src/common/lib/activexml/transport.rb
+@@ -70,7 +70,7 @@ module ActiveXML
+ 
+ 
+ 
+-    require 'builder'
++    require 'active_support' # this is just to get for "builder".
+     class BSSQL < Abstract
+       register_protocol 'bssql'
+ 
diff --git a/dist/obs-server.changes b/dist/obs-server.changes
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Tue Nov 11 17:12:46 CET 2008 - froh@novell.com
+
+- fix init scripts for stricter 11.1 requirements.
+- get rid of strict rails dependency.
+- there's no more rubygems-builder. use active_support instead.
+-------------------------------------------------------------------
 Mon Nov 10 12:43:37 CET 2008 - froh@novell.com
 
 - add bs_productconvert and obs-productconvert subpackage as temporary
diff --git a/dist/obs-server.spec b/dist/obs-server.spec
@@ -41,9 +41,10 @@ Patch1:         buildservice-1.0.0-sign_conf.patch
 Patch2:         buildservice-1.0.0-BSConfig_sign.patch
 Patch3:         webclient-EXTERNAL_FRONTEND_HOST.patch
 Patch4:         webclient-RAILS_GEM_VERSION.patch
+Patch5:         buildservice-1.0.0-active_support-for-builder.patch
 Autoreqprov:    on
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  rubygem-builder python-devel
+BuildRequires:  python-devel rubygem-activesupport
 
 %if 0%{?suse_version} >= 1030
 BuildRequires:  fdupes
@@ -155,8 +156,8 @@ product definition.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p2
-%patch4 -p2
-
+%patch4 -p1
+%patch5 -p1
 #-------------------------------------------------------------------------------
 %build
 #-------------------------------------------------------------------------------
diff --git a/dist/obsdispatcher b/dist/obsdispatcher
@@ -13,7 +13,7 @@
 # Provides:          obsdispatcher
 # Required-Start:    $time $syslog obssrcserver obsrepserver
 # Should-Start:      obsscheduler
-# Required-Stop:
+# Required-Stop:     $null
 # Default-Start:     3 5
 # Default-Stop:      0 1 2 4 6
 # Description:       openSUSE build service
diff --git a/dist/obspublisher b/dist/obspublisher
@@ -13,7 +13,7 @@
 # Provides:          obspublisher
 # Required-Start:    $time $syslog obssrcserver obsrepserver
 # Should-Start:      obsscheduler
-# Required-Stop:
+# Required-Stop:     $null
 # Default-Start:     3 5
 # Default-Stop:      0 1 2 4 6
 # Description:       openSUSE build service publisher
diff --git a/dist/obsrepserver b/dist/obsrepserver
@@ -10,7 +10,7 @@
 ### BEGIN INIT INFO
 # Provides:          obsrepserver
 # Required-Start:    $time $syslog
-# Required-Stop:
+# Required-Stop:     $null
 # Default-Start:     3 5
 # Default-Stop:      0 1 2 4 6
 # Description:       openSUSE build service repository server
diff --git a/dist/obsscheduler b/dist/obsscheduler
@@ -11,7 +11,7 @@
 # Provides:          obsscheduler
 # Required-Start:    $time $syslog obssrcserver obsrepserver
 # Should-Start:      obssrcserver obsrepserver
-# Required-Stop:
+# Required-Stop:     $null
 # Default-Start:     3 5
 # Default-Stop:      0 1 2 4 6
 # Description:       openSUSE build service scheduler
diff --git a/dist/obssrcserver b/dist/obssrcserver
@@ -10,7 +10,7 @@
 ### BEGIN INIT INFO
 # Provides:          obssrcserver
 # Required-Start:    $time $syslog
-# Required-Stop:
+# Required-Stop:     $null
 # Default-Start:     3 5
 # Default-Stop:      0 1 2 4 6
 # Description:       openSUSE build service source repository server
diff --git a/dist/obsworker b/dist/obsworker
@@ -10,7 +10,7 @@
 ### BEGIN INIT INFO
 # Provides:          obsworker
 # Required-Start:    $time $network $syslog
-# Required-Stop:
+# Required-Stop:     $null
 # Should-Start:      obsscheduler
 # Default-Start:     3 5
 # Default-Stop:      0 1 2 4 6
diff --git a/dist/signd.init b/dist/signd.init
@@ -10,7 +10,7 @@
 # Provides:       signd
 # Required-Start: $network $named $syslog $time
 # Should-Start:
-# Required-Stop:
+# Required-Stop:  $network $named $syslog $time
 # Should-Stop:
 # Default-Start:  3 5
 # Default-Stop:
diff --git a/dist/webclient-RAILS_GEM_VERSION.patch b/dist/webclient-RAILS_GEM_VERSION.patch
@@ -1,14 +1,26 @@
-- fix 'EXTERNAL_FRONTEND_HOST' webclient config option problem
-- use specific rails version in the webclient
-Index: ../1.0/src/webclient/config/environment.rb
+- use specific rails version
+Index: buildservice-1.0.0/src/webclient/config/environment.rb
 ===================================================================
---- ../1.0/src/webclient/config/environment.rb	(revision 4388)
-+++ ../1.0/src/webclient/config/environment.rb	(working copy)
+--- buildservice-1.0.0.orig/src/webclient/config/environment.rb
++++ buildservice-1.0.0/src/webclient/config/environment.rb
 @@ -3,6 +3,7 @@
  # Uncomment below to force Rails into production mode when
  # you don't control web/app server and can't set it the proper way
  # ENV['RAILS_ENV'] ||= 'production'
-+RAILS_GEM_VERSION = "2.0.2"
++RAILS_GEM_VERSION = ">=2.0"
+ 
+ # Bootstrap the Rails environment, frameworks, and default configuration
+ require File.join(File.dirname(__FILE__), 'boot')
+Index: buildservice-1.0.0/src/software/config/environment.rb
+===================================================================
+--- buildservice-1.0.0.orig/src/software/config/environment.rb
++++ buildservice-1.0.0/src/software/config/environment.rb
+@@ -5,7 +5,7 @@
+ # ENV['RAILS_ENV'] ||= 'production'
+ 
+ # Specifies gem version of Rails to use when vendor/rails is not present
+-RAILS_GEM_VERSION = '1.2.3' unless defined? RAILS_GEM_VERSION
++RAILS_GEM_VERSION = '>=2.0.0' unless defined? RAILS_GEM_VERSION
  
  # Bootstrap the Rails environment, frameworks, and default configuration
  require File.join(File.dirname(__FILE__), 'boot')

-Original file line number
+Diff line change
@@ @@ -1,4 +1,10 @@ @@
 -------------------------------------------------------------------
 +Tue Nov 11 17:12:46 CET 2008 - [email protected]
++
 +- fix init scripts for stricter 11.1 requirements.
 +- get rid of strict rails dependency.
 +- there's no more rubygems-builder. use active_support instead.
 +-------------------------------------------------------------------
 Mon Nov 10 12:43:37 CET 2008 - [email protected]
 - add bs_productconvert and obs-productconvert subpackage as temporary