Merge pull request #56 from shundhammer/huha-fstab

Preserve comments in /etc/fstab (L3 bsc#1064437)

.gitignore

@@ -25,3 +25,9 @@ test/*.log
 test/*.trs
 testsuite/*.bak
 /testsuite/raw.*
+doc/
+.yardoc/*
+coverage/
+.yardoc/
+doc/autodocs
+*.pot

Dockerfile

@@ -1,3 +1,4 @@
 FROM yastdevel/ruby:sle12-sp3
+RUN zypper --non-interactive update yast2
 COPY . /usr/src/app
 

package/yast2-nfs-client.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Dec 11 15:13:46 UTC 2017 - shundhammer@suse.com
+
+- Preserve comments in /etc/fstab (bsc#1064437)
+- 3.1.18
+
 -------------------------------------------------------------------
 Mon Jun  6 07:39:33 UTC 2016 - igonzalezsosa@suse.com
 

package/yast2-nfs-client.spec

@@ -17,7 +17,7 @@
 
 
 Name:           yast2-nfs-client
-Version:        3.1.17
+Version:        3.1.18
 Release:        0
 Url:            https://github.com/yast/yast-nfs-client
 
@@ -29,13 +29,12 @@ BuildRequires:  update-desktop-files
 BuildRequires:  yast2-devtools >= 3.1.27
 BuildRequires:  yast2-testsuite
 # Don't use Info function to check enable state (bnc#807507)
-BuildRequires:  yast2 >= 2.23.23
+BuildRequires:  yast2 >= 3.2.41
 BuildRequires:  rubygem(rspec)
 # path_matching (RSpec argument matcher)
 BuildRequires:  yast2-ruby-bindings >= 3.1.31
-#ag_showexports moved to yast2 base
-# introduces extended IPv6 support.
-Requires:       yast2 >= 2.23.6
+# introduces EtcFstab, CommentedConfigFile, ColumnConfigFile
+Requires:       yast2 >= 3.2.41
 #idmapd_conf agent
 Requires:       yast2-nfs-common >= 2.24.0
 # showmount, #150382, #286300
@@ -89,7 +88,6 @@ file system access. It allows access to files on remote machines.
 %dir %{yast_moduledir}
 %{yast_moduledir}/Nfs.rb
 %{yast_moduledir}/NfsOptions.rb
-%{yast_dir}/lib/fstab
 %dir %{yast_desktopdir}
 %{yast_desktopdir}/nfs.desktop
 %doc %{yast_docdir}

src/Makefile.am

@@ -23,10 +23,6 @@ schemafiles_DATA = \
 desktop_DATA = \
   desktop/nfs.desktop
 
-ylibdir = @ylibdir@/fstab
-ylib_DATA = \
-  lib/fstab/tsort.rb
-
-EXTRA_DIST = $(module_DATA) $(client_DATA) $(ynclude_DATA) $(schemafiles_DATA) $(desktop_DATA) $(ylib_DATA)
+EXTRA_DIST = $(module_DATA) $(client_DATA) $(ynclude_DATA) $(schemafiles_DATA) $(desktop_DATA)
 
 include $(top_srcdir)/Makefile.am.common