--- /dev/null
+diff -ur rpm-4.5.orig/macros.in rpm-4.5/macros.in
+--- rpm-4.5.orig/macros.in 2020-04-19 16:30:03.450641000 +0200
++++ rpm-4.5/macros.in 2020-04-29 16:30:36.671641000 +0200
+@@ -328,12 +328,6 @@
+ #
+ #%_javaclasspath all
+
+-# Import packaging conventions from jpackage.org (prefixed with _
+-# to avoid name collisions).
+-#
+-%_javadir %{_datadir}/java
+-%_javadocdir %{_datadir}/javadoc
+-
+ #
+ # Deprecated.
+ #
+@@ -1361,44 +1355,9 @@
+ #
+ # Note: Used iff _use_internal_dependency_generator is non-zero. The
+ # helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
+-#%__perl_provides %{_rpmhome}/perldeps.pl --provides
+-#%__perl_requires %{_rpmhome}/perldeps.pl --requires
+ %__perl_provides %{_rpmhome}/perl.prov
+ %__perl_requires %{_rpmhome}/perl.req
+
+-# Useful macros for building *.rpm perl packages.
+-# (from Artur Frysiak <wiget@t17.ds.pwr.wroc.pl>)
+-#
+-# For example, these can be used as (from ImageMagick.spec from PLD site)
+-# [...]
+-# BuildPrereq: perl
+-# [...]
+-# %package perl
+-# Summary: libraries and modules for access to ImageMagick from perl
+-# Group: Development/Languages/Perl
+-# Requires: %{name} = %{version}
+-# %requires_eq perl
+-# [...]
+-# %install
+-# rm -fr $RPM_BUILD_ROOT
+-# install -d $RPM_BUILD_ROOT/%{perl_sitearch}
+-# [...]
+-# %files perl
+-# %defattr(644,root,root,755)
+-# %{perl_sitearch}/Image
+-# %dir %{perl_sitearch}/auto/Image
+-#
+-
+-%requires_eq() %(echo '%*' | LC_ALL="C" xargs -r rpm -q --qf 'Requires: %%{name} = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not")
+-
+-%perl_sitearch %(eval "`%{__perl} -V:installsitearch`"; echo $installsitearch)
+-%perl_sitelib %(eval "`%{__perl} -V:installsitelib`"; echo $installsitelib)
+-%perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)
+-%perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)
+-%perl_archlib %(eval "`%{__perl} -V:installarchlib`"; echo $installarchlib)
+-%perl_privlib %(eval "`%{__perl} -V:installprivlib`"; echo $installprivlib)
+-%perl_version %(eval "`%{__perl} -V:version`"; echo $version)
+-
+ #------------------------------------------------------------------------
+ # python(...) configuration.
+ #
+@@ -1408,107 +1367,11 @@
+ # helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
+ %__python_provides %{_rpmhome}/pythoneggs.py --provides
+ %__python_requires %{_rpmhome}/pythoneggs.py --requires
+-#
+-%python_sitearch %(%{__python} -c "import os; from distutils.sysconfig import get_python_lib; lib=get_python_lib(1); print os.path.islink(lib) and os.path.abspath(os.path.join(os.path.dirname(lib),os.readlink(lib))) or lib")
+-%python_sitelib %(%{__python} -c "import os; from distutils.sysconfig import get_python_lib; lib=get_python_lib(); print os.path.islink(lib) and os.path.abspath(os.path.join(os.path.dirname(lib),os.readlink(lib))) or lib")
+-%python_version %(%{__python} -c "import sys; print(sys.version[0:3])")
+-
+-# python main version
+-%py_ver %(%{__python} -c "import sys; v=sys.version_info[:2]; print '%%d.%%d'%%v" 2>/dev/null || echo PYTHON-NOT-FOUND)
+-%py_prefix %(%{__python} -c "import sys; print sys.prefix" 2>/dev/null || echo PYTHON-NOT-FOUND)
+-%py_platlibdir %(%{__python} -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib(standard_lib=1,plat_specific=1)' 2>/dev/null || echo PYTHON-LIBDIR-NOT-FOUND)
+-%py_purelibdir %(%{__python} -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib(standard_lib=1,plat_specific=0)' 2>/dev/null || echo PYTHON-LIBDIR-NOT-FOUND)
+-# backward compatibility
+-%py_libdir %py_purelibdir
+-
+-%py_platsitedir %(%{__python} -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib(plat_specific=1)' 2>/dev/null || echo PYTHON-LIBDIR-NOT-FOUND)
+-%py_puresitedir %(%{__python} -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib()' 2>/dev/null || echo PYTHON-LIBDIR-NOT-FOUND)
+-%py_sitedir %py_puresitedir
+-
+-%py_dyndir %{py_platlibdir}/lib-dynload
+-
+-%py_incdir %(%{__python} -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_inc()' 2>/dev/null || echo PYTHON-INCLUDEDIR-NOT-FOUND)
+-
+-%py_compile(O) \
+-find %1 -name '*.pyc' -exec rm -f {} \\; \
+-%{__python} -c "import sys, os, compileall; br='%{buildroot}'; compileall.compile_dir(sys.argv[1], ddir=br and (sys.argv[1][len(os.path.abspath(br)):]+'/') or None)" %1 \
+-%{-O: \
+-find %1 -name '*.pyo' -exec rm -f {} \\; \
+-%{__python} -O -c "import sys, os, compileall; br='%{buildroot}'; compileall.compile_dir(sys.argv[1], ddir=br and (sys.argv[1][len(os.path.abspath(br)):]+'/') or None)" %1 \
+-}
+-
+-# pure python modules compilation
+-%py_comp %{__python} -c "import compileall; import sys; compileall.compile_dir(sys.argv[1], ddir=sys.argv[1][len('%{buildroot}'):])"
+-
+-%py_ocomp %{__python} -O -c "import compileall; import sys; compileall.compile_dir(sys.argv[1], ddir=sys.argv[1][len('%{buildroot}'):])"
+-
+-%py_requires(d) \
+-BuildRequires: %{__python} %{-d:python-devel}
+-
+-#------------------------------------------------------------------------
+-# php(...) configuration.
+-#
+-# Path to scripts to autogenerate php package dependencies,
+-#
+-# Note: Used iff _use_internal_dependency_generator is non-zero. The
+-# helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
+-#%__php_provides %{_rpmhome}/phpdeps.sh --provides
+-#%__php_requires %{_rpmhome}/phpdeps.sh --requires
+-#%__php_provides %{_rpmhome}/php.prov
+-#%__php_requires %{_rpmhome}/php.req
+
+ %__mono_provides %{nil}
+ %__mono_requires %{nil}
+
+ #------------------------------------------------------------------------
+-# java(...) configuration.
+-#
+-# Path to scripts to autogenerate java package dependencies,
+-#
+-# Note: Used iff _use_internal_dependency_generator is non-zero. The
+-# helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
+-#%__java_provides %{_rpmhome}/javadeps.sh --provides
+-#%__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,
+@@ -1588,15 +1451,7 @@
+ %__common_cflags -O2 -fwrapv -pipe %{Werror_cflags} %{debuginfocflags} %{?_fortify_cflags} %{!?nospecflags:%{?specflags}}
+ %__common_cflags_with_ssp %{__common_cflags} %{?_ssp_cflags}
+
+-#------------------------------------------------------------------------
+-# mimetype(...) configuration.
+-#
+-# Path to script to autogenerate mimetype(foo) provides, based on MimeType
+-# key from desktop files.
+-#
+-# Note: Used if _use_internal_dependency_generator is non-zero. The
+-# helper is also used by %{_rpmhome}/rpmdeps --provides
+-%__mimetype_provides %{_rpmhome}/mimetypedeps.sh --provides
++%requires_eq() %(echo '%*' | LC_ALL="C" xargs -r rpm -q --qf 'Requires: %%{name} = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not")
+
+ %__gstreamer_provides %{nil}
+
+diff -ur rpm-4.5.orig/scripts/Makefile.am rpm-4.5/scripts/Makefile.am
+--- rpm-4.5.orig/scripts/Makefile.am 2020-04-19 16:30:03.450641000 +0200
++++ rpm-4.5/scripts/Makefile.am 2020-04-29 15:41:49.787641000 +0200
+@@ -11,11 +11,9 @@
+ cpanflute cpanflute2 Specfile.pm find-provides.perl \
+ find-requires.perl freshen.sh gendiff getpo.sh http.req \
+ check-java-closure.sh java.prov.sh java.req.sh \
+- javadeps.sh libtooldeps.sh pkgconfigdeps.sh \
++ libtooldeps.sh pkgconfigdeps.sh \
+ perldeps.pl perl.prov perl.req pythondeps.sh pythoneggs.py \
+- mimetypedeps.sh \
+- php.prov php.req rpm2cpio \
+- rpmdb_loadcvt rpmdiff rpmdiff.cgi \
++ rpm2cpio rpmdb_loadcvt rpmdiff rpmdiff.cgi \
+ rpm.daily rpm.log rpm.xinetd \
+ sql.prov sql.req symclash.py symclash.sh tcl.req tgpg trpm u_pkg.sh \
+ vpkg-provides.sh vpkg-provides2.sh \
+@@ -39,10 +37,8 @@
+ find-debuginfo.sh find-lang.sh find-prov.pl find-req.pl \
+ find-provides.perl \
+ find-requires.perl getpo.sh http.req \
+- javadeps.sh libtooldeps.sh pkgconfigdeps.sh \
++ libtooldeps.sh pkgconfigdeps.sh \
+ perldeps.pl perl.prov perl.req pythondeps.sh pythoneggs.py \
+- mimetypedeps.sh \
+- php.prov php.req \
+ rpmdb_loadcvt \
+ rpm.daily rpm.log rpm.xinetd \
+ symclash.py symclash.sh tgpg u_pkg.sh \
+diff -ur rpm-4.5.orig/scripts/Makefile.in rpm-4.5/scripts/Makefile.in
+--- rpm-4.5.orig/scripts/Makefile.in 2008-07-09 11:41:32.000000000 +0200
++++ rpm-4.5/scripts/Makefile.in 2020-04-29 15:41:01.972641000 +0200
+@@ -339,9 +339,9 @@
+ cpanflute cpanflute2 Specfile.pm find-provides.perl \
+ find-requires.perl freshen.sh gendiff getpo.sh http.req \
+ check-java-closure.sh java.prov.sh java.req.sh \
+- javadeps.sh libtooldeps.sh pkgconfigdeps.sh \
+- perldeps.pl perl.prov perl.req pythondeps.sh mimetypedeps.sh \
+- php.prov php.req rpm2cpio \
++ libtooldeps.sh pkgconfigdeps.sh \
++ perldeps.pl perl.prov perl.req pythondeps.sh \
++ rpm2cpio \
+ rpmdb_loadcvt rpmdiff rpmdiff.cgi \
+ rpm.daily rpm.log rpm.xinetd \
+ sql.prov sql.req symclash.py symclash.sh tcl.req tgpg trpm u_pkg.sh \
+@@ -360,9 +360,8 @@
+ find-debuginfo.sh find-lang.sh find-prov.pl find-req.pl \
+ find-provides.perl \
+ find-requires.perl getpo.sh http.req \
+- javadeps.sh libtooldeps.sh pkgconfigdeps.sh \
+- perldeps.pl perl.prov perl.req pythondeps.sh mimetypedeps.sh \
+- php.prov php.req \
++ libtooldeps.sh pkgconfigdeps.sh \
++ perldeps.pl perl.prov perl.req pythondeps.sh \
+ rpmdb_loadcvt \
+ rpm.daily rpm.log rpm.xinetd \
+ symclash.py symclash.sh tgpg u_pkg.sh \
TLD / packages / rpm.git / blobdiff