SPECS: qt4.spec - added more Rs to {QtCore, QtGui, QtOpenGL}-devel -...

[charles]

Author: charles                      Date: Tue Jan 24 01:00:20 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added more Rs to {QtCore,QtGui,QtOpenGL}-devel
- s/qmake/qt4-qmake/
- optimize qmake.conf
- rm builddir from *.pc
- added missing dir to *-devel

---- Files affected:
SPECS:
   qt4.spec (1.57 -> 1.58) 

---- Diffs:

================================================================
Index: SPECS/qt4.spec
diff -u SPECS/qt4.spec:1.57 SPECS/qt4.spec:1.58
--- SPECS/qt4.spec:1.57	Tue Jan 24 00:52:20 2006
+++ SPECS/qt4.spec	Tue Jan 24 02:00:14 2006
@@ -149,6 +149,8 @@
 Summary(pl):	Podstawowe klasy używane przez inne moduły - pliki programistyczne
 Group:		X11/Development/Libraries
 Requires:	QtCore = %{epoch}:%{version}-%{release}
+Requires:	libstdc++-devel
+Requires:	zlib-devel
 
 %description -n QtCore-devel
 Core classes used by other modules - development files.
@@ -186,6 +188,10 @@
 Group:		X11/Development/Libraries
 Requires:	QtCore-devel = %{epoch}:%{version}-%{release}
 Requires:	QtGui = %{epoch}:%{version}-%{release}
+Requires:	freetype-devel >= 2.0.0
+Requires:	libpng-devel >= 1.0.8
+Requires:	xcursor-devel
+Requires:	xrender-devel
 
 %description -n QtGui-devel
 Graphical User Interface components - development files.
@@ -260,6 +266,7 @@
 Group:		X11/Development/Libraries
 Requires:	QtCore-devel = %{epoch}:%{version}-%{release}
 Requires:	QtOpenGL = %{epoch}:%{version}-%{release}
+Requires:	OpenGL-devel
 
 %description -n QtOpenGL-devel
 OpenGL support classes - development files.
@@ -671,16 +678,16 @@
 Gdy jeden z nich jest już przetłumaczony, automatycznie przechodzi do
 następnego, aż wszystkie będą przetłumaczone.
 
-%package -n qmake
+%package -n qt4-qmake
 Summary:	Qt makefile generator
 Summary(pl):	Generator plików makefile dla aplikacji Qt
 Group:		X11/Development/Tools
 
-%description -n qmake
+%description -n qt4-qmake
 A powerful makefile generator. It can create makefiles on any platform
 from a simple .pro definitions file.
 
-%description -n qmake -l pl
+%description -n qt4-qmake -l pl
 Rozbudowany generator plików makefile. Potrafi tworzyć pliki makefile
 na każdej platformi na podstawie łatwego w przygotowaniu pliku .pro.
 
@@ -780,6 +787,10 @@
 plik="mkspecs/linux-g++/qmake.conf"
 
 perl -pi -e "
+	s|QMAKE_CC.*=.*gcc|QMAKE_CC = %{__cc}|;
+	s|QMAKE_CXX.*=.*g\+\+|QMAKE_CXX = %{__cxx}|;
+	s|QMAKE_LINK.*=.*g\+\+|QMAKE_LINK = %{__cxx}|;
+	s|QMAKE_LINK_SHLIB.*=.*g\+\+|QMAKE_LINK_SHLIB = %{__cxx}|;
 	s|/usr/X11R6/lib|/usr/X11R6/%{_lib}|;
 	s|/usr/lib|%{_libdir}|;
 	s|\\(QTDIR\\)/lib|\\(QTDIR\\)/%{_lib}|;
@@ -1018,7 +1029,8 @@
 	fi
 	[ "$HAVEDEBUG" -eq 0 ] && DEFS="$DEFS -DQT_NO_DEBUG"
 
-	sed -i -e "s:-DQT_SHARED:-DQT_SHARED $DEFS:" $f
+	sed -i -e "s:-DQT_SHARED:-DQT_SHARED $DEFS:" \
+	    -e "s,-L$QTDIR/%{_lib},,g" $f
 done
 
 # Prepare some files list
@@ -1047,6 +1059,9 @@
 	ifecho $MODULE-devel "%{_libdir}/lib$MODULE*.la"
 	ifecho $MODULE-devel "%{_libdir}/lib$MODULE*.prl"
 	ifecho $MODULE-devel "%{_pkgconfigdir}/$MODULE*.pc"
+	if [ -d "$RPM_BUILD_ROOT%{_includedir}/qt4/$MODULE" ]; then
+		ifecho $MODULE-devel %{_includedir}/qt4/$MODULE
+	fi
 	for f in `find $RPM_BUILD_ROOT%{_includedir}/qt4/$MODULE -printf "%%P "`
 	do
 		ifecho $MODULE-devel %{_includedir}/qt4/$MODULE/$f
@@ -1268,7 +1283,7 @@
 %{_desktopdir}/linguist.desktop
 %{_pixmapsdir}/linguist.png
 
-%files -n qmake
+%files -n qt4-qmake
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/qmake
 %{_datadir}/qt4/mkspecs
@@ -1342,6 +1357,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.58  2006/01/24 01:00:14  charles
+- added more Rs to {QtCore,QtGui,QtOpenGL}-devel
+- s/qmake/qt4-qmake/
+- optimize qmake.conf
+- rm builddir from *.pc
+- added missing dir to *-devel
+
 Revision 1.57  2006/01/23 23:52:20  prism
 - a small fix for short-circuit build
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/qt4.spec?r1=1.57&r2=1.58&f=u