rpms/qt4/devel qt4.spec,1.1,1.2

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	qt4.spec 
Log Message:
* Wed May 24 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.3-4
- move (most) %dir ownership (back) to main pkg



Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/devel/qt4.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qt4.spec	24 May 2006 14:06:14 -0000	1.1
+++ qt4.spec	24 May 2006 14:45:14 -0000	1.2
@@ -1,11 +1,8 @@
 
-# Currently under review for Fedora Extras at
-# http://bugzilla.redhat.com/bugzilla/188180
-
 Summary: Qt GUI toolkit
 Name:	 qt4
 Version: 4.1.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPL/QPL
 Group: 	 System Environment/Libraries
@@ -60,7 +57,7 @@
 BuildRequires: %{x_deps}
 
 %if %{mysql}
-# mysql-devel < 4 build fails, not sure why... yet.  -- Rex
+# 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")
@@ -321,26 +318,24 @@
 %{qtdir}/LICENSE.*
 /etc/ld.so.conf.d/*
 %dir %{qtdir}
+%dir %{qtdir}/bin/
 %dir %{qtdir}/%{_lib}/
 %{qtdir}/%{_lib}/lib*.so.*
 %dir %{qtdir}/plugins/
-%{qtdir}/plugins/imageformats/
 %{qtdir}/plugins/accessible/
+%{qtdir}/plugins/imageformats/
 %{qtdir}/plugins/inputmethods/
+%dir %{qtdir}/plugins/sqldrivers/
 %{qtdir}/translations/
 
 %files config
 %defattr(-,root,root,-)
-%dir %{qtdir}
-%dir %{qtdir}/bin/
 %{qtdir}/bin/qt*config*
 %{_bindir}/qt*config*
 %{_datadir}/applications/*qtconfig*.desktop
 
 %files devel
 %defattr(-,root,root,-)
-%dir %{qtdir}
-%dir %{qtdir}/bin/
 %{qtdir}/bin/lrelease*
 %{qtdir}/bin/lupdate*
 %{qtdir}/bin/moc*
@@ -360,9 +355,10 @@
 %{qtdir}/include/
 %{qtdir}/mkspecs/
 %dir %{qtdir}/%{_lib}
-%{qtdir}/%{_lib}/*.so
-%{qtdir}/%{_lib}/*.a
-%{qtdir}/%{_lib}/*.prl
+%{qtdir}/%{_lib}/lib*.so
+# 2 remaining static libs: libQtAssistantClient.a libQtUiTools.a 
+%{qtdir}/%{_lib}/lib*.a
+%{qtdir}/%{_lib}/lib*.prl
 %{qtdir}/phrasebooks/
 %{qtdir}/%{_lib}/*.pc
 %{_libdir}/pkgconfig/*.pc
@@ -382,8 +378,6 @@
 %defattr(-,root,root,-)
 %dir %{qt_docdir}/
 %{qt_docdir}/html
-%dir %{qtdir}
-%dir %{qtdir}/bin/
 %{qtdir}/doc
 %{qtdir}/demos/
 %{qtdir}/examples/
@@ -399,41 +393,32 @@
 %if %{odbc}
 %files odbc 
 %defattr(-,root,root,-)
-%dir %{qtdir}
-%dir %{qtdir}/plugins
-%dir %{qtdir}/plugins/sqldrivers
 %{qtdir}/plugins/sqldrivers/libqsqlodbc*
 %endif
 
 %if %{psql}
 %files postgresql 
 %defattr(-,root,root,-)
-%dir %{qtdir}
-%dir %{qtdir}/plugins
-%dir %{qtdir}/plugins/sqldrivers
 %{qtdir}/plugins/sqldrivers/libqsqlpsql*
 %endif
 
 %if %{mysql}
 %files mysql 
 %defattr(-,root,root,-)
-%dir %{qtdir}
-%dir %{qtdir}/plugins
-%dir %{qtdir}/plugins/sqldrivers
 %{qtdir}/plugins/sqldrivers/libqsqlmysql*
 %endif
 
 %if %{sqlite}
 %files sqlite 
 %defattr(-,root,root,-)
-%dir %{qtdir}
-%dir %{qtdir}/plugins
-%dir %{qtdir}/plugins/sqldrivers
 %{qtdir}/plugins/sqldrivers/libqsqlite*
 %endif
 
 
 %changelog
+* Wed May 24 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.3-4
+- move (most) %%dir ownership (back) to main pkg
+
 * Sun May 21 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.3-3
 - fix %%mysql_libs macro