Merge pull request #54 from imobach/move-file-from-url

Remove Yast::Transfer::FileFromUrl

.travis.yml

@@ -5,7 +5,7 @@ before_install:
     # disable rvm, use system Ruby
     - rvm reset
     - wget https://raw.githubusercontent.com/yast/yast-devtools/master/travis-tools/travis_setup.sh
-    - sh ./travis_setup.sh -p "rake yast2-devtools yast2-testsuite yast2 yast2-packager yast2-transfer yast2-installation-control" -g "rspec:3.3.0 yast-rake gettext"
+    - sh ./travis_setup.sh -p "rake yast2-devtools yast2-testsuite yast2 yast2-packager yast2-installation-control" -g "rspec:3.3.0 yast-rake gettext"
 script:
     - rake check:syntax
     - rake check:pot

package/yast2-update.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Mar 14 10:27:34 UTC 2016 - igonzalezsosa@suse.com
+
+- Remove Yast::Transfer::FileFromUrl as it will be present
+  in yast2-installation (FATE#319716).
+- 3.1.37
+
 -------------------------------------------------------------------
 Tue Feb 16 14:53:11 UTC 2016 - mvidner@suse.com
 

package/yast2-update.spec

@@ -17,7 +17,7 @@
 
 
 Name:           yast2-update
-Version:        3.1.36
+Version:        3.1.37
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -115,13 +115,9 @@ Use this component if you wish to update your system.
 %{yast_clientdir}/rootpart_check_keyboard.rb
 
 %dir %{yast_yncludedir}
-%dir %{yast_yncludedir}/update
+%{yast_yncludedir}/update
 %{yast_yncludedir}/update/rootpart.rb
 
-%dir %{yast_libdir}
-%dir %{yast_libdir}/transfer
-%{yast_libdir}/transfer/file_from_url.rb
-
 %doc %{yast_docdir}
 
 %files FACTORY

src/Makefile.am

@@ -23,17 +23,13 @@ yncludedir = @yncludedir@/update
 ynclude_DATA = \
   include/update/rootpart.rb
 
-ylibdir = @ylibdir@/transfer
-ylib_DATA = \
-  lib/transfer/file_from_url.rb
-
 ybin_SCRIPTS = \
   bin/update_users_groups \
   bin/remove_junk
 
 desktop_DATA = \
   desktop/update.desktop
 
-EXTRA_DIST = $(module_DATA) $(client_DATA) $(ynclude_DATA) $(ylibdir) $(ybin_SCRIPTS) $(desktop_DATA)
+EXTRA_DIST = $(module_DATA) $(client_DATA) $(ynclude_DATA) $(ybin_SCRIPTS) $(desktop_DATA)
 
-include $(top_srcdir)/Makefile.am.common
+include $(top_srcdir)/Makefile.am.common