rpms/mingw-filesystem
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Remove the mingw32-pkg-config wrapper as well

Browse Source
This commit is contained in:
Kalev Lember 2012-01-31 22:04:23 +02:00
parent adfc0e1651
commit 32d1194882
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
macros.mingw32
View File

@ -99,8 +99,6 @@ package or when debugging this package.\
done; \ done; \
unset x i unset x i
%_mingw32_pkg_config %{_mingw32_target}-pkg-config
%_mingw32_configure %{_mingw32_env} ; \ %_mingw32_configure %{_mingw32_env} ; \
__mingw32_topdir=.; if ! test -x configure; then __mingw32_topdir=..; fi; \\\ __mingw32_topdir=.; if ! test -x configure; then __mingw32_topdir=..; fi; \\\
$__mingw32_topdir/configure --cache-file=%{_mingw32_cache} \\\ $__mingw32_topdir/configure --cache-file=%{_mingw32_cache} \\\

9
mingw32-filesystem.spec
View File

@ -2,7 +2,7 @@
Name: mingw32-filesystem Name: mingw32-filesystem
Version: 69 Version: 69
Release: 12%{?dist} Release: 13%{?dist}
Summary: MinGW base filesystem and environment Summary: MinGW base filesystem and environment
Group: Development/Libraries Group: Development/Libraries
@ -103,7 +103,7 @@ install -m 755 %{SOURCE6} $RPM_BUILD_ROOT%{_libexecdir}/mingw32-scripts
mkdir -p $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_bindir}
pushd $RPM_BUILD_ROOT%{_bindir} pushd $RPM_BUILD_ROOT%{_bindir}
for i in mingw32-configure mingw32-make mingw32-pkg-config mingw32-cmake mingw32-qmake-qt4; do for i in mingw32-configure mingw32-make mingw32-cmake mingw32-qmake-qt4; do
ln -s %{_libexecdir}/mingw32-scripts $i ln -s %{_libexecdir}/mingw32-scripts $i
done done
popd popd
@ -179,7 +179,6 @@ install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/mingw32
%config(noreplace) %{_sysconfdir}/rpmlint/mingw32-rpmlint.config %config(noreplace) %{_sysconfdir}/rpmlint/mingw32-rpmlint.config
%{_bindir}/mingw32-configure %{_bindir}/mingw32-configure
%{_bindir}/mingw32-make %{_bindir}/mingw32-make
%{_bindir}/mingw32-pkg-config
%{_bindir}/mingw32-cmake %{_bindir}/mingw32-cmake
%{_bindir}/mingw32-qmake-qt4 %{_bindir}/mingw32-qmake-qt4
%{_libexecdir}/mingw32-scripts %{_libexecdir}/mingw32-scripts
@ -190,6 +189,10 @@ install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/mingw32
%changelog %changelog
* Tue Jan 31 2012 Kalev Lember <kalevlember@gmail.com> - 69-13
- Remove the mingw32-pkg-config wrapper as well, now that we have separate
mingw32-pkg-config package
* Tue Jan 31 2012 Erik van Pienbroek <epienbro@fedoraproject.org> - 69-12 * Tue Jan 31 2012 Erik van Pienbroek <epienbro@fedoraproject.org> - 69-12
- Don't provide the wrapper i686-pc-mingw32-pkg-config anymore as we now - Don't provide the wrapper i686-pc-mingw32-pkg-config anymore as we now
have a mingw32-pkg-config package have a mingw32-pkg-config package

6
mingw32-scripts.sh
View File

@ -21,11 +21,7 @@
# This is a useful command-line script through which one can use the # This is a useful command-line script through which one can use the
# macros from mingw32-macros.mingw32 cross-compilation. # macros from mingw32-macros.mingw32 cross-compilation.
if [ "`basename $0`" = "i686-pc-mingw32-pkg-config" ] ; then NAME="_`basename $0|tr -- - _`"
NAME="_mingw32_pkg_config"
else
NAME="_`basename $0|tr -- - _`"
fi
# NOTE: The use of 'eval' in combination with '$@' is a potential security risk # NOTE: The use of 'eval' in combination with '$@' is a potential security risk
# We should find a more safe replacement for this command # We should find a more safe replacement for this command