rpms/qt4/EL-4 .cvsignore, 1.14, 1.15 qt4.macros, 1.1, 1.2 qt4.spec, 1.33, 1.34

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/qt4/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28064

Modified Files:
	.cvsignore qt4.macros qt4.spec 
Log Message:
* Thu Mar 22 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.2.3-6
- -system-sqlite, BR: sqlite-devel
- drop mysql_config hackery

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



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qt4/EL-4/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	15 Mar 2007 20:02:20 -0000	1.14
+++ .cvsignore	23 Mar 2007 15:07:51 -0000	1.15
@@ -1,5 +1,3 @@
 clog
 OLD/
-qt-x11-opensource-src-4.2.1.tar.gz
-qt-x11-opensource-src-4.2.2.tar.gz
 qt-x11-opensource-src-4.2.3.tar.gz


Index: qt4.macros
===================================================================
RCS file: /cvs/extras/rpms/qt4/EL-4/qt4.macros,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qt4.macros	15 Mar 2007 20:02:20 -0000	1.1
+++ qt4.macros	23 Mar 2007 15:07:51 -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/EL-4/qt4.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- qt4.spec	15 Mar 2007 20:02:20 -0000	1.33
+++ qt4.spec	23 Mar 2007 15:07:51 -0000	1.34
@@ -13,7 +13,7 @@
 Summary: Qt toolkit
 Name:	 qt4
 Version: 4.2.3
-Release: 3%{?dist}
+Release: 6%{?dist}
 
 License: GPL/QPL
 Group: 	 System Environment/Libraries
@@ -105,19 +105,14 @@
 %if 0%{?fedora} > 4 || 0%{?rhel} > 4
 %define x_deps libICE-devel libSM-devel libXcursor-devel libXext-devel libXfixes-devel libXft-devel libXi-devel libXinerama-devel libXrandr-devel libXrender-devel libXt-devel libX11-devel xorg-x11-proto-devel libGL-devel libGLU-devel
 %endif
-BuildRequires: %{x_deps} %{?x_deps_GL_hack}
+BuildRequires: %{x_deps}
 
 %if "%{?nas}" == "-system-nas-sound"
 BuildRequires: nas-devel
 %endif
 
 %if "%{?mysql}" != "-no-sql-mysql"
-# mysql-devel < 4 build fails on 4.1.3+, not sure why... yet.  -- Rex
 BuildRequires: mysql-devel >= 4.0
-# If we get mysql3 to work, use mysql_config --cflags instead -- Rex
-%global mysql_include $(mysql_config --include 2> /dev/null || echo "-I%{_includedir}/mysql")
-%global mysql_libs    $(mysql_config --libs 2> /dev/null || echo "-L%{_libdir}/mysql")
-%global mysql_ldflags $(echo %{mysql_libs} | perl -pi -e "s, -l/?\\\S+,,g")
 %endif
 
 %if "%{?psql}" != "-no-sql-psql"
@@ -129,8 +124,8 @@
 %endif
 
 %if "%{?sqlite:1}" != "-no-sql-sqlite"
-# FIXME: currently BR not used, uses 3rd-party internal sources
-#BuildRequires: sqlite-devel
+%define _system_sqlite -system-sqlite
+BuildRequires: sqlite-devel
 %endif
 
 Obsoletes: %{name}-config < %{version}-%{release}
@@ -151,10 +146,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 +213,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.
@@ -307,10 +301,10 @@
   -glib \
   %{?qdbus} %{!?qdbus:-no-qdbus} \
   %{?nas} %{!?nas:-no-nas-sound} \
-  %{?mysql} %{?mysql_include} %{?mysql_ldflags} \
+  %{?mysql} \
   %{?psql} \
   %{?odbc} \
-  %{?sqlite} 
+  %{?sqlite} %{?_system_sqlite}
 
 make %{?_smp_mflags}
 
@@ -329,14 +323,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 \
   -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 +555,15 @@
 
 
 %changelog
+* Thu Mar 22 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.2.3-6
+- -system-sqlite, BR: sqlite-devel
+- drop mysql_config hackery
+
+* Wed Mar 21 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.2.3-5
+- 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