Hello community, here is the log from the commit of package rubygem-webyast-rake-tasks for openSUSE:Factory checked in at 2012-01-27 15:23:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-webyast-rake-tasks (Old) and /work/SRC/openSUSE:Factory/.rubygem-webyast-rake-tasks.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-webyast-rake-tasks", Maintainer is "schubi@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-webyast-rake-tasks/rubygem-webyast-rake-tasks.changes 2011-10-18 14:39:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rubygem-webyast-rake-tasks.new/rubygem-webyast-rake-tasks.changes 2012-01-27 15:24:01.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Oct 24 14:22:06 UTC 2011 - schubi@suse.com + +- Merging client and service +- 0.3.0 + +------------------------------------------------------------------- Old: ---- webyast-rake-tasks-0.1.11.gem New: ---- webyast-rake-tasks-0.3.0.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-webyast-rake-tasks.spec ++++++ --- /var/tmp/diff_new_pack.1637p5/_old 2012-01-27 15:24:02.000000000 +0100 +++ /var/tmp/diff_new_pack.1637p5/_new 2012-01-27 15:24:02.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package rubygem-webyast-rake-tasks # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,13 +15,11 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: rubygem-webyast-rake-tasks -Provides: rubygem-yast2-webservice-tasks = 0.1.11 -Obsoletes: rubygem-yast2-webservice-tasks < 0.1.11 -Version: 0.1.11 +Provides: rubygem-yast2-webservice-tasks = 0.3.0 +Obsoletes: rubygem-yast2-webservice-tasks < 0.3.0 +Version: 0.3.0 Release: 0 # Nope, doesn't work. Gems are installed below /usr/lib{64} @@ -29,8 +27,6 @@ %define mod_name webyast-rake-tasks # -Group: Development/Languages/Ruby -License: LGPL-2.1 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: rubygems_with_buildroot_patch @@ -43,16 +39,16 @@ Source: %{mod_name}-%{version}.gem Source1: macros.webyast -Summary: Rake tasks shared by all YaST webservice packages +Summary: Rake tasks shared by all WebYaST packages +License: LGPL-2.1 +Group: Development/Languages/Ruby %description The original task package is renamed to package-local. The new task package includes the tasks git_check and syntax_check. %prep - %build - %install %gem_install %{S:0} mkdir -p $RPM_BUILD_ROOT/etc/rpm ++++++ macros.webyast ++++++ --- /var/tmp/diff_new_pack.1637p5/_old 2012-01-27 15:24:03.000000000 +0100 +++ /var/tmp/diff_new_pack.1637p5/_new 2012-01-27 15:24:03.000000000 +0100 @@ -1,5 +1,5 @@ #-- -# Webyast Webservice framework +# Webyast framework # # Copyright (C) 2009, 2010 Novell, Inc. # This library is free software; you can redistribute it and/or modify @@ -19,44 +19,32 @@ # # common RPM macro definitions used by WebYaST # -# macros %webyast_ws_* are for webyast-*-ws packages, -# macros %webyast_ui_* are for webyast-*-ui packages, # macros %webyast_ are generic for both webservice and client # # target directories -%webyast_ws_dir /srv/www/yastws -%webyast_ui_dir /srv/www/yast +%webyast_dir /srv/www/webyast # variable directories -%webyast_ws_vardir /var/lib/yastws/ +%webyast_vardir /var/lib/webyast # users who run the services -%webyast_ws_user yastws -%webyast_ui_user nginx +%webyast_user webyast # service names (init script names in /etc/init.d) -%webyast_ws_service yastws -%webyast_ui_service yastwc +%webyast_service webyast # run the testsuite %webyast_check \ + export RAILS_PARENT=%{webyast_dir} \ export TEST_DB_PATH=/tmp/webyast_test.sqlite3 \ rm -rf $TEST_DB_PATH \ RAILS_ENV=test rake db:create \ RAILS_ENV=test rake db:schema:load \ RAILS_ENV=test ADD_BUILD_PATH=1 rake test -%webyast_ws_check \ - export RAILS_PARENT=%{webyast_ws_dir} \ - %webyast_check - -%webyast_ui_check \ - export RAILS_PARENT=%{webyast_ui_dir} \ - %webyast_check - # build REST documentation -%webyast_ws_restdoc \ - export RAILS_PARENT=%{webyast_ws_dir} \ +%webyast_restdoc \ + export RAILS_PARENT=%{webyast_dir} \ env LANG=en rake restdoc -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org