X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=rpm-rubyprov.patch;fp=rpm-rubyprov.patch;h=15a867e10b682ef4c38b40e1040455d165491c51;hb=506d43e50fa9d65fb66418f89cb81349b9da98a1;hp=0000000000000000000000000000000000000000;hpb=7e602435803b417a5cba69ae9012d3a87680eadd;p=packages%2Frpm.git diff --git a/rpm-rubyprov.patch b/rpm-rubyprov.patch new file mode 100644 index 0000000..15a867e --- /dev/null +++ b/rpm-rubyprov.patch @@ -0,0 +1,87 @@ +diff -urpa rpm-4.5.orig/configure.ac rpm-4.5/configure.ac +--- rpm-4.5.orig/configure.ac 2011-10-03 01:50:17.000000000 +0000 ++++ rpm-4.5/configure.ac 2018-02-22 12:42:35.749384821 +0000 +@@ -291,6 +291,7 @@ AC_PATH_PROG(__PHP, php, %{_bindir}/php, + AC_PATH_PROG(__PYTHON, python, %{_bindir}/python, $MYPATH) + AC_PATH_PROG(__RM, rm, /bin/rm, $MYPATH) + AC_PATH_PROG(__RSH, rsh, %{_bindir}/rsh, $MYPATH) ++AC_PATH_PROG(__RUBY, ruby, %{_bindir}/ruby, $MYPATH) + AC_PATH_PROG(__SED, sed, /bin/sed, $MYPATH) + AC_PATH_PROG(__SH, sh, /bin/sh, $MYPATH) + AC_PATH_PROG(__SSH, ssh, %{_bindir}/ssh, $MYPATH) +diff -urpa rpm-4.5.orig/macros.in rpm-4.5/macros.in +--- rpm-4.5.orig/macros.in 2008-06-10 22:00:43.000000000 +0000 ++++ rpm-4.5/macros.in 2018-02-22 13:53:01.843337239 +0000 +@@ -78,6 +78,7 @@ + %__python @__PYTHON@ + %__rm @__RM@ + %__rsh @__RSH@ ++%__ruby @__RUBY@ + %__sed @__SED@ + %__sh @__SH@ + %__ssh @__SSH@ +@@ -1421,6 +1422,44 @@ PreReq: python >= %{python_version}, pyt + #%__java_requires %{_rpmhome}/javadeps.sh --requires + + #------------------------------------------------------------------------ ++# ruby(...) configuration. ++# ++# Path to scripts to autogenerate ruby package dependencies, ++ ++# Note: Used if _use_internal_dependency_generator is non-zero. The ++# helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}. ++%__ruby_provides %{_rpmhome}/rubygems.rb --provides ++%__ruby_requires %{_rpmhome}/rubygems.rb --requires ++ ++%ruby_version %(%{__ruby} -rrbconfig -e 'print RbConfig::CONFIG["ruby_version"]') ++ ++%ruby_archdir %(%{__ruby} -rrbconfig -e 'print RbConfig::CONFIG["archdir"]') ++%ruby_libdir %(%{__ruby} -rrbconfig -e 'print RbConfig::CONFIG["rubylibdir"]') ++%ruby_sitedir %(%{__ruby} -rrbconfig -e 'print RbConfig::CONFIG["sitedir"]') ++%ruby_sitearchdir %(%{__ruby} -rrbconfig -e 'print RbConfig::CONFIG["sitearchdir"]') ++%ruby_sitelibdir %(%{__ruby} -rrbconfig -e 'print RbConfig::CONFIG["sitelibdir"]') ++%ruby_vendordir %(%{__ruby} -rrbconfig -e 'print RbConfig::CONFIG["vendordir"]') ++%ruby_vendorarchdir %(%{__ruby} -rrbconfig -e 'print RbConfig::CONFIG["vendorarchdir"]') ++%ruby_vendorlibdir %(%{__ruby} -rrbconfig -e 'print RbConfig::CONFIG["vendorlibdir"]') ++%ruby_gemdir %(%{__ruby} -rrbconfig -e 'print RbConfig::CONFIG["rubylibdir"].sub(RbConfig::CONFIG["ruby_version"], "gems/#{RbConfig::CONFIG["ruby_version"]}")') ++%ruby_ridir %(%{__ruby} -rrbconfig -e 'print File.join(RbConfig::CONFIG["datadir"], "ri", RbConfig::CONFIG["ruby_version"])') ++ ++%__gem_helper %{_usrlibrpm}/gem_helper.rb ++ ++%gem_build(f:j:) \ ++ %__gem_helper build \\\ ++ %{-f:-f%{-f*}} \\\ ++ %{!-j:%{_smp_mflags}}%{-j:-j%{-j*}} ++ ++%gem_install(i:n:C) \ ++ DESTDIR=${DESTDIR:-%{buildroot}} \\\ ++ %__gem_helper install \\\ ++ --env-shebang --rdoc --ri --force --ignore-dependencies \\\ ++ %{!-i:--install-dir %{buildroot}%{ruby_gemdir}}%{-i:--install-dir %{-i*}} \\\ ++ %{!-n:--bindir %{buildroot}%{_bindir}}%{-n:--bindir%{-n*}} \\\ ++ %{!-C:--fix-permissions} ++ ++#------------------------------------------------------------------------ + # libtool(...) configuration. + # + # Path to scripts to autogenerate libtool package dependencies, +diff -urpa rpm-4.5.orig/scripts/Makefile.am rpm-4.5/scripts/Makefile.am +--- rpm-4.5.orig/scripts/Makefile.am 2008-05-21 20:48:02.000000000 +0000 ++++ rpm-4.5/scripts/Makefile.am 2018-02-22 13:55:18.773335698 +0000 +@@ -19,7 +19,8 @@ EXTRA_DIST = \ + sql.prov sql.req symclash.py symclash.sh tcl.req tgpg trpm u_pkg.sh \ + vpkg-provides.sh vpkg-provides2.sh \ + macros.perl* macros.python* \ +- macros.php* find-*.php find-php-* ++ macros.php* find-*.php find-php-* \ ++ gem_helper.rb rubygems.rb + + installprefix = $(DESTDIR) + +@@ -43,4 +44,5 @@ versionlib_SCRIPTS = \ + rpmdb_loadcvt \ + rpm.daily rpm.log rpm.xinetd \ + symclash.py symclash.sh tgpg u_pkg.sh \ +- vpkg-provides.sh vpkg-provides2.sh ++ vpkg-provides.sh vpkg-provides2.sh \ ++ gem_helper.rb rubygems.rb