From fc7e532aa1f483d308da0cef01c8a6316a44d73d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Thu, 2 Jan 2020 22:42:31 +0900 Subject: [PATCH] - drop uneeded patch (marcos moved to rpm-build-macros) --- rpm-5.4.9-ruby1.9-fixes.patch | 42 ----------------------------------- rpm.spec | 3 --- 2 files changed, 45 deletions(-) delete mode 100644 rpm-5.4.9-ruby1.9-fixes.patch diff --git a/rpm-5.4.9-ruby1.9-fixes.patch b/rpm-5.4.9-ruby1.9-fixes.patch deleted file mode 100644 index 07748fd..0000000 --- a/rpm-5.4.9-ruby1.9-fixes.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -urN rpm-5.4.9/macros/ruby.in rpm-5.4.9-patched/macros/ruby.in ---- rpm-5.4.9/macros/ruby.in 2011-10-15 23:56:57.000000000 +1100 -+++ rpm-5.4.9-patched/macros/ruby.in 2012-08-30 18:09:09.732009037 +1100 -@@ -2,7 +2,7 @@ - # To make use of these macros insert the following line into your spec file: - # %{load:%{_usrlibrpm}/macros.d/ruby} - --%__ruby @__RUBY@ -+%__ruby /usr/bin/ruby - - # Path to scripts to autogenerate php package dependencies, - # -@@ -11,18 +11,18 @@ - %__ruby_provides %{_rpmhome}/rubygems.rb --provides - %__ruby_requires %{_rpmhome}/rubygems.rb --requires - --%ruby_version %(%{__ruby} -rrbconfig -e 'print Config::CONFIG["ruby_version"]') -+%ruby_version %(%{__ruby} -rrbconfig -e 'print RbConfig::CONFIG["ruby_version"]') - --%ruby_archdir %(%{__ruby} -rrbconfig -e 'print Config::CONFIG["archdir"]') --%ruby_libdir %(%{__ruby} -rrbconfig -e 'print Config::CONFIG["rubylibdir"]') --%ruby_sitedir %(%{__ruby} -rrbconfig -e 'print Config::CONFIG["sitedir"]') --%ruby_sitearchdir %(%{__ruby} -rrbconfig -e 'print Config::CONFIG["sitearchdir"]') --%ruby_sitelibdir %(%{__ruby} -rrbconfig -e 'print Config::CONFIG["sitelibdir"]') --%ruby_vendordir %(%{__ruby} -rrbconfig -e 'print Config::CONFIG["vendordir"]') --%ruby_vendorarchdir %(%{__ruby} -rrbconfig -e 'print Config::CONFIG["vendorarchdir"]') --%ruby_vendorlibdir %(%{__ruby} -rrbconfig -e 'print Config::CONFIG["vendorlibdir"]') --%ruby_gemdir %(%{__ruby} -rrbconfig -e 'include Config; print CONFIG["rubylibdir"].sub(CONFIG["ruby_version"], "gems/#{CONFIG["ruby_version"]}")') --%ruby_ridir %(%{__ruby} -rrbconfig -e 'include Config; print File.join(CONFIG["datadir"], "ri", 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 - diff --git a/rpm.spec b/rpm.spec index 46866f9..3854e34 100644 --- a/rpm.spec +++ b/rpm.spec @@ -221,8 +221,6 @@ Patch1011: %{name}-5.4.4-fix-rpmconstant-to-always-use-LC_CTYPE-C-for-case-conve Patch1012: %{name}-5.4.4-pass-_builddir-properly-to-find-debuginfo.patch # status: probably okay to merge, but discuss on rpm-devel first Patch1013: %{name}-5.4.10-files-listed-twice-terminates-build.patch -# status: probably okay to merge -Patch1014: %{name}-5.4.9-ruby1.9-fixes.patch # status: keep locally Patch1015: %{name}-5.4.9-keep-loading-script-macros.patch # status: same as for other dep gen patches @@ -941,7 +939,6 @@ cd - %patch1011 -p1 %patch1012 -p1 %patch1013 -p1 -%patch1014 -p1 %patch1015 -p1 %patch1016 -p1 %patch1017 -p1 -- 2.43.0