Suggested by Sandro Mani
(https://src.fedoraproject.org/rpms/mingw-filesystem/pull-request/8)
I think we could just drop qt4 (and kde4) everywhere. mingw-qt (aka Qt4)
has been removed two years ago (and was FTBFS for another year or two
before that).
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
$@ is not used by the RPM macro _in RPM_ since it is executed as a line
by itself, not a script or function.
There's already a $@ in the mingw-scripts.sh file, so when expanded from
the macro, the script contains two $@, sending redundant arguments to
cmake and meson.
- Only set the environment variable PKG_CONFIG_LIBDIR when
using the macros %mingw32_cmake, %mingw32_cmake_kde4,
%mingw64_cmake or %mingw64_cmake_kde4
- Fixes FTBFS of the mingw-matahari package
- Removed the use of the environment variable PKG_CONFIG_LIBDIR
While building binaries the tool {i686,x86_64}-w64-mingw32-pkg-config
should be used to find out pkg-config information
The environment variable PKG_CONFIG already automatically points
to the right cross-compiler aware version of pkg-config when
the mingw{32,64}-pkg-config packages are installed
- Fixes compilation of mingw-gtk3 3.9.0 (GNOME BZ #699690)
- Automatically add R: mingw{32,64}-pkg-config tags when .pc files
are detected while building mingw packages
- Added new macros for Qt5 support, %mingw32_qmake_qt5, %mingw64_qmake_qt5,
%mingw_qmake_qt4 and %mingw_qmake_qt5
- It isn't necessary to call %mingw32_env / %mingw64_env any more
in the %mingw32_qmake_qt4 and %mingw64_qmake_qt4 macros
- Fixed rpmlint issues
- Fixed permissions of the scripts (775 -> 755)
- Fixed description of the various subpackages
- Make the various macros compliant with the new packaging guidelines:
https://fedorahosted.org/fpc/ticket/71
- Suppress arch-independent-package-contains-binary-or-object rpmlint
errors for static libraries
- Improved the mingw_configure, mingw_make, mingw_make_install,
mingw_cmake and mingw_cmake_kde4 RPM macros so packagers don't need
to use quotes anymore when using arguments. Thanks to Kalev Lember
for the initial proof of concept
- Dropped the -mms-bitfields argument from the default CFLAGS as
it is enabled by default as of gcc 4.7
- Replaced the CMake defines QT_HEADERS_DIR and QT_LIBRARY_DIR
with QT_BINARY_DIR which is a more proper method to make CMake
aware of the location of Qt. Thx to Dominik Schmidt for the hint
- Make sure CMake can detect the qmake-qt4 binary in /usr/$target/bin
- Make sure CMake can also detect the (native) Qt tools
qdbuscpp2xml and qdbusxml2cpp
- Added new RPM macros mingw_cmake_kde4, mingw32_cmake_kde4 and
mingw64_cmake_kde4
- Added three new environment variables which can be set to
influence the behaviour of the cmake macros:
MINGW_CMAKE_ARGS, MINGW32_CMAKE_ARGS and MINGW64_CMAKE_ARGS
- Dropped the mingw32-qmake-qt4 and mingw64-qmake-qt4 wrapper scripts
as they're now provided by the mingw{32,64}-qt-qmake packages
- Added a new RPM macro: %%{?mingw_package_header}
Packagers can use this macro instead of the original boilerplate
code which is needed for all mingw packages
- Made argument passing using the backwards compatibility macro
%%{_mingw32_cmake} work
- Fixed an issue in the mingw_cmake macro where it could point to
a non-existant CMakeLists.txt file
- Fixed a bug in the find-requires script which causes all packages to
depend
on both the mingw32 and the mingw64 toolchains
- Split out the RPM macros which require both the
mingw{32,64}-filesystem
packages in a new file and put it in the mingw-filesystem-base package
- Generate seperate debuginfo packages for mingw32 and mingw64
- Set the minimum version of R: mingw{32,64}-filesystem to 70
- Use the correct FSF-address in some scripts
- Thanks to all the contributors: Erik van Pienbroek, Kalev Lember,
Levente
Farkas, Marc-Andre Lureau.
