Merge pull request #54 from yast/dep-cleanup

Dependency cleanup
yast · Jul 27, 2015 · 864ccda · 864ccda
2 parents 1cbf725 + 1cfd0a9
commit 864ccda
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 59 deletions.
diff --git a/doc/README.keyboard_ycp b/doc/README.keyboard_ycp
diff --git a/package/yast2-country.changes b/package/yast2-country.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jul 24 14:30:50 UTC 2015 - mvidner@suse.com
+
+- Removed dependencies to packages dropped in 2002.
+- 3.1.22
+
 -------------------------------------------------------------------
 Tue Jun 23 14:21:29 UTC 2015 - ancor@suse.com
 

diff --git a/package/yast2-country.spec b/package/yast2-country.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-country
-Version:        3.1.21
+Version:        3.1.22
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -55,33 +55,6 @@ Requires:       yast2-hardware-detection >= 3.1.6
 
 Requires:	yast2-country-data
 
-Provides:	yast2-config-environment
-Provides:	yast2-config-keyboard
-Provides:	yast2-config-language
-Provides:	yast2-config-timezone
-Obsoletes:	yast2-config-environment
-Obsoletes:	yast2-config-keyboard
-Obsoletes:	yast2-config-language
-Obsoletes:	yast2-config-timezone
-Provides:	yast2-db-country yast2-db-keyboard yast2-db-timezone
-Obsoletes:	yast2-db-country yast2-db-keyboard yast2-db-timezone
-Provides:	yast2-trans-inst-keyboard
-Obsoletes:	yast2-trans-inst-keyboard
-Provides:	yast2-trans-inst-language
-Obsoletes:	yast2-trans-inst-language
-Provides:	yast2-trans-inst-timezone
-Obsoletes:	yast2-trans-inst-timezone
-Provides:	yast2-trans-inst-environment
-Obsoletes:	yast2-trans-inst-environment
-Provides:	y2d_inst-keyboard
-Obsoletes:	y2d_inst-keyboard
-Provides:	y2d_inst-timezone
-Obsoletes:	y2d_inst-timezone
-Provides:	y2t_inst-language
-Obsoletes:	y2t_inst-language
-Provides:	y2t_inst-environment
-Obsoletes:	y2t_inst-environment
-
 Requires:       yast2-ruby-bindings >= 1.0.0
 
 Summary:	YaST2 - Country Settings (Language, Keyboard, and Timezone)

diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -8,7 +8,10 @@
 
 if ENV["COVERAGE"]
   require "simplecov"
-  SimpleCov.start
+  SimpleCov.start do
+    add_filter "/test/"
+    add_filter "/*/test/"
+  end
 
   # for correct coverage report we need to load all ruby files
   Dir["#{root_location}/*/src/{module,include,lib}/**/*.rb"].each { |f| require_relative f }