|
@@ -1,6 +1,6 @@
|
|
|
%define type x11
|
|
%define type x11
|
|
|
%define qtdir %{_libdir}/qt-%{version}
|
|
%define qtdir %{_libdir}/qt-%{version}
|
|
|
-%define rel 6
|
|
|
|
|
|
|
+%define rel 7
|
|
|
%define buildstatic 1
|
|
%define buildstatic 1
|
|
|
%define buildnonthread 0
|
|
%define buildnonthread 0
|
|
|
%define styleplugins 0
|
|
%define styleplugins 0
|
|
@@ -47,25 +47,71 @@ Patch800: qt-x11-free-3.3.8-gcc43.patch
|
|
|
URL: http://www.qtsoftware.com/
|
|
URL: http://www.qtsoftware.com/
|
|
|
License: GPL/QPL
|
|
License: GPL/QPL
|
|
|
Group: System Environment/Libraries
|
|
Group: System Environment/Libraries
|
|
|
|
|
+
|
|
|
Buildroot: %{_tmppath}/%{name}-%{version}-root
|
|
Buildroot: %{_tmppath}/%{name}-%{version}-root
|
|
|
Prefix: %{qtdir}
|
|
Prefix: %{qtdir}
|
|
|
-BuildRequires: xorg-x11-devel mesa-libGLU-devel
|
|
|
|
|
-BuildRequires: openMotif-devel >= 2.2.2 libpng-devel >= 1.2.5
|
|
|
|
|
-BuildRequires: libmng-devel glibc-devel libjpeg-devel
|
|
|
|
|
-BuildRequires: zlib-devel libungif-devel freetype2-devel
|
|
|
|
|
-BuildRequires: postgresql-devel MySQL-devel unixODBC-devel
|
|
|
|
|
-BuildRequires: cups-devel >= 1.1.9
|
|
|
|
|
-BuildRequires: libstdc++34-devel
|
|
|
|
|
-Requires: libexpat libstdc++34
|
|
|
|
|
-Requires: libpng >= 1.2.5
|
|
|
|
|
-Requires: freetype2 libjpeg libmng zlib
|
|
|
|
|
|
|
+#BuildRequires: openMotif-devel >= 2.2.2
|
|
|
|
|
+BuildRequires: libmng-devel
|
|
|
|
|
+BuildRequires: glibc-devel
|
|
|
|
|
+BuildRequires: libjpeg-devel
|
|
|
|
|
+BuildRequires: libpng-devel >= 1.2.5
|
|
|
|
|
+BuildRequires: zlib-devel
|
|
|
|
|
+BuildRequires: giflib-devel
|
|
|
|
|
+BuildRequires: perl
|
|
|
|
|
+BuildRequires: sed
|
|
|
|
|
+BuildRequires: findutils
|
|
|
|
|
+BuildRequires: cups-devel
|
|
|
|
|
+BuildRequires: tar
|
|
|
|
|
+BuildRequires: freetype2-devel
|
|
|
|
|
+BuildRequires: fontconfig-devel
|
|
|
|
|
+BuildRequires: libXrender-devel
|
|
|
|
|
+BuildRequires: libXrandr-devel
|
|
|
|
|
+BuildRequires: libXcursor-devel
|
|
|
|
|
+BuildRequires: libXinerama-devel
|
|
|
|
|
+BuildRequires: libXft-devel
|
|
|
|
|
+BuildRequires: libXext-devel
|
|
|
|
|
+BuildRequires: libX11-devel
|
|
|
|
|
+BuildRequires: libSM-devel
|
|
|
|
|
+BuildRequires: libICE-devel
|
|
|
|
|
+BuildRequires: libXt-devel
|
|
|
|
|
+BuildRequires: libXmu-devel
|
|
|
|
|
+BuildRequires: libXi-devel
|
|
|
|
|
+BuildRequires: xorg-x11-proto-devel
|
|
|
|
|
+BuildRequires: mesa-libGL-devel
|
|
|
|
|
+BuildRequires: mesa-libGLU-devel
|
|
|
|
|
+BuildRequires: desktop-file-utils
|
|
|
|
|
+BuildRequires: MySQL-devel
|
|
|
|
|
+BuildRequires: postgresql-devel
|
|
|
|
|
+BuildRequires: unixODBC-devel
|
|
|
|
|
+
|
|
|
|
|
+#BuildPrereq: libstdc++34-devel
|
|
|
|
|
+#Requires: libexpat libstdc++34
|
|
|
|
|
+#Requires: libpng >= 1.2.5
|
|
|
|
|
+#Requires: freetype2 libjpeg libmng zlib
|
|
|
|
|
|
|
|
%package devel
|
|
%package devel
|
|
|
Summary: Development files and documentation for the Qt GUI toolkit.
|
|
Summary: Development files and documentation for the Qt GUI toolkit.
|
|
|
Group: Development/Libraries
|
|
Group: Development/Libraries
|
|
|
Requires: %{name} = %{version}-%{release}
|
|
Requires: %{name} = %{version}-%{release}
|
|
|
-Requires: xorg-x11-devel
|
|
|
|
|
-Requires: libmng-devel libjpeg-devel libpng-devel zlib-devel
|
|
|
|
|
|
|
+Requires: freetype2-devel
|
|
|
|
|
+Requires: fontconfig-devel
|
|
|
|
|
+Requires: libXrender-devel
|
|
|
|
|
+Requires: libXrandr-devel
|
|
|
|
|
+Requires: libXcursor-devel
|
|
|
|
|
+Requires: libXinerama-devel
|
|
|
|
|
+Requires: libXft-devel
|
|
|
|
|
+Requires: libXext-devel
|
|
|
|
|
+Requires: libX11-devel
|
|
|
|
|
+Requires: libSM-devel
|
|
|
|
|
+Requires: libICE-devel
|
|
|
|
|
+Requires: libXt-devel
|
|
|
|
|
+Requires: xorg-x11-proto-devel
|
|
|
|
|
+Requires: libpng-devel
|
|
|
|
|
+Requires: libjpeg-devel
|
|
|
|
|
+Requires: libmng-devel
|
|
|
|
|
+Requires: mesa-libGL-devel
|
|
|
|
|
+Requires: mesa-libGLU-devel
|
|
|
|
|
+Requires: zlib-devel
|
|
|
Requires(post): alternatives
|
|
Requires(post): alternatives
|
|
|
Requires(postun): alternatives
|
|
Requires(postun): alternatives
|
|
|
|
|
|
|
@@ -673,6 +719,9 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
%endif
|
|
%endif
|
|
|
|
|
|
|
|
%changelog
|
|
%changelog
|
|
|
|
|
+* Fri May 14 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 3.3.8-7
|
|
|
|
|
+- updated Requires of devel package
|
|
|
|
|
+
|
|
|
* Fri Feb 12 2010 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 3.3.8-6
|
|
* Fri Feb 12 2010 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 3.3.8-6
|
|
|
- rebuilt with new toolchain
|
|
- rebuilt with new toolchain
|
|
|
- s/BuildPrereq/BuildRequires/
|
|
- s/BuildPrereq/BuildRequires/
|
inagaki