[main] Fixing installation paths with new version of Ruby. (#2859)

SPECS-EXTENDED/puppet/puppet.spec

@@ -5,7 +5,7 @@
 Summary:        Network tool for managing many disparate systems
 Name:           puppet
 Version:        7.12.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        ASL 2.0
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -165,13 +165,13 @@ useradd -r -u 52 -g puppet -s /sbin/nologin \
 
 %doc README.md examples
 %license LICENSE
-%{_libdir}/ruby/vendor_ruby/hiera
-%{_libdir}/ruby/vendor_ruby/hiera_puppet.rb
-%{_libdir}/ruby/vendor_ruby/puppet
-%{_libdir}/ruby/vendor_ruby/puppet_pal.rb
-%{_libdir}/ruby/vendor_ruby/puppet.rb
-%{_libdir}/ruby/vendor_ruby/puppet_x.rb
-%{_libdir}/ruby/vendor_ruby/puppet
+%{ruby_vendorlibdir}/hiera
+%{ruby_vendorlibdir}/hiera_puppet.rb
+%{ruby_vendorlibdir}/puppet
+%{ruby_vendorlibdir}/puppet_pal.rb
+%{ruby_vendorlibdir}/puppet.rb
+%{ruby_vendorlibdir}/puppet_x.rb
+%{ruby_vendorlibdir}/puppet
 %dir %{_sharedstatedir}/%{name}
 %dir %{_sharedstatedir}/%{name}/public
 %{_bindir}/puppet
@@ -208,6 +208,9 @@ useradd -r -u 52 -g puppet -s /sbin/nologin \
 %ghost %attr(755, puppet, puppet) %{_rundir}/%{name}
 
 %changelog
+* Sun Apr 24 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 7.12.1-4
+- Updating Ruby vendor lib path macro.
+
 * Thu Apr 21 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 7.12.1-3
 - Spec clean-up.
 

SPECS-EXTENDED/rubygem-asciidoctor/rubygem-asciidoctor.spec

@@ -4,7 +4,7 @@
 Summary:        A fast, open source AsciiDoc implementation in Ruby
 Name:           rubygem-%{gem_name}
 Version:        2.0.17
-Release:        1%{?dist}
+Release:        2%{?dist}
 Group:          Development/Languages
 License:        MIT
 Vendor:         Microsoft Corporation
@@ -45,7 +45,7 @@ gem install -V --local --force --install-dir %{buildroot}/%{gemdir} %{gem_name}-
 %{gem_instdir}/data
 %{gem_libdir}
 %{gem_spec}
-/usr/lib/ruby/gems/bin/asciidoctor
+%{gemdir}/bin/asciidoctor
 %{gem_instdir}/bin
 %{gem_instdir}/man/asciidoctor.*
 %exclude %{gem_cache}
@@ -55,6 +55,9 @@ gem install -V --local --force --install-dir %{buildroot}/%{gemdir} %{gem_name}-
 %doc %{gem_docdir}
 
 %changelog
+* Sun Apr 24 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 2.0.17-2
+- Fixing build with ruby macros for Ruby 3.1.2.
+
 * Mon Feb 28 2022 Neha Agarwal <nehaagarwal@microsoft.com> - 2.0.17-1
 - Update to v2.0.17.
 - Build from .tar.gz source.