Skip to content

Commit

Permalink
Merge pull request #65 from joseivanlopez/cfa
Browse files Browse the repository at this point in the history
CFA model for ntp conf WIP
  • Loading branch information
jreidinger committed Dec 2, 2016
2 parents a468d0f + 1908ded commit 81eab9a
Show file tree
Hide file tree
Showing 9 changed files with 973 additions and 127 deletions.
4 changes: 4 additions & 0 deletions .rubocop.yml
Expand Up @@ -83,3 +83,7 @@ Style/MethodName:
Style/VariableName:
Include:
- 'src/lib/**/*.rb' # force known variables only for new code

# method_alias is safer and more predictable
Style/Alias:
EnforcedStyle: prefer_alias_method
7 changes: 6 additions & 1 deletion .travis.yml
Expand Up @@ -4,8 +4,13 @@ compiler:
before_install:
# disable rvm, use system Ruby
- rvm reset
# install newer augeasget repo with newer augeas, otherwise ruby-augeas fails (see https://github.com/yast/yast-network/pull/454#issuecomment-253795507)
- sudo add-apt-repository -y ppa:raphink/augeas
- sudo apt-get update
- sudo apt-get install libaugeas-dev libxml2-dev
# end of augeas install
- wget https://raw.githubusercontent.com/yast/yast-devtools/master/travis-tools/travis_setup.sh
- sh ./travis_setup.sh -p "rake yast2-devtools yast2 rake yast2-country-data" -g "yast-rake gettext yard rspec:3.3.0 simplecov coveralls rubocop:0.29.1"
- sh ./travis_setup.sh -p "rake yast2-devtools yast2 rake yast2-country-data libaugeas-dev" -g "yast-rake gettext yard rspec:3.3.0 simplecov coveralls rubocop:0.29.1 cfa"
script:
- rake check:syntax
- rake check:pot
Expand Down
7 changes: 7 additions & 0 deletions package/yast2-ntp-client.changes 100644 → 100755
@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Dec 2 14:37:28 UTC 2016 - joseivanlopez@gmail.com

- Updated client to read/write NTP configuration using CFA
(bsc#983486 and bsc#929694)
- 3.2.2

-------------------------------------------------------------------
Fri Nov 25 16:44:58 UTC 2016 - igonzalezsosa@suse.com

Expand Down
6 changes: 5 additions & 1 deletion package/yast2-ntp-client.spec
Expand Up @@ -17,7 +17,7 @@


Name: yast2-ntp-client
Version: 3.2.1
Version: 3.2.2
Release: 0
Summary: YaST2 - NTP Client Configuration
License: GPL-2.0+
Expand All @@ -31,13 +31,17 @@ BuildRequires: yast2-country-data
BuildRequires: yast2-devtools >= 3.1.10
BuildRequires: rubygem(%rb_default_ruby_abi:rspec)
BuildRequires: rubygem(%rb_default_ruby_abi:yast-rake)
BuildRequires: augeas-lenses
BuildRequires: rubygem(%rb_default_ruby_abi:cfa) >= 0.4.2

#SLPAPI.pm
# Hostname::CurrentDomain
# Wizard::SetDesktopTitleAndIcon
Requires: yast2 >= 3.1.11
Requires: yast2-country-data
Requires: yast2-ruby-bindings >= 1.0.0
Requires: rubygem(%rb_default_ruby_abi:cfa) >= 0.4.2
Requires: augeas-lenses
BuildArch: noarch
# New sntp command line syntax
Conflicts: ntp < 4.2.8
Expand Down

0 comments on commit 81eab9a

Please sign in to comment.