rpms/mingw32-qt/devel mingw32-qt.spec,1.15,1.16
sailer
sailer at fedoraproject.org
Wed Nov 11 15:01:47 UTC 2009
Author: sailer
Update of /cvs/extras/rpms/mingw32-qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13041
Modified Files:
mingw32-qt.spec
Log Message:
add links with version suffix for libqtmain{,d}.a
Index: mingw32-qt.spec
===================================================================
RCS file: /cvs/extras/rpms/mingw32-qt/devel/mingw32-qt.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- mingw32-qt.spec 3 Nov 2009 16:35:41 -0000 1.15
+++ mingw32-qt.spec 11 Nov 2009 15:01:47 -0000 1.16
@@ -18,7 +18,7 @@
Name: mingw32-qt
Version: 4.5.3
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Qt for Windows
License: GPLv3 with exceptions or LGPLv2 with exceptions
@@ -57,7 +57,9 @@ BuildRequires: mingw32-gcc-c++
BuildRequires: mingw32-binutils
# This is required because we want qmake
-BuildRequires: qt-devel = %{version}
+# temporarily disabled
+#BuildRequires: qt-devel = %{version}
+BuildRequires: qt-devel
BuildRequires: zip
BuildRequires: dos2unix
@@ -172,6 +174,11 @@ mv $RPM_BUILD_ROOT/usr/lib*/*.a $RPM_BUI
rm -rf $RPM_BUILD_ROOT%{_libdir}/qt4/bin
rm $RPM_BUILD_ROOT%{_libdir}/*.prl
+# add links with version suffix for convenience
+ln -s $RPM_BUILD_ROOT%{_mingw32_libdir}/libqtmain.a $RPM_BUILD_ROOT%{_mingw32_libdir}/libqtmain4.a
+ln -s $RPM_BUILD_ROOT%{_mingw32_libdir}/libqtmaind.a $RPM_BUILD_ROOT%{_mingw32_libdir}/libqtmaind4.a
+
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -211,6 +218,8 @@ rm -rf $RPM_BUILD_ROOT
%{_mingw32_libdir}/libQtGuid4.a
%{_mingw32_libdir}/libqtmain.a
%{_mingw32_libdir}/libqtmaind.a
+%{_mingw32_libdir}/libqtmain4.a
+%{_mingw32_libdir}/libqtmaind4.a
%{_mingw32_libdir}/libQtNetwork4.a
%{_mingw32_libdir}/libQtNetworkd4.a
%{_mingw32_libdir}/libQtOpenGL4.a
@@ -242,6 +251,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Nov 3 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 4.5.3-3
+- add links with version suffix for libqtmain{,d}.a
+
* Tue Nov 3 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 4.5.3-2
- fix R: qt-devel
More information about the fedora-extras-commits
mailing list