ref: refs/heads/master
commit cb103d38ba4b332c2e9054e747dfb93970b978d3
Author: Duncan Mac-Vicar P
Date: Wed Jul 22 14:37:07 2009 +0200
rake buildrpm fixes
---
Rakefile | 16 ++++++----------
.../package/yast2-webclient-systemtime.spec | 2 +-
webclient/package/yast2-webclient.spec | 4 ++--
3 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/Rakefile b/Rakefile
index f489fe4..ac229fa 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,22 +1,18 @@
env = %(PKG_BUILD="#{ENV['PKG_BUILD']}") if ENV['PKG_BUILD']
-
-PROJECTS = ['webclient', *Dir.glob('plugins/*')]
+plugins = Dir.glob('plugins/*')#.reject{|x| ['users'].include?(File.basename(x))}
+PROJECTS = ['webclient', *plugins]
desc 'Run all tests by default'
task :default => :test
-
-%w(test rdoc pgem package release).each do |task_name|
+
+%w(test rdoc pgem package release install install_policies check_syntax package-local buildrpm buildrpm-local).each do |task_name|
desc "Run #{task_name} task for all projects"
task task_name do
PROJECTS.each do |project|
system %(cd #{project} && #{env} #{$0} #{task_name})
+ raise "Error on execute task #{task_name} on #{project}" if $?.exitstatus != 0
end
end
end
-
-desc "Check syntax of all Ruby files."
-task :check_syntax do
- `find . -name "*.rb" |xargs -n1 ruby -c |grep -v "Syntax OK"`
- puts "* Done"
-end
+
diff --git a/plugins/systemtime/package/yast2-webclient-systemtime.spec b/plugins/systemtime/package/yast2-webclient-systemtime.spec
index ccd3045..cace4e4 100644
--- a/plugins/systemtime/package/yast2-webclient-systemtime.spec
+++ b/plugins/systemtime/package/yast2-webclient-systemtime.spec
@@ -10,7 +10,7 @@
Name: yast2-webclient-systemtime
-PreReq: >=yast2-webclient-0.0.2
+PreReq: yast2-webclient >= 0.0.2
Provides: yast2-webclient:/srv/www/yast/app/controllers/system_time_controller.rb
License: GPL
Group: Productivity/Networking/Web/Utilities
diff --git a/webclient/package/yast2-webclient.spec b/webclient/package/yast2-webclient.spec
index 4bbd67f..689eee7 100644
--- a/webclient/package/yast2-webclient.spec
+++ b/webclient/package/yast2-webclient.spec
@@ -110,7 +110,7 @@ fi
%files
%defattr(-,root,root)
%dir /srv/www/yast
-/srv/www/yast/locale
+#/srv/www/yast/locale
/srv/www/yast/po
/srv/www/yast/vendor
/srv/www/yast/app
@@ -123,7 +123,7 @@ fi
/srv/www/yast/COPYING
/srv/www/yast/INSTALL
/srv/www/yast/script
-/srv/www/yast/test
+#/srv/www/yast/test
/srv/www/yast/config
/srv/www/yast/start.sh
%doc README* COPYING
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org