- revert paths redefining after rpm.org changes, just disable debug packages

diff --git a/crossmingw32-pango.spec b/crossmingw32-pango.spec
index 5d324998b1cf1be5c949b7a7d1987fd4cf667447..604376c2f594b8fd977e1d6004c64d0ac8285368 100644 (file)
--- a/crossmingw32-pango.spec
+++ b/crossmingw32-pango.spec
@@ -36,6 +36,7 @@ Requires:     crossmingw32-harfbuzz >= 2.6.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                no_install_post_strip   1
+%define                _enable_debug_packages  0
 
 %define                target                  i386-mingw32
 %define                target_platform         i386-pc-mingw32
@@ -45,14 +46,6 @@ BuildRoot:   %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                _libdir                 %{_prefix}/lib
 %define                _pkgconfigdir           %{_prefix}/lib/pkgconfig
 %define                _dlldir                 /usr/share/wine/windows/system
-# rpm.org needs redefining these (redefining _prefix don't change them)
-%define                _bindir                 %{_prefix}/bin
-%define                _sbindir                %{_prefix}/sbin
-%define                _includedir             %{_prefix}/include
-%define                _libexecdir             %{_prefix}/libexec
-%define                _datadir                %{_prefix}/share
-%define                _infodir                %{_datadir}/info
-%define                _mandir                 %{_datadir}/man
 %define                __pkgconfig_provides    %{nil}
 %define                __pkgconfig_requires    %{nil}
 # for meson 0.50+, keep __cc/__cxx as host compiler and pass %{target}-* in meson-cross.txt
@@ -65,7 +58,6 @@ BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 # -z options are invalid for mingw linker, most of -f options are Linux-specific
 %define                filterout_ld    -Wl,-z,.*
 %define                filterout_c     -f[-a-z0-9=]*
-%define                _enable_debug_packages  0
 
 %description
 System for layout and rendering of internationalized text (cross