[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [scl.org] sclo-vagrant1 1.8.1 builds



On 18/05/16 08:33, Dominic Cleal wrote:
> On 17/05/16 17:27, Tomas Hrcka wrote:
>> On 05/17/2016 05:21 PM, Dominic Cleal wrote:
>>> It looks like %{vagrant_dir} has expanded differently, causing the root
>>> of the Vagrant installation to be at
>>> /opt/rh/sclo-vagrant1/root/usr/share/sclo-vagrant1-vagrant/ rather than
>>> /opt/rh/sclo-vagrant1/root/usr/share/vagrant/.
>>>
>>> 1.7.4-3.el7: http://cbs.centos.org/koji/rpminfo?rpmID=23881
>>> 1.8.1-4.el7: http://cbs.centos.org/koji/rpminfo?rpmID=56779
>>>
>>> The file /usr/lib/rpm/macros.d/macros.vagrant.sclo-vagrant1 in the older
>>> build contains "%vagrant_dir %{_datadir}/vagrant", but the newer build
>>> uses %{name} which expands to the SCLed name.
>>
>> I have fixed it back to pkg_name
> 
> Thanks, 1.8.1-5 seems to fix both of these issue. There remains another
> new one it seems - if you rebuild a plugin against -5, the registration
> scriptlet runs "/opt/rh/sclo-vagrant1/root/usr/bin/ruby -e".
> 
> %vagrant_plugin_register now uses %{_bindir}/ruby, but this used to be
> plain "ruby" - the scl enable should put it in the PATH anyway, so I
> don't think this is needed. It was changed at
> https://github.com/sclorg-distgit/vagrant/commit/e448388e0cc88a76d9923d86df3e1615a666eeff#diff-0cc501359f9ff39115559ff49a4f0d47L36.

PR opened at https://github.com/sclorg-distgit/vagrant/pull/2 to revert
it. Rebuilding both vagrant and vagrant-openstack-provider against it
seems to now produce a working pair of RPMs that install the plugin.

-- 
Dominic Cleal
dominic cleal org


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]