Hello community, here is the log from the commit of package rubygem-webyast-rake-tasks for openSUSE:Factory checked in at 2012-12-28 22:49:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2012-09-25 10:51:54.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rubygem-webyast-rake-tasks.new/rubygem-webyast-rake-tasks.changes 2012-12-28 22:49:07.000000000 +0100 @@ -1,0 +2,14 @@ +Wed Dec 19 08:35:16 UTC 2012 - lslezak@suse.cz + +- make the update script symlinks relative so they are valid also + in installation chroot (/mnt) (bnc#795045) +- 0.3.6 + +------------------------------------------------------------------- +Mon Dec 3 10:19:30 UTC 2012 - lslezak@suse.cz + +- added %restart_webyast, %restart_script_name and %create_restart_script + RPM macros for restarting Webyast using an update script +- 0.3.5 + +------------------------------------------------------------------- Old: ---- webyast-rake-tasks-0.3.4.gem New: ---- webyast-rake-tasks-0.3.6.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-webyast-rake-tasks.spec ++++++ --- /var/tmp/diff_new_pack.FWJxV8/_old 2012-12-28 22:49:13.000000000 +0100 +++ /var/tmp/diff_new_pack.FWJxV8/_new 2012-12-28 22:49:13.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package rubygem-webyast-rake-tasks (Version 0.3.4) +# spec file for package rubygem-webyast-rake-tasks # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -15,19 +15,18 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: rubygem-webyast-rake-tasks -Version: 0.3.4 +Version: 0.3.6 +Release: 0 Provides: rubygem-yast2-webservice-tasks = %{version} Obsoletes: rubygem-yast2-webservice-tasks < %{version} -Release: 0 # Nope, doesn't work. Gems are installed below /usr/lib{64} # BuildArch: noarch %define mod_name webyast-rake-tasks # -Group: Development/Languages/Ruby -License: LGPL-2.1 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: rubygems_with_buildroot_patch @@ -42,8 +41,10 @@ Source2: macros.webyast-PolicyKit Source3: macros.webyast-polkit1 - 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. ++++++ macros.webyast ++++++ --- /var/tmp/diff_new_pack.FWJxV8/_old 2012-12-28 22:49:13.000000000 +0100 +++ /var/tmp/diff_new_pack.FWJxV8/_new 2012-12-28 22:49:13.000000000 +0100 @@ -49,16 +49,7 @@ # update manifest.yml file # use assets.rake file directly (faster loading) -%webyast_update_assets \ - cd %{webyast_dir} \ - rake -f lib/tasks/assets.rake assets:join_manifests \ - if test -f "Gemfile" ; then \ - bundle update \ - fi - cd - - -# update manifest.yml file -# use assets.rake file directly (faster loading) +# (Usually not needed, replaced by update script functionality) %webyast_update_assets \ cd %{webyast_dir} \ rake -f lib/tasks/assets.rake assets:join_manifests \ @@ -84,10 +75,9 @@ rm -rf $TEST_DB_PATH \ cd $RPM_BUILD_ROOT/%{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_full_name} \ cp %{webyast_dir}/Gemfile.test Gemfile.test \ - echo 'gem "%{mod_name}", :path => "."' >> Gemfile.test \ - BUNDLE_GEMFILE=Gemfile.test bundle update \ BUNDLE_GEMFILE=Gemfile.test RAILS_ENV=test rake db:create \ BUNDLE_GEMFILE=Gemfile.test RAILS_ENV=test rake db:schema:load \ + echo 'gem "%{mod_name}", :path => "."' >> Gemfile.test \ BUNDLE_GEMFILE=Gemfile.test RAILS_ENV=test ADD_BUILD_PATH=1 rake test \ rm -rf $TEST_DB_PATH Gemfile.test Gemfile.test.lock log \ cd - @@ -96,7 +86,8 @@ %webyast_build_plugin_assets \ export RAILS_PARENT=%{webyast_dir} \ cd $RPM_BUILD_ROOT/%{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_full_name} \ - rake assets:precompile \ + BUNDLE_GEMFILE=Gemfile.assets rake assets:precompile \ + rm -f Gemfile.assets Gemfile.assets.lock \ rm -rf tmp \ mkdir -p $RPM_BUILD_ROOT/srv/www/webyast/public/assets \ mv public/assets/* $RPM_BUILD_ROOT/srv/www/webyast/public/assets \ @@ -105,6 +96,20 @@ rm -rf log \ cd - +# set the flag to restart webyast at the end of libzypp transaction via update script +%restart_webyast \ + touch /var/lib/webyast/restart + +# restart file name for files section +%restart_script_name \ + /var/adm/update-scripts/%name-%version-%release-update + +# create a restart script (symlink the base script) (for build section) +# make the symlink relative so it is valid even in chroot (/mnt) during initial installation +%create_restart_script \ + mkdir -p $RPM_BUILD_ROOT/var/adm/update-scripts \ + ln -s ../../../usr/sbin/update_webyast_service $RPM_BUILD_ROOT/var/adm/update-scripts/%name-%version-%release-update + %webyast_polkit \ %if 0%{?suse_version} == 0 || %suse_version > 1110 \ WEBYAST_POLKIT_DIR='polkit-1/actions' \ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org