rpms/mingw32-qt/devel .cvsignore, 1.1, 1.2 mingw32-qt.spec, 1.1, 1.2 sources, 1.1, 1.2

[Thomas M. Sailer]

Author: sailer

Update of /cvs/extras/rpms/mingw32-qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29191

Modified Files:
	.cvsignore mingw32-qt.spec sources 
Log Message:
actually import sources, move out qmake setup into separate package



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mingw32-qt/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Mar 2009 02:02:29 -0000	1.1
+++ .cvsignore	16 Mar 2009 02:31:08 -0000	1.2
@@ -0,0 +1 @@
+qt-win-opensource-src-4.5.0.zip


Index: mingw32-qt.spec
===================================================================
RCS file: /cvs/extras/rpms/mingw32-qt/devel/mingw32-qt.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mingw32-qt.spec	16 Mar 2009 02:25:38 -0000	1.1
+++ mingw32-qt.spec	16 Mar 2009 02:31:08 -0000	1.2
@@ -17,7 +17,7 @@
 
 Name:           mingw32-qt
 Version:        4.5.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Qt for Windows
 
 License:        GPLv3 with exceptions or LGPLv2 with exceptions
@@ -47,6 +47,7 @@
 Patch11:        mingw32-qt-4.4.3-no-fpu-functions.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 BuildArch:      noarch
 
 BuildRequires:  mingw32-filesystem >= 35
@@ -54,19 +55,19 @@
 BuildRequires:  mingw32-gcc-c++
 BuildRequires:  mingw32-binutils
 
-# For the native qmake, moc programs.
-# Note that the precise same native version is required - eg. moc will
-# not work unless it's the same version.
-#BuildRequires:  qt-devel = %{version}  Stupid, can't write this ...
-BuildRequires:  qt-devel
+# This is required because we want qmake
+BuildRequires:  qt4-devel = %{version}
 
 BuildRequires:  zip
 BuildRequires:  dos2unix
 
-# This is required because we want qmake, but also because we
-# install the cross-compile qmake specs into a directory owned
-# by this package.
-Requires:       qt-devel
+# This package contains the cross-compiler setup for qmake
+Requires:       mingw32-qt-qmake = %{version}
+
+# Obsolete qt-win package that was posted to the mingw
+# mailing list / is on annexia.org
+Obsoletes:      mingw32-qt-win <= 4.5.0
+Provides:       mingw32-qt-win = %{version}
 
 
 %description
@@ -110,6 +111,8 @@
   # Now build in this directory.
   pushd $d
   qmake-qt4 -win32 *.pro
+#  since we trash the PCH cache, everything is rebuilt again at install time,
+#  so there's no point in building now
 #  make %{?_smp_mflags}
   popd
 
@@ -164,11 +167,6 @@
 rm $RPM_BUILD_ROOT%{_libdir}/qt4/bin/*
 rm $RPM_BUILD_ROOT%{_libdir}/*.prl
 
-# Cross-compiler qmake specs.
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/qt4/mkspecs/fedora-win32-cross
-cp %{SOURCE3} %{SOURCE4} \
-  $RPM_BUILD_ROOT%{_libdir}/qt4/mkspecs/fedora-win32-cross
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -216,10 +214,14 @@
 %{_mingw32_includedir}/QtSvg/
 %{_mingw32_includedir}/QtSql/
 %{_mingw32_includedir}/Qt3Support/
-%{_libdir}/qt4/mkspecs/fedora-win32-cross
 
 
 %changelog
+* Sun Mar 16 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 4.5.0-3
+- moved cross compiler qmake setup files into separate package
+  to keep this package noarch
+- update BR, Provides, Obsoletes with reviewer suggestions
+
 * Thu Mar 12 2009 Thomas Sailer <t.sailer at alumni.ethz.ch> - 4.5.0-2
 - enable debug libraries
 - rename to mingw32-qt


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mingw32-qt/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Mar 2009 02:02:29 -0000	1.1
+++ sources	16 Mar 2009 02:31:08 -0000	1.2
@@ -0,0 +1 @@
+172c0157a4a53c362f780066ead9f88a  qt-win-opensource-src-4.5.0.zip