rpms/qt4/devel qt4.macros,1.1,1.2 qt4.spec,1.37,1.38

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/qt4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11845

Modified Files:
	qt4.macros qt4.spec 
Log Message:
* Wed Mar 21 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.2.3-4
- strip (all) glib2 libs from .pc files
- prepend _ to rpm macros
- drop Obsoletes: qt4-debug



Index: qt4.macros
===================================================================
RCS file: /cvs/extras/rpms/qt4/devel/qt4.macros,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qt4.macros	14 Mar 2007 13:17:14 -0000	1.1
+++ qt4.macros	21 Mar 2007 20:47:50 -0000	1.2
@@ -1,11 +1,11 @@
 
-%qt4_prefix	%{_libdir}/qt4	
-%qt4_bindir	%{qt4_prefix}/bin
-%qt4_datadir	%{_datadir}/qt4	
-%qt4_docdir	%{_docdir}/qt4	
-%qt4_headerdir  %{_includedir}
-%qt4_libdir     %{_libdir}
-%qt4_plugindir	%{qt4_prefix}/plugins
-%qt4_sysconfdir	%{_sysconfdir}
-%qt4_translationdir	%{qt4_datadir}/translations	
+%_qt4_prefix	%{_libdir}/qt4	
+%_qt4_bindir	%{qt4_prefix}/bin
+%_qt4_datadir	%{_datadir}/qt4	
+%_qt4_docdir	%{_docdir}/qt4	
+%_qt4_headerdir  %{_includedir}
+%_qt4_libdir     %{_libdir}
+%_qt4_plugindir	%{qt4_prefix}/plugins
+%_qt4_sysconfdir	%{_sysconfdir}
+%_qt4_translationdir	%{qt4_datadir}/translations	
 


Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/devel/qt4.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- qt4.spec	15 Mar 2007 12:26:22 -0000	1.37
+++ qt4.spec	21 Mar 2007 20:47:50 -0000	1.38
@@ -13,7 +13,7 @@
 Summary: Qt toolkit
 Name:	 qt4
 Version: 4.2.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPL/QPL
 Group: 	 System Environment/Libraries
@@ -151,10 +151,9 @@
 Requires: libpng-devel
 Requires: libjpeg-devel
 Requires: pkgconfig
-# %{_sysconfdir}/rpm/macros.qt4
+#Requires: glib2-devel
+## %{_sysconfdir}/rpm/macros.qt4
 Requires: rpm
-# Short-lived pkg, temporary 
-Obsoletes: %{name}-debug < %{version}-%{release}
 Obsoletes: %{name}-designer < %{version}-%{release}
 Provides:  %{name}-designer = %{version}-%{release}
 %description devel
@@ -219,7 +218,7 @@
 
 
 %prep
-%setup -q -n qt-x11%{?preview}-opensource-src-%{version}%{?beta:-%{beta}}
+%setup -q -n qt-x11%{?preview}-opensource-src-%{version}%{?beta}
 
 %patch1 -p1 -b .assistant4
 # don't use -b on mkspec files, else they get installed too.
@@ -329,14 +328,15 @@
 ## pkg-config
 # strip extraneous dirs/libraries -- Rex
 # safe ones
-for dep in -laudio -ldbus-1 -lglib-2.0 -lmng -ljpeg -lpng -lz -lfreetype -lm %{?mysql_ldflags} \
+glib2_libs=$(pkg-config --libs glib-2.0 gthread-2.0)
+for dep in -laudio -ldbus-1 -lfreetype -lfontconfig ${glib2_libs} -lmng -ljpeg -lpng -lm -lz %{?mysql_ldflags} \
   -L%{_builddir}/qt-x11%{?preview}-opensource-src-%{version}%{?beta:-%{beta}}/lib ; do
   sed -i -e "s|$dep ||g" %{buildroot}%{qt4_libdir}/lib*.la ||:
   sed -i -e "s|$dep ||g" %{buildroot}%{qt4_libdir}/*.pc
   sed -i -e "s|$dep ||g" %{buildroot}%{qt4_libdir}/*.prl
 done
 # riskier
-for dep in -lXrender -lXrandr -lXcursor -lXfixes -lXinerama -lXi -lXft -lXt -lfontconfig -lXext -lX11 -lSM -lICE -ldl -lpthread ; do
+for dep in -lXrender -lXrandr -lXcursor -lXfixes -lXinerama -lXi -lXft -lXt -lXext -lX11 -lSM -lICE -ldl -lpthread ; do
   sed -i -e "s|$dep ||g" %{buildroot}%{qt4_libdir}/lib*.la ||:
   sed -i -e "s|$dep ||g" %{buildroot}%{qt4_libdir}/*.pc
   sed -i -e "s|$dep ||g" %{buildroot}%{qt4_libdir}/*.prl
@@ -560,6 +560,11 @@
 
 
 %changelog
+* Wed Mar 21 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.2.3-4
+- strip (all) glib2 libs from .pc files
+- prepend _ to rpm macros
+- drop Obsoletes: qt4-debug
+
 * Thu Mar 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.2.3-3
 - make /etc/rpm/macros.qt4 owned only by qt4-devel