Hello community,
here is the log from the commit of package rubygem-webyast-rake-tasks for
openSUSE:Factory checked in at 2012-04-18 16:30:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 "sch...@suse.com"
Changes:
--------
---
/work/SRC/openSUSE:Factory/rubygem-webyast-rake-tasks/rubygem-webyast-rake-tasks.changes
2012-01-27 15:24:01.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.rubygem-webyast-rake-tasks.new/rubygem-webyast-rake-tasks.changes
2012-04-18 16:30:45.000000000 +0200
@@ -1,0 +2,9 @@
+Tue Feb 14 16:11:37 UTC 2012 - lsle...@suse.cz
+
+- removed override_test_db_path.rake (use ERB preprocessing
+ in database.yml instead)
+- webservice_tasks.rb renamed to webyast_tasks.rb
+- improved ignoring files in package-local task
+- 0.3.1
+
+-------------------------------------------------------------------
Old:
----
webyast-rake-tasks-0.3.0.gem
New:
----
macros.webyast-PolicyKit
macros.webyast-polkit1
webyast-rake-tasks-0.3.1.gem
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rubygem-webyast-rake-tasks.spec ++++++
--- /var/tmp/diff_new_pack.v0PP4A/_old 2012-04-18 16:30:46.000000000 +0200
+++ /var/tmp/diff_new_pack.v0PP4A/_new 2012-04-18 16:30:46.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package rubygem-webyast-rake-tasks
+# spec file for package rubygem-webyast-rake-tasks (Version 0.3.1)
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -15,11 +15,10 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
Name: rubygem-webyast-rake-tasks
-Provides: rubygem-yast2-webservice-tasks = 0.3.0
-Obsoletes: rubygem-yast2-webservice-tasks < 0.3.0
-Version: 0.3.0
+Provides: rubygem-yast2-webservice-tasks = 0.3.1
+Obsoletes: rubygem-yast2-webservice-tasks < 0.3.1
+Version: 0.3.1
Release: 0
# Nope, doesn't work. Gems are installed below /usr/lib{64}
@@ -27,6 +26,8 @@
%define mod_name webyast-rake-tasks
#
+Group: Development/Languages/Ruby
+License: LGPL-2.1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: rubygems_with_buildroot_patch
@@ -38,11 +39,11 @@
Url: http://en.opensuse.org/YaST
Source: %{mod_name}-%{version}.gem
Source1: macros.webyast
+Source2: macros.webyast-PolicyKit
+Source3: macros.webyast-polkit1
-Summary: Rake tasks shared by all WebYaST packages
-License: LGPL-2.1
-Group: Development/Languages/Ruby
+Summary: Rake tasks shared by all WebYaST packages
%description
The original task package is renamed to package-local.
The new task package includes the tasks git_check and syntax_check.
@@ -54,6 +55,12 @@
mkdir -p $RPM_BUILD_ROOT/etc/rpm
install -m 0644 %SOURCE1 $RPM_BUILD_ROOT/etc/rpm
+%if 0%{?suse_version} == 0 || %suse_version > 1110
+install -m 0644 %SOURCE3 $RPM_BUILD_ROOT/etc/rpm
+%else
+install -m 0644 %SOURCE2 $RPM_BUILD_ROOT/etc/rpm
+%endif
+
%clean
%{__rm} -rf %{buildroot}
@@ -63,6 +70,6 @@
%{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_name}-%{version}/
%{_libdir}/ruby/gems/%{rb_ver}/specifications/%{mod_name}-%{version}.gemspec
%doc %{_libdir}/ruby/gems/%{rb_ver}/doc/%{mod_name}-%{version}/
-/etc/rpm/macros.webyast
+/etc/rpm/macros.webyast*
%changelog
++++++ macros.webyast ++++++
--- /var/tmp/diff_new_pack.v0PP4A/_old 2012-04-18 16:30:46.000000000 +0200
+++ /var/tmp/diff_new_pack.v0PP4A/_new 2012-04-18 16:30:46.000000000 +0200
@@ -1,7 +1,7 @@
#--
# Webyast framework
#
-# Copyright (C) 2009, 2010 Novell, Inc.
+# Copyright (C) 2009, 2012 Novell, Inc.
# This library is free software; you can redistribute it and/or modify
# it only under the terms of version 2.1 of the GNU Lesser General Public
# License as published by the Free Software Foundation.
@@ -19,8 +19,7 @@
#
# common RPM macro definitions used by WebYaST
#
-# macros %webyast_ are generic for both webservice and client
-#
+
# target directories
%webyast_dir /srv/www/webyast
@@ -34,17 +33,86 @@
# service names (init script names in /etc/init.d)
%webyast_service webyast
-# run the testsuite
-%webyast_check \
+# build REST documentation, move it to public/ in webyast-base, pre-gzip it
(for nginx)
+# and remove the sources
+# usage: use in %install section, add target directory parameter
+# example: %webyast_build_restdoc public/my_module/restdoc
+%webyast_build_restdoc() \
+ cd $RPM_BUILD_ROOT/%{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_full_name} \
+ mkdir -p %1 \
export RAILS_PARENT=%{webyast_dir} \
+ cp %{webyast_dir}/Gemfile Gemfile.restility \
+ echo 'gem "restility"' >> Gemfile.restility \
+ BUNDLE_GEMFILE=Gemfile.restility rake restdoc \
+ mv restdoc/*.xml %1 \
+ mkdir -p $RPM_BUILD_ROOT/srv/www/webyast/%1 \
+ cp %1/* $RPM_BUILD_ROOT/srv/www/webyast/%1 \
+ gzip %1/* \
+ mv %1/* $RPM_BUILD_ROOT/srv/www/webyast/%1 \
+ rm -f Gemfile.restility Gemfile.restility.lock \
+ rm -rf restdoc \
+ cd -
+
+# 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)
+%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)
+%webyast_remove_assets \
+ cd %{webyast_dir} \
+ if test -f "Gemfile" ; then \
+ bundle update \
+ fi \
+ rake -f lib/tasks/assets.rake assets:join_manifests \
+ cd -
+
+# run plugin testsuite (from %check section)
+%webyast_run_plugin_tests \
export TEST_DB_PATH=/tmp/webyast_test.sqlite3 \
+ export RAILS_PARENT=%{webyast_dir} \
rm -rf $TEST_DB_PATH \
+ cd $RPM_BUILD_ROOT/%{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_full_name} \
RAILS_ENV=test rake db:create \
RAILS_ENV=test rake db:schema:load \
- RAILS_ENV=test ADD_BUILD_PATH=1 rake test
+ cp %{webyast_dir}/Gemfile.test Gemfile.test \
+ 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
-# build REST documentation
-%webyast_restdoc \
+# build (precompile) plugin assets (in %install section)
+%webyast_build_plugin_assets \
export RAILS_PARENT=%{webyast_dir} \
- env LANG=en rake restdoc
-
+ cd $RPM_BUILD_ROOT/%{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_full_name} \
+ rake assets:precompile \
+ rm -rf tmp \
+ mkdir -p $RPM_BUILD_ROOT/srv/www/webyast/public/assets \
+ mv public/assets/* $RPM_BUILD_ROOT/srv/www/webyast/public/assets \
+ rm -rf public/assets \
+ mv $RPM_BUILD_ROOT/srv/www/webyast/public/assets/manifest.yml
$RPM_BUILD_ROOT/srv/www/webyast/public/assets/manifest.yml.%{mod_name} \
+ rm -rf log \
+ cd -
+
+%webyast_polkit \
+ %if 0%{?suse_version} == 0 || %suse_version > 1110 \
+ WEBYAST_POLKIT_DIR='polkit-1/actions' \
+ %else \
+ # SLES11 or < 11.1 \
+ WEBYAST_POLKIT_DIR='PolicyKit/policy' \
+ %endif
++++++ macros.webyast-PolicyKit ++++++
#--
# Webyast framework
#
# Copyright (C) 2009, 2012 Novell, Inc.
# This library is free software; you can redistribute it and/or modify
# it only under the terms of version 2.1 of the GNU Lesser General Public
# License as published by the Free Software Foundation.
#
# This library is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
# FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
# details.
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#++
# target directory for policies
%webyast_polkit_dir PolicyKit/policy
++++++ macros.webyast-polkit1 ++++++
#--
# Webyast framework
#
# Copyright (C) 2009, 2012 Novell, Inc.
# This library is free software; you can redistribute it and/or modify
# it only under the terms of version 2.1 of the GNU Lesser General Public
# License as published by the Free Software Foundation.
#
# This library is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
# FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
# details.
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#++
# target directory for policies
%webyast_polkit_dir polkit-1/actions
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
