guix: Guix 1.0.0 -> 1.0.1

3 files changed, 6 insertions, 66 deletions

diff --git a/guix/guix/guix-1.0.0-tests-gremlin.patch b/guix/guix/guix-1.0.0-tests-gremlin.patch
deleted file mode 100644
index 74cdda5..0000000
--- a/guix/guix/guix-1.0.0-tests-gremlin.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://debbugs.gnu.org/35775
-
-diff --git a/tests/gremlin.scm b/tests/gremlin.scm
-index 77a5dc1998..b0bb7a8e49 100644
---- a/tests/gremlin.scm
-+++ b/tests/gremlin.scm
-@@ -52,7 +52,7 @@
-     (or (not dyninfo)                             ;static executable
-         (lset<= string=?
-                 (list (string-append "libguile-" (effective-version))
--                      "libgc" "libunistring" "libffi")
-+                      "libc")
-                 (map (lambda (lib)
-                        (string-take lib (string-contains lib ".so")))
-                      (elf-dynamic-info-needed dyninfo))))))
-@@ -79,7 +79,7 @@
-          (lambda (port)
-            (display "int main () { puts(\"hello\"); }" port)))
-        (invoke c-compiler "t.c"
--               "-Wl,-rpath=/foo" "-Wl,-rpath=/bar")
-+               "-Wl,--enable-new-dtags" "-Wl,-rpath=/foo" "-Wl,-rpath=/bar")
-        (let* ((dyninfo (elf-dynamic-info
-                         (parse-elf (call-with-input-file "a.out"
-                                      get-bytevector-all))))
diff --git a/guix/guix/guix-1.0.0-tests-guix-pack-localstatedir.patch b/guix/guix/guix-1.0.0-tests-guix-pack-localstatedir.patch
deleted file mode 100644
index 30dcfd8..0000000
--- a/guix/guix/guix-1.0.0-tests-guix-pack-localstatedir.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://debbugs.gnu.org/35776
-
-diff --git a/tests/guix-pack-localstatedir.sh b/tests/guix-pack-localstatedir.sh
-index b734b0f..41afda1 100644
---- a/tests/guix-pack-localstatedir.sh
-+++ b/tests/guix-pack-localstatedir.sh
-@@ -27,8 +27,9 @@ guix pack --version
- # the test in the user's global store if possible, on the grounds that
- # binaries may already be there or can be built or downloaded inexpensively.
- 
--NIX_STORE_DIR="`guile -c '(use-modules (guix config))(display %storedir)'`"
-+nix_store_dir="`guile -c '(use-modules (guix config))(display %storedir)'`"
- localstatedir="`guile -c '(use-modules (guix config))(display %localstatedir)'`"
-+NIX_STORE_DIR="$nix_store_dir"
- GUIX_DAEMON_SOCKET="$localstatedir/guix/daemon-socket/socket"
- export NIX_STORE_DIR GUIX_DAEMON_SOCKET
- 
-diff --git a/tests/guix-pack-relocatable.sh b/tests/guix-pack-relocatable.sh
-index 38dcf1e..b276fdc 100644
---- a/tests/guix-pack-relocatable.sh
-+++ b/tests/guix-pack-relocatable.sh
-@@ -27,8 +27,9 @@ guix pack --version
- # run it on the user's global store if possible, on the grounds that binaries
- # may already be there or can be built or downloaded inexpensively.
- 
--NIX_STORE_DIR="`guile -c '(use-modules (guix config))(display %storedir)'`"
-+nix_store_dir="`guile -c '(use-modules (guix config))(display %storedir)'`"
- localstatedir="`guile -c '(use-modules (guix config))(display %localstatedir)'`"
-+NIX_STORE_DIR="$nix_store_dir"
- GUIX_DAEMON_SOCKET="$localstatedir/guix/daemon-socket/socket"
- export NIX_STORE_DIR GUIX_DAEMON_SOCKET
- 
diff --git a/guix/guix/guix.spec b/guix/guix/guix.spec
index 414e65d..96822bf 100644
--- a/guix/guix/guix.spec
+++ b/guix/guix/guix.spec
@@ -5,17 +5,13 @@
 %global selinuxmodule guix-daemon
 
 Name:           guix
-Version:        1.0.0
+Version:        1.0.1
 Release:        1%{?dist}
 Summary:        A purely functional package manager for the GNU system
 
 License:        GPLv3+
 URL:            https://www.gnu.org/software/guix
 Source0:        https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
-Source1:        https://git.savannah.gnu.org/cgit/guix.git/plain/gnu/system/examples/docker-image.tmpl?h=v%{version}#/%{name}-%{version}-docker-image.tmpl
-
-Patch0:         guix-1.0.0-tests-gremlin.patch
-Patch1:         guix-1.0.0-tests-guix-pack-localstatedir.patch
 
 %global guix_user         guixbuild
 %global guix_group        guixbuild
@@ -84,10 +80,6 @@ composed.
 
 %prep
 %autosetup -p1
-# https://debbugs.gnu.org/35774
-# Obtain the file from the git repository and put it into the source tree.
-# It is required by the test tests/guix-system.sh.
-cp %{SOURCE1} gnu/system/examples/docker-image.tmpl
 
 
 %build
@@ -266,7 +258,6 @@ fi
 %dir %{guile_source_dir}/gnu/installer
 %{guile_source_dir}/gnu/installer/*.scm
 %{guile_source_dir}/gnu/installer/logo.txt
-%{guile_source_dir}/gnu/installer/SUPPORTED
 %dir %{guile_source_dir}/gnu/installer/newt
 %{guile_source_dir}/gnu/installer/newt/*.scm
 %{guile_source_dir}/gnu/packages.scm
@@ -333,6 +324,7 @@ fi
 %{guile_source_dir}/gnu/system/examples/bare-bones.tmpl
 %{guile_source_dir}/gnu/system/examples/beaglebone-black.tmpl
 %{guile_source_dir}/gnu/system/examples/desktop.tmpl
+%{guile_source_dir}/gnu/system/examples/docker-image.tmpl
 %{guile_source_dir}/gnu/system/examples/lightweight-desktop.tmpl
 %{guile_source_dir}/gnu/system/examples/vm-image.tmpl
 %{guile_source_dir}/gnu/tests.scm
@@ -392,6 +384,7 @@ fi
 %{_infodir}/%{name}.de.info*
 %{_infodir}/%{name}.es.info*
 %{_infodir}/%{name}.fr.info*
+%{_infodir}/%{name}.ru.info*
 %{_infodir}/%{name}.zh_CN.info*
 %dir %{_infodir}/images
 %{_infodir}/images/bootstrap-graph.png.gz
@@ -436,6 +429,9 @@ fi
 
 
 %changelog
+* Fri May 24 2019 Ting-Wei Lan <lantw44@gmail.com> - 1.0.1-1
+- Update to 1.0.1
+
 * Fri May 17 2019 Ting-Wei Lan <lantw44@gmail.com> - 1.0.0-1
 - Update to 1.0.0
 - Switch to Guile 2.2 because Guile 2.0 is no longer supported