diff --git a/README.suse-maint b/README.suse-maint
index dbb8cc9..9958b78 100644
--- a/README.suse-maint
+++ b/README.suse-maint
@@ -1,4 +1,6 @@
-When a new tarball release is added you must run the obs service to
-update the vendored sources: obs service disabledrun
+To rebuild the source tarball, run:
-In future OBS may be able to do this.
+$ osc service manualrun tar_scm
+$ osc service manualrun recompress
+
+You must also vendor the cargo dependencies.
diff --git a/_service b/_service
index 6cd96d3..8095b5c 100644
--- a/_service
+++ b/_service
@@ -1,4 +1,35 @@
+
+
-
+
+ git
+ https://github.com/alacritty/alacritty.git
+ v0.7.0-rc1
+ 0.7.0
+
+ .builds
+ .github
+ .agignore
+ .editorconfig
+ .gitattributes
+ Makefile
+ rustfmt.toml
+ alacritty/src/macos
+ alacritty_terminal/src/tty/windows
+ extra/windows
+ extra/osx
+
+ alacritty_terminal/tests
+
+
+
+ *.tar
+ xz
+
diff --git a/alacritty-0.6.0.tar.gz b/alacritty-0.6.0.tar.gz
deleted file mode 100644
index 617fa05..0000000
--- a/alacritty-0.6.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c794125a900a6477f1b40168dc9d22674a5326f32e4b083d6f1a45486d2505bf
-size 1404342
diff --git a/alacritty-0.7.0.tar.xz b/alacritty-0.7.0.tar.xz
new file mode 100644
index 0000000..af8e751
--- /dev/null
+++ b/alacritty-0.7.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c87dc75bbb5461af7b757524e5bbf3e4e53f8000e812c7d996c37b70f95b5f54
+size 283880
diff --git a/alacritty.changes b/alacritty.changes
index fa8c05c..c1ea5a1 100644
--- a/alacritty.changes
+++ b/alacritty.changes
@@ -1,3 +1,53 @@
+-------------------------------------------------------------------
+Sun Jan 3 07:43:09 UTC 2021 - Avindra Goolcharan
+
+- Update to version 0.7.0-rc1
+ + Support for ~/ at the beginning of configuration file imports
+ + New cursor.style.blinking option to set the default blinking state
+ + New cursor.blink_interval option to configure the blinking frequency
+ + Support for cursor blinking escapes (CSI ? 12 h, CSI ? 12 l and CSI Ps SP q)
+ + Customizable keybindings for search
+ + History for search mode, bound to ^P/^N/Up/Down by default
+ + Default binding to cancel search on Ctrl+C
+ + History position indicator for search and vi mode
+ * Nonexistent config imports are ignored instead of raising an error
+ * Value for disabling logging with config.log_level is Off instead of None
+ * Missing glyph symbols are no longer drawn for zerowidth characters
+ * Bug fixes
+ - Wide characters sometimes being cut off
+ - Preserve vi mode across terminal reset
+ - Escapes CSI Ps b and CSI Ps Z with large parameters locking up Alacritty
+ - Dimming colors which use the indexed CSI 38 : 5 : Ps m notation
+ - Slow rendering performance with a lot of cells with underline/strikeout attributes
+ - Performance of scrolling regions with offset from the bottom
+ - Compilation when targetting aarch64 on Apple
+ - Cursor position not reported to apps when mouse is moved with button held outside of window
+ - No live config update when starting Alacritty with a broken configuration file
+ - PTY not drained to the end with the --hold flag enabled
+ - Alacritty not discarding invalid escape sequences starting with ESC
+ - Underline cursor being obscured by underline
+ - Cursor not being rendered with a lot of unicode glyphs visible
+ - IME input swallowed after triggering a key binding
+ - Search without vi mode not jumping properly between all matches
+ * Several Wayland fixes:
+ - Extra mouse buttons are no longer ignored
+ - Numpad arrow keys are now properly recognized
+ - Crash due to clipboard not being properly released
+ - Crash due to non-standard fontconfig configuration
+ * The following CLI arguments have been removed in favor of the --option flag:
+ --persistent-logging
+ --live-config-reload
+ --no-live-config-reload
+ --dimensions
+ --position
+ live-shader-reload feature
+ * Config option dynamic_title, you should use window.dynamic_title instead
+ * Config option scrolling.faux_multiplier, which was replaced by escape CSI ? 1007 h/l
+- Packaging optimizations
+ * pull sources with exclusions
+ * add revendor_source.sh to remove unecessary objects from vendor tarball
+- Add fix-import-regression.patch to fix build
+
-------------------------------------------------------------------
Fri Dec 4 03:45:47 UTC 2020 - Avindra Goolcharan
diff --git a/alacritty.spec b/alacritty.spec
index 600b3c3..8a0b977 100644
--- a/alacritty.spec
+++ b/alacritty.spec
@@ -1,7 +1,7 @@
#
# spec file for package alacritty
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,17 +16,18 @@
#
-# Use hardening ldflags.
-%global rustflags "-Clink-arg=-Wl,-z,relro,-z,now"
Name: alacritty
-Version: 0.6.0
+Version: 0.7.0
Release: 0
Summary: A GPU-accelerated terminal emulator
License: Apache-2.0
-URL: https://github.com/alacritty/alacritty/
-Source: https://github.com/alacritty/alacritty/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+URL: https://github.com/alacritty/alacritty
+Source0: %{name}-%{version}.tar.xz
Source1: vendor.tar.xz
Source3: README.suse-maint
+# cargo vendor supplement
+Source99: revendor_source.sh
+Patch0: fix-import-regression.patch
BuildRequires: cmake
BuildRequires: fdupes
BuildRequires: freetype-devel
@@ -68,7 +69,7 @@ BuildArch: noarch
The official zsh completion script for alacritty.
%prep
-%setup -qa1
+%autosetup -a1 -p1
%define cargo_registry $(pwd)/vendor
%cargo_prep
@@ -79,6 +80,7 @@ sed -i 's#"expat/conftools/config.sub":"523cb028db907d1fbbcecdcac6737f9e2eeba48f
%endif
%build
+export CARGO_NET_OFFLINE=true
%cargo_build
%install
diff --git a/fix-import-regression.patch b/fix-import-regression.patch
new file mode 100644
index 0000000..832141a
--- /dev/null
+++ b/fix-import-regression.patch
@@ -0,0 +1,13 @@
+diff --git a/alacritty_terminal/Cargo.toml b/alacritty_terminal/Cargo.toml
+index 4012f11..d1b79ad 100644
+--- a/alacritty_terminal/Cargo.toml
++++ b/alacritty_terminal/Cargo.toml
+@@ -18,7 +18,7 @@ bitflags = "1"
+ parking_lot = "0.11.0"
+ serde = { version = "1", features = ["derive"] }
+ serde_yaml = "0.8"
+-vte = { git = "https://github.com/alacritty/vte", default-features = false }
++vte = { version = "0.9.0", default-features = false }
+ mio = "0.6.20"
+ mio-extras = "2"
+ log = "0.4"
diff --git a/revendor_source.sh b/revendor_source.sh
new file mode 100644
index 0000000..de53fa9
--- /dev/null
+++ b/revendor_source.sh
@@ -0,0 +1,40 @@
+#!/bin/sh
+set -euo pipefail
+
+# packaging helper to workaround:
+# https://github.com/rust-lang/cargo/issues/7058
+
+wd="/tmp/revendor"
+
+if [[ -d "$wd" ]]; then
+ echo -n "Removing previous ws ($wd)... "
+ rm -fr $wd
+ echo "done"
+fi
+
+mkdir -p $wd
+
+# take what we need into the build
+cp vendor*xz $wd
+
+cd $wd
+
+echo -n "Extracting vendor..."
+tar xf vendor*xz
+echo "done"
+
+echo -n "Ejecting winapi bloat... "
+rm -fr vendor/winapi*gnu*/lib/*.a
+echo "done"
+
+# remake tarball
+echo -n "Compressing archive... "
+tar -cf - vendor/ | xz -9 -c - > vendor-merged.tar.xz
+echo "done"
+
+cd -
+
+echo -n "Replacing tarball... "
+cp $wd/vendor-merged.tar.xz vendor.tar.xz
+rm -fr $wd
+echo "ok"
diff --git a/vendor.tar.xz b/vendor.tar.xz
index 6303fa0..b217199 100644
--- a/vendor.tar.xz
+++ b/vendor.tar.xz
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:11a8ff3524542c6d369e0156a6c599f2ff47a0e918756714b924709aa261c5f6
-size 13845336
+oid sha256:7b741078a80cb57a8598355e32e2d631ba7ca1e15644ae8e9beeb0665288f489
+size 8041588