rpms/qt4/devel .cvsignore,1.2,1.3 qt4.spec,1.2,1.3

Fri May 26 18:01:15 UTC 2006

Author: rdieter

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

Modified Files:
	.cvsignore qt4.spec 
Log Message:
* Fri May 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.3-5
- strip -lXi from .pc files (#193258)
- simplify sql plugin builds via %buildSQL macro
- -libdir %qt_libdir 



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qt4/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

--- .cvsignore	24 May 2006 14:06:14 -0000	1.2
+++ .cvsignore	26 May 2006 18:01:15 -0000	1.3
@@ -1 +1,2 @@
+clog
 qt-x11-opensource-src-4.1.3.tar.gz


Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/devel/qt4.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qt4.spec	24 May 2006 14:45:14 -0000	1.2
+++ qt4.spec	26 May 2006 18:01:15 -0000	1.3
@@ -2,7 +2,7 @@
 Summary: Qt GUI toolkit
 Name:	 qt4
 Version: 4.1.3
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: GPL/QPL
 Group: 	 System Environment/Libraries
@@ -22,18 +22,16 @@
 Source24: qtconfig.desktop
 
 ## Optional bits
-# Build mysql plugins
-%define mysql 1
-# Build postgresql plugins
-%define psql 1
-# Build ODBC plugins
-%define odbc 1
-# Build sqlite plugins
-%define sqlite 1
+# Build SQL plugins (mysql, unixodbc, postgresql, sqlite)
+%define buildSQL 1
+# define to build sqlite2 plugin (FIXME/TODO)
+#define sqlite2 1
 
 %define qt_dirname qt4
 %define qtdir %{_libdir}/%{qt_dirname}
 %define qt_docdir %{_docdir}/%{name}-doc-%{version}
+# Be careful about ever changing this, some 3rd-party libs install here -- Rex
+%define qt_libdir %{qtdir}/%{_lib}
 
 Requires(post): /sbin/ldconfig fileutils /etc/ld.so.conf.d
 Requires(postun): /sbin/ldconfig fileutils /etc/ld.so.conf.d
@@ -56,24 +54,20 @@
 %endif
 BuildRequires: %{x_deps}
 
-%if %{mysql}
+%if %{buildSQL}
+# 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 || echo "-I%{_includedir}/mysql")
 %global mysql_libs    $(mysql_config --libs || echo "-L%{_libdir}/mysql")
 %global mysql_ldflags $(echo %{mysql_libs} | perl -pi -e "s, -l/?\\\S+,,g")
-%endif
 
-%if %{psql}
+# postgresql
 BuildRequires: postgresql-devel
-%endif
-
-%if %{odbc}
+# unixODBC
 BuildRequires: unixODBC-devel
-%endif
-
-%if %{sqlite}
+# sqlite
 BuildRequires: sqlite-devel
 %endif
 
@@ -160,9 +154,6 @@
 
 
 %build
-export QTDIR=`/bin/pwd`
-export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH"
-export PATH="$QTDIR/bin:$PATH"
 
 # drop -fexceptions from $RPM_OPT_FLAGS
 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
@@ -184,8 +175,8 @@
 echo yes | ./configure -v \
   -no-rpath \
   -prefix %{qtdir} \
-  -libdir %{qtdir}/%{_lib} \
   -docdir %{qt_docdir} \
+  -libdir %{qt_libdir} \
   -platform %{platform} \
   -release \
   -shared \
@@ -195,18 +186,12 @@
   -system-zlib \
   -system-libpng \
   -system-libjpeg \
-%if %{mysql}
+%if %{buildSQL}
   -plugin-sql-mysql \
   %{?mysql_include} \
   %{?mysql_ldflags}  \
-%endif
-%if %{psql}
   -plugin-sql-psql \
-%endif
-%if %{odbc}
   -plugin-sql-odbc \
-%endif
-%if %{sqlite}
   -plugin-sql-sqlite \
 %endif
   -cups \
@@ -227,27 +212,24 @@
 %install
 rm -rf %{buildroot}
 
-export QTDIR=`/bin/pwd`
-export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH"
-export PATH="$QTDIR/bin:$PATH"
-
 make install INSTALL_ROOT=%{buildroot}
 
 ## pkg-config
 # strip extraneous dirs/libraries -- Rex
 # safe ones
 for dep in -lmng -ljpeg -lpng -lz -lfreetype -lm %{?mysql_ldflags} -L%{_builddir}/qt-x11-opensource-src-%{version}/lib ; do
-  sed -i -e "s| $dep||g" %{buildroot}%{qtdir}/%{_lib}/*.la ||:
-  sed -i -e "s| $dep||g" %{buildroot}%{qtdir}/%{_lib}/*.pc
-  sed -i -e "s| $dep||g" %{buildroot}%{qtdir}/%{_lib}/*.prl
+  sed -i -e "s|$dep ||g" %{buildroot}%{qt_libdir}/lib*.la ||:
+  sed -i -e "s|$dep ||g" %{buildroot}%{qt_libdir}/*.pc
+  sed -i -e "s|$dep ||g" %{buildroot}%{qt_libdir}/*.prl
 done
 # not-so-safe, but we can try -- Rex
-for dep in -L/usr/X11R6/%{_lib} -lXrender -lXrandr -lXcursor -lXinerama -lXft -lfontconfig -lXext -lX11 -lSM -lICE -ldl -lpthread ; do
-  sed -i -e "s| $dep||g" %{buildroot}%{qtdir}/%{_lib}/*.la ||:
-  sed -i -e "s| $dep||g" %{buildroot}%{qtdir}/%{_lib}/*.pc
-  sed -i -e "s| $dep||g" %{buildroot}%{qtdir}/%{_lib}/*.prl
+# -L/usr/X11R6/%{_lib}
+for dep in -lXrender -lXrandr -lXcursor -lXinerama -lXi -lXft -lfontconfig -lXext -lX11 -lSM -lICE -ldl -lpthread ; do
+  sed -i -e "s|$dep ||g" %{buildroot}%{qt_libdir}/lib*.la ||:
+  sed -i -e "s|$dep ||g" %{buildroot}%{qt_libdir}/*.pc
+  sed -i -e "s|$dep ||g" %{buildroot}%{qt_libdir}/*.prl
 done
-sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" %{buildroot}%{qtdir}/%{_lib}/*.prl
+sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" %{buildroot}%{qt_libdir}/*.prl
 
 mkdir -p %{buildroot}%{_libdir}/pkgconfig/
 pushd  %{buildroot}%{_libdir}/pkgconfig
@@ -297,10 +279,10 @@
   %{SOURCE20} %{SOURCE21} %{SOURCE22} %{SOURCE23} %{SOURCE24}
 
 # .la files, die, die, die.
-rm -f %{buildroot}%{qtdir}/%{_lib}/lib*.la
+rm -f %{buildroot}%{qt_libdir}/lib*.la
 
 mkdir -p %{buildroot}/etc/ld.so.conf.d
-echo "%{qtdir}/%{_lib}" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf
+echo "%{qt_libdir}" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf
 
 
 %clean
@@ -319,8 +301,8 @@
 /etc/ld.so.conf.d/*
 %dir %{qtdir}
 %dir %{qtdir}/bin/
-%dir %{qtdir}/%{_lib}/
-%{qtdir}/%{_lib}/lib*.so.*
+%dir %{qt_libdir}
+%{qt_libdir}/lib*.so.*
 %dir %{qtdir}/plugins/
 %{qtdir}/plugins/accessible/
 %{qtdir}/plugins/imageformats/
@@ -354,13 +336,12 @@
 %{_bindir}/uic*
 %{qtdir}/include/
 %{qtdir}/mkspecs/
-%dir %{qtdir}/%{_lib}
-%{qtdir}/%{_lib}/lib*.so
+%{qt_libdir}/lib*.so
 # 2 remaining static libs: libQtAssistantClient.a libQtUiTools.a 
-%{qtdir}/%{_lib}/lib*.a
-%{qtdir}/%{_lib}/lib*.prl
+%{qt_libdir}/lib*.a
+%{qt_libdir}/lib*.prl
 %{qtdir}/phrasebooks/
-%{qtdir}/%{_lib}/*.pc
+%{qt_libdir}/*.pc
 %{_libdir}/pkgconfig/*.pc
 %{qtdir}/q3porting.xml
 # Qt designer
@@ -390,25 +371,19 @@
 %{_bindir}/qt*demo*
 %{_datadir}/applications/*qtdemo*.desktop
 
-%if %{odbc}
+%if %{buildSQL}
 %files odbc 
 %defattr(-,root,root,-)
 %{qtdir}/plugins/sqldrivers/libqsqlodbc*
-%endif
 
-%if %{psql}
 %files postgresql 
 %defattr(-,root,root,-)
 %{qtdir}/plugins/sqldrivers/libqsqlpsql*
-%endif
 
-%if %{mysql}
 %files mysql 
 %defattr(-,root,root,-)
 %{qtdir}/plugins/sqldrivers/libqsqlmysql*
-%endif
 
-%if %{sqlite}
 %files sqlite 
 %defattr(-,root,root,-)
 %{qtdir}/plugins/sqldrivers/libqsqlite*
@@ -416,6 +391,11 @@
 
 
 %changelog
+* Fri May 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.3-5
+- strip -lXi from .pc files (#193258)
+- simplify sql plugin builds via %%buildSQL macro
+- -libdir %%qt_libdir 
+
 * Wed May 24 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.3-4
 - move (most) %%dir ownership (back) to main pkg
 


