Re: [Help wanted] Setting vi/view/vim via alternatives

2021-02-01 Thread Colin Walters


On Sat, Jan 30, 2021, at 1:54 PM, Vitaly Zaitsev via devel wrote:
> On 30.01.2021 18:50, clime wrote:
> > Hey, what do you mean by this?
> 
> https://docs.fedoraproject.org/en-US/fedora-coreos/alternatives/
> 
> > Why should scriplets usage be incompatible with immutable Fedora
> > releases?
> 
> rpm-ostree doesn't execute any scriptlets.

Yes it does - on the server side by default, and if client side layering is 
enabled, then scripts are run client side.

Please be careful not to add inaccurate information here.

The conflict with alternatives isn't actually specific to (rpm-)ostree but it's 
around intermixing state in all 3 of /usr, /etc, and /var - which is something 
to avoid because it is a problem for *any* image-based update system (e.g. 
people using dm-verity) as well as people doing local filesystem snapshots.

I think https://bugzilla.redhat.com/show_bug.cgi?id=1657367 is the most 
recently updated bug for this.


___
devel mailing list -- devel@lists.fedoraproject.org
To unsubscribe send an email to devel-le...@lists.fedoraproject.org
Fedora Code of Conduct: 
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: 
https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org


Re: [Help wanted] Setting vi/view/vim via alternatives

2021-01-31 Thread Zdenek Dohnal
Thank you, Vitaly and Fabio!

That makes sense, I didn't look on the issue from new user's view. Most
people who use vi/vim are aware of the differences and wanted vi/vim
just work if the other is not installed, so vi/vim are drop-in
replacements for them in this matter of speaking. And Vi is just a Vim
compiled more strictly nowadays, so it adds another confusion :) .

But speaking technically, they aren't drop-in replacements because of
different configuration options.

I will drop alternatives usage and use wrappers - then it will work for
immutable Fedoras too.

On 1/30/21 7:41 PM, Fabio Valentini wrote:
> On Sat, Jan 30, 2021 at 7:24 PM Peter Boy  wrote:
>>
>>
>>> Am 30.01.2021 um 17:45 schrieb Vitaly Zaitsev via devel 
>>> :
>>>
>>> On 30.01.2021 16:58, Peter Boy wrote:
 But it’s perfectly usable for Fedora Workstation or Server and almost 
 indispensable for some development projects, e.g. Java (and vi/vim for a 
 terminal environment). Why should alternatives not be usable there?  Or 
 what is a suitable  and adequate replacement?
>>> https://docs.fedoraproject.org/en-US/packaging-guidelines/Alternatives/
>> Thanks for the info. Unfortunately, I don’t see a connection to immutable 
>> Fedora (it is about drop-in, user configurable, etc). Or do I miss something?
> If you read the Packaging Guidelines, they actually explicitly mention
> that vi / vim are a bad example for using the alternatives system -
> because they're not drop-in replacements.
>
> Additionally, as far as I know, OSTree based Fedora variants do not
> execute any RPM scriptlets, but implement their own handling of e.g.
> ldconfig and such things.
> And alternatives is definitely not compatible with OSTree - according
> to these bug reports, at least Java alternatives are broken -
> apparently primarily because OSTree stores configuration in /var
> instead of /etc:
>
> - https://bugzilla.redhat.com/show_bug.cgi?id=1657367
> - https://github.com/coreos/rpm-ostree/issues/1614
>
>
> Fabio
> ___
> devel mailing list -- devel@lists.fedoraproject.org
> To unsubscribe send an email to devel-le...@lists.fedoraproject.org
> Fedora Code of Conduct: 
> https://docs.fedoraproject.org/en-US/project/code-of-conduct/
> List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
> List Archives: 
> https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org

-- 
Zdenek Dohnal
Software Engineer
Red Hat Czech - Brno TPB-C




OpenPGP_signature
Description: OpenPGP digital signature
___
devel mailing list -- devel@lists.fedoraproject.org
To unsubscribe send an email to devel-le...@lists.fedoraproject.org
Fedora Code of Conduct: 
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: 
https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org


Re: [Help wanted] Setting vi/view/vim via alternatives

2021-01-30 Thread Peter Boy


> Am 30.01.2021 um 19:41 schrieb Fabio Valentini :
> 
> On Sat, Jan 30, 2021 at 7:24 PM Peter Boy  wrote:
>> 
>> 
>> 
>>> Am 30.01.2021 um 17:45 schrieb Vitaly Zaitsev via devel 
>>> :
>>> 
>>> On 30.01.2021 16:58, Peter Boy wrote:
 But it’s perfectly usable for Fedora Workstation or Server and almost 
 indispensable for some development projects, e.g. Java (and vi/vim for a 
 terminal environment). Why should alternatives not be usable there?  Or 
 what is a suitable  and adequate replacement?
>>> 
>>> https://docs.fedoraproject.org/en-US/packaging-guidelines/Alternatives/
>> 
>> Thanks for the info. Unfortunately, I don’t see a connection to immutable 
>> Fedora (it is about drop-in, user configurable, etc). Or do I miss something?
> 
> If you read the Packaging Guidelines, they actually explicitly mention
> that vi / vim are a bad example for using the alternatives system -
> because they're not drop-in replacements.

Yes, I got that (and mentioned the drop-in criteria), but the original post can 
/could be interpreted as, alternatives is / has to be altogether "banned" from 
Fedora.  And that seems to me to be the trigger of the discussion here.

> Additionally, as far as I know, OSTree based Fedora variants do not
> execute any RPM scriptlets, but implement their own handling of e.g.
> ldconfig and such things.
> And alternatives is definitely not compatible with OSTree - according
> to these bug reports, at least Java alternatives are broken -
> apparently primarily because OSTree stores configuration in /var
> instead of /etc:

Yes, but what will we do about it? The fix mentioned previously (manually 
symlink) is not as powerful as alternatives. But it may be a bad idea to remove 
alternatives from workstation (and server) just because it doesn’t work with 
silverblue. That’s the core of discussion here.

Peter

___
devel mailing list -- devel@lists.fedoraproject.org
To unsubscribe send an email to devel-le...@lists.fedoraproject.org
Fedora Code of Conduct: 
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: 
https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org


Re: [Help wanted] Setting vi/view/vim via alternatives

2021-01-30 Thread clime
On Sat, 30 Jan 2021 at 20:03, Vitaly Zaitsev via devel
 wrote:
>
> On 30.01.2021 18:50, clime wrote:
> > Hey, what do you mean by this?
>
> https://docs.fedoraproject.org/en-US/fedora-coreos/alternatives/
>
> > Why should scriplets usage be incompatible with immutable Fedora
> > releases?
>
> rpm-ostree doesn't execute any scriptlets.

It doesn't seem true per what Fabio linked:

https://github.com/coreos/fedora-coreos-tracker/issues/703 (and the
fix https://src.fedoraproject.org/rpms/wireshark/pull-request/5#request_diff)

That rather suggests they need the scriplets to be OSTree-compatible.

I think the main reason for the problem with alternatives is really
just that it tries to put its db under /var/, which is not supported
as /var is not synced by OSTree.

By the way, this is really cool thing:
https://docs.fedoraproject.org/en-US/packaging-guidelines/EnvironmentModules/

Not usable for this particular case but really cool. It's interesting
that it itself uses alternatives for switching between the lmod and
the env implementation.

>
> --
> Sincerely,
>Vitaly Zaitsev (vit...@easycoding.org)
> ___
> devel mailing list -- devel@lists.fedoraproject.org
> To unsubscribe send an email to devel-le...@lists.fedoraproject.org
> Fedora Code of Conduct: 
> https://docs.fedoraproject.org/en-US/project/code-of-conduct/
> List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
> List Archives: 
> https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org
___
devel mailing list -- devel@lists.fedoraproject.org
To unsubscribe send an email to devel-le...@lists.fedoraproject.org
Fedora Code of Conduct: 
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: 
https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org


Re: [Help wanted] Setting vi/view/vim via alternatives

2021-01-30 Thread clime
On Sat, 30 Jan 2021 at 19:48, Fabio Valentini  wrote:
>
> On Sat, Jan 30, 2021 at 7:24 PM Peter Boy  wrote:
> >
> >
> >
> > > Am 30.01.2021 um 17:45 schrieb Vitaly Zaitsev via devel 
> > > :
> > >
> > > On 30.01.2021 16:58, Peter Boy wrote:
> > >> But it’s perfectly usable for Fedora Workstation or Server and almost 
> > >> indispensable for some development projects, e.g. Java (and vi/vim for a 
> > >> terminal environment). Why should alternatives not be usable there?  Or 
> > >> what is a suitable  and adequate replacement?
> > >
> > > https://docs.fedoraproject.org/en-US/packaging-guidelines/Alternatives/
> >
> > Thanks for the info. Unfortunately, I don’t see a connection to immutable 
> > Fedora (it is about drop-in, user configurable, etc). Or do I miss 
> > something?
>
> If you read the Packaging Guidelines, they actually explicitly mention
> that vi / vim are a bad example for using the alternatives system -
> because they're not drop-in replacements.
>
> Additionally, as far as I know, OSTree based Fedora variants do not
> execute any RPM scriptlets, but implement their own handling of e.g.
> ldconfig and such things.
> And alternatives is definitely not compatible with OSTree - according
> to these bug reports, at least Java alternatives are broken -
> apparently primarily because OSTree stores configuration in /var
> instead of /etc:

I think you meant: "...because alternatives stores configuration in
/var instead of /etc"

>
> - https://bugzilla.redhat.com/show_bug.cgi?id=1657367
> - https://github.com/coreos/rpm-ostree/issues/1614
>
>
> Fabio
> ___
> devel mailing list -- devel@lists.fedoraproject.org
> To unsubscribe send an email to devel-le...@lists.fedoraproject.org
> Fedora Code of Conduct: 
> https://docs.fedoraproject.org/en-US/project/code-of-conduct/
> List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
> List Archives: 
> https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org
___
devel mailing list -- devel@lists.fedoraproject.org
To unsubscribe send an email to devel-le...@lists.fedoraproject.org
Fedora Code of Conduct: 
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: 
https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org


Re: [Help wanted] Setting vi/view/vim via alternatives

2021-01-30 Thread Vitaly Zaitsev via devel

On 30.01.2021 18:50, clime wrote:

Hey, what do you mean by this?


https://docs.fedoraproject.org/en-US/fedora-coreos/alternatives/


Why should scriplets usage be incompatible with immutable Fedora
releases?


rpm-ostree doesn't execute any scriptlets.

--
Sincerely,
  Vitaly Zaitsev (vit...@easycoding.org)
___
devel mailing list -- devel@lists.fedoraproject.org
To unsubscribe send an email to devel-le...@lists.fedoraproject.org
Fedora Code of Conduct: 
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: 
https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org


Re: [Help wanted] Setting vi/view/vim via alternatives

2021-01-30 Thread Vitaly Zaitsev via devel

On 30.01.2021 19:24, Peter Boy wrote:

Thanks for the info. Unfortunately, I don’t see a connection to immutable 
Fedora (it is about drop-in, user configurable, etc). Or do I miss something?


https://docs.fedoraproject.org/en-US/fedora-coreos/alternatives/

--
Sincerely,
  Vitaly Zaitsev (vit...@easycoding.org)
___
devel mailing list -- devel@lists.fedoraproject.org
To unsubscribe send an email to devel-le...@lists.fedoraproject.org
Fedora Code of Conduct: 
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: 
https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org


Re: [Help wanted] Setting vi/view/vim via alternatives

2021-01-30 Thread Fabio Valentini
On Sat, Jan 30, 2021 at 7:24 PM Peter Boy  wrote:
>
>
>
> > Am 30.01.2021 um 17:45 schrieb Vitaly Zaitsev via devel 
> > :
> >
> > On 30.01.2021 16:58, Peter Boy wrote:
> >> But it’s perfectly usable for Fedora Workstation or Server and almost 
> >> indispensable for some development projects, e.g. Java (and vi/vim for a 
> >> terminal environment). Why should alternatives not be usable there?  Or 
> >> what is a suitable  and adequate replacement?
> >
> > https://docs.fedoraproject.org/en-US/packaging-guidelines/Alternatives/
>
> Thanks for the info. Unfortunately, I don’t see a connection to immutable 
> Fedora (it is about drop-in, user configurable, etc). Or do I miss something?

If you read the Packaging Guidelines, they actually explicitly mention
that vi / vim are a bad example for using the alternatives system -
because they're not drop-in replacements.

Additionally, as far as I know, OSTree based Fedora variants do not
execute any RPM scriptlets, but implement their own handling of e.g.
ldconfig and such things.
And alternatives is definitely not compatible with OSTree - according
to these bug reports, at least Java alternatives are broken -
apparently primarily because OSTree stores configuration in /var
instead of /etc:

- https://bugzilla.redhat.com/show_bug.cgi?id=1657367
- https://github.com/coreos/rpm-ostree/issues/1614


Fabio
___
devel mailing list -- devel@lists.fedoraproject.org
To unsubscribe send an email to devel-le...@lists.fedoraproject.org
Fedora Code of Conduct: 
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: 
https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org


Re: [Help wanted] Setting vi/view/vim via alternatives

2021-01-30 Thread Peter Boy


> Am 30.01.2021 um 17:45 schrieb Vitaly Zaitsev via devel 
> :
> 
> On 30.01.2021 16:58, Peter Boy wrote:
>> But it’s perfectly usable for Fedora Workstation or Server and almost 
>> indispensable for some development projects, e.g. Java (and vi/vim for a 
>> terminal environment). Why should alternatives not be usable there?  Or what 
>> is a suitable  and adequate replacement?
> 
> https://docs.fedoraproject.org/en-US/packaging-guidelines/Alternatives/

Thanks for the info. Unfortunately, I don’t see a connection to immutable 
Fedora (it is about drop-in, user configurable, etc). Or do I miss something?

___
devel mailing list -- devel@lists.fedoraproject.org
To unsubscribe send an email to devel-le...@lists.fedoraproject.org
Fedora Code of Conduct: 
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: 
https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org


Re: [Help wanted] Setting vi/view/vim via alternatives

2021-01-30 Thread clime
On Sat, 30 Jan 2021 at 16:08, Vitaly Zaitsev via devel
 wrote:
>
> On 29.01.2021 09:49, Zdenek Dohnal wrote:
> > I'm currently trying to rewrite the current shell aliases for making
> > Vi/View/Vim use the correct compiled binary based on which Vim package
> > is installed.
>
> Alternatives are not suitable for Fedora, because they will break
> immutable Fedora releases due to scriptlets usage.

Hey, what do you mean by this?

Why should scriplets usage be incompatible with immutable Fedora
releases? I guess thousands
of rpms use some kind of scriplets in spec?

Otherwise, alternatives subcommands alter stuff under
`/etc/alternatives` and `/var/lib/alternatives`.

Both places should be writable on immutable releases.

>
> --
> Sincerely,
>Vitaly Zaitsev (vit...@easycoding.org)
> ___
> devel mailing list -- devel@lists.fedoraproject.org
> To unsubscribe send an email to devel-le...@lists.fedoraproject.org
> Fedora Code of Conduct: 
> https://docs.fedoraproject.org/en-US/project/code-of-conduct/
> List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
> List Archives: 
> https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org
___
devel mailing list -- devel@lists.fedoraproject.org
To unsubscribe send an email to devel-le...@lists.fedoraproject.org
Fedora Code of Conduct: 
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: 
https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org


Re: [Help wanted] Setting vi/view/vim via alternatives

2021-01-30 Thread Vitaly Zaitsev via devel

On 30.01.2021 16:58, Peter Boy wrote:

But it’s perfectly usable for Fedora Workstation or Server and almost 
indispensable for some development projects, e.g. Java (and vi/vim for a 
terminal environment). Why should alternatives not be usable there?  Or what is 
a suitable  and adequate replacement?


https://docs.fedoraproject.org/en-US/packaging-guidelines/Alternatives/

--
Sincerely,
  Vitaly Zaitsev (vit...@easycoding.org)
___
devel mailing list -- devel@lists.fedoraproject.org
To unsubscribe send an email to devel-le...@lists.fedoraproject.org
Fedora Code of Conduct: 
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: 
https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org


Re: [Help wanted] Setting vi/view/vim via alternatives

2021-01-30 Thread Peter Boy


> Am 30.01.2021 um 15:58 schrieb Vitaly Zaitsev via devel 
> :
> 
> On 29.01.2021 09:49, Zdenek Dohnal wrote:
>> I'm currently trying to rewrite the current shell aliases for making
>> Vi/View/Vim use the correct compiled binary based on which Vim package
>> is installed.
> 
> Alternatives are not suitable for Fedora, because they will break immutable 
> Fedora releases due to scriptlets usage.

But it’s perfectly usable for Fedora Workstation or Server and almost 
indispensable for some development projects, e.g. Java (and vi/vim for a 
terminal environment). Why should alternatives not be usable there?  Or what is 
a suitable  and adequate replacement?









___
devel mailing list -- devel@lists.fedoraproject.org
To unsubscribe send an email to devel-le...@lists.fedoraproject.org
Fedora Code of Conduct: 
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: 
https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org


Re: [Help wanted] Setting vi/view/vim via alternatives

2021-01-30 Thread Vitaly Zaitsev via devel

On 29.01.2021 09:49, Zdenek Dohnal wrote:

I'm currently trying to rewrite the current shell aliases for making
Vi/View/Vim use the correct compiled binary based on which Vim package
is installed.


Alternatives are not suitable for Fedora, because they will break 
immutable Fedora releases due to scriptlets usage.


--
Sincerely,
  Vitaly Zaitsev (vit...@easycoding.org)
___
devel mailing list -- devel@lists.fedoraproject.org
To unsubscribe send an email to devel-le...@lists.fedoraproject.org
Fedora Code of Conduct: 
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: 
https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org


[Help wanted] Setting vi/view/vim via alternatives

2021-01-29 Thread Zdenek Dohnal
Hi all,

I'm currently trying to rewrite the current shell aliases for making
Vi/View/Vim use the correct compiled binary based on which Vim package
is installed. The current aliases have several downsides (don't work
with sudo, runs in subshell) so I got a recommendation for
'alternatives' which should solve all those issues.

But currently I'm stuck and I don't know how to debug - the current
patch (attached) should solve package installation, its upgrade and
removal via %post and %preun scriptlets, but whatever I do, the links
don't exist after package upgrade.

For debugging I used 'ls' in scriptlets, and the links existed at the
time the transaction was leaving the scriptlets. But the links don't
exist after the end of dnf transaction...

Would anyone mind helping me?

Thank you in advance,

Zdenek

-- 
Zdenek Dohnal
Software Engineer
Red Hat Czech - Brno TPB-C

diff --git a/view_wrapper b/view_wrapper
new file mode 100644
index 000..f4c9b23
--- /dev/null
+++ b/view_wrapper
@@ -0,0 +1,3 @@
+#!/usr/bin/bash
+
+/usr/bin/vim -R "$@"
diff --git a/vim.csh b/vim.csh
deleted file mode 100644
index 47df221..000
--- a/vim.csh
+++ /dev/null
@@ -1,20 +0,0 @@
-# we need to use which twice - first for checking if
-# the command doesn't fail, the use it if doesn't fail
-set vim_cond = `command -v vim`
-set vi_cond = `command -v vi`
-
-switch ( $vim_cond-$vi_cond )
-  case /usr/bin/vim-/usr/bin/vi:
-  # apply only when founded vim and vi are in expected dirs from distro
-  alias vi vim
-  alias view 'vim -R'
-  breaksw
-  case -/usr/bin/vi:
-  # apply only if founded vi is in expected dir from distro
-  alias vim vi
-  breaksw
-endsw
-
-# just in case
-unset vim_cond
-unset vi_cond
diff --git a/vim.fish b/vim.fish
deleted file mode 100644
index a35220d..000
--- a/vim.fish
+++ /dev/null
@@ -1,25 +0,0 @@
-# This will avoid user defined aliases and possibly stuff defined earlier in the PATH.
-# Redirecting is for the case when the binary is missing.
-set vim_cond (command -v vim)
-set vi_cond (command -v vi)
-
-switch "$vim_cond-$vi_cond"
-  case /usr/bin/vim-/usr/bin/vi
-  # apply only if founded vim and vi are in the expected dir from distro
-  function vi
-command vim $argv
-  end
-
-  function view
-command vim -R $argv
-  end
-  case -/usr/bin/vi
-  # apply only when no vim is installed and founded vi is in the expected dir from distro
-  function vim
-command vi $argv
-  end
-end
-
-# just in case
-set -e vim_cond
-set -e vi_cond
diff --git a/vim.sh b/vim.sh
deleted file mode 100644
index 2616693..000
--- a/vim.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-__vi_internal_vim_alias()
-(
-  # run vim if installed
-  test -f /usr/bin/vim && exec /usr/bin/vim "$@"
-
-  # run vi otherwise
-  test -f /usr/bin/vi && exec /usr/bin/vi "$@"
-)
-
-__view_internal_vim_alias()
-(
-  # run vim -R instead of view if vim installed
-  test -f /usr/bin/vim && exec /usr/bin/vim -R "$@"
-
-  # run view otherwise
-  test -f /usr/bin/view && exec /usr/bin/view "$@"
-)
-
-
-if [ -n "${BASH_VERSION-}" -o -n "${KSH_VERSION-}" -o -n "${ZSH_VERSION-}" ]; then
-  # This will avoid user defined aliases
-  case "$(command -v vim)-$(command -v vi)" in
-"/usr/bin/vim-/usr/bin/vi" | "-/usr/bin/vi")
-# apply only when founded vim and vi are in expected dirs from distro
-# we need to call a shell function to avoid shell restarts when vi/vim
-# is being installed/uninstalled
-alias vi=__vi_internal_vim_alias
-alias view=__view_internal_vim_alias
-alias vim=__vi_internal_vim_alias
-;;
-  esac
-fi
diff --git a/vim.spec b/vim.spec
index ce7d61b..3d02476 100644
--- a/vim.spec
+++ b/vim.spec
@@ -21,26 +21,26 @@ Summary: The VIM editor
 URL: http://www.vim.org/
 Name: vim
 Version: %{baseversion}.%{patchlevel}
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: Vim and MIT
 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2
-Source1: vim.sh
-Source2: vim.csh
-Source4: virc
-Source5: vimrc
-Source7: gvim16.png
-Source8: gvim32.png
-Source9: gvim48.png
-Source10: gvim64.png
+Source1: virc
+Source2: vimrc
+Source3: gvim16.png
+Source4: gvim32.png
+Source5: gvim48.png
+Source6: gvim64.png
+Source7: spec-template.new
+Source8: macros.vim
+Source9: vim-default-editor.sh
+Source10: vim-default-editor.csh
+Source11: vim-default-editor.fish
+Source12: view_wrapper
+
 %if %{withvimspell}
-Source13: vim-spell-files.tar.bz2
+Source100: vim-spell-files.tar.bz2
 %endif
-Source14: spec-template.new
-Source15: macros.vim
-Source16: vim-default-editor.sh
-Source17: vim-default-editor.csh
-Source18: vim-default-editor.fish
-Source19: vim.fish
+
 
 Patch2002: vim-7.0-fixkeys.patch
 Patch2003: vim-7.4-specsyntax.patch
@@ -130,6 +130,8 @@ Conflicts: %{name}-common < %{epoch}:8.1.1-1
 Conflicts: vim-enhanced < 2:8.2.2146-2
 Provides: vi
 Provides: %{_bindir}/vi
+# needs alternatives for post and