packages: qt4/qt4.spec - %files first try, QtAssistant libs seem to be gone...

shadzik shadzik at pld-linux.org
Tue Sep 21 22:53:35 CEST 2010


Author: shadzik                      Date: Tue Sep 21 20:53:35 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- %files first try, QtAssistant libs seem to be gone, needs checking

---- Files affected:
packages/qt4:
   qt4.spec (1.249 -> 1.250) 

---- Diffs:

================================================================
Index: packages/qt4/qt4.spec
diff -u packages/qt4/qt4.spec:1.249 packages/qt4/qt4.spec:1.250
--- packages/qt4/qt4.spec:1.249	Tue Sep 21 22:41:50 2010
+++ packages/qt4/qt4.spec	Tue Sep 21 22:53:29 2010
@@ -1593,7 +1593,7 @@
 
 cd $RPM_BUILD_ROOT%{_includedir}/qt4/Qt
 # QtCore must be the last
-for f in ../Qt{3Support,Assistant,DBus,Designer,Gui,Help,Network,OpenGL,Script,Sql,Svg,Test,UiTools,WebKit,Xml,XmlPatterns,Core}/*; do
+for f in ../Qt{3Support,DBus,Designer,Gui,Help,Network,OpenGL,Script,Sql,Svg,Test,UiTools,WebKit,Xml,XmlPatterns,Core}/*; do
 	if [ ! -d $f ]; then
 		ln -sf $f `basename $f`
 	fi
@@ -1709,8 +1709,8 @@
 %endif
 
 # check whether no other fixes are needed
-mv $RPM_BUILD_ROOT%{_datadir}/locale/ja_JP/LC_MESSAGES/*.* \
-	$RPM_BUILD_ROOT%{_datadir}/locale/ja/LC_MESSAGES/
+#mv $RPM_BUILD_ROOT%{_datadir}/locale/ja_JP/LC_MESSAGES/*.* \
+#	$RPM_BUILD_ROOT%{_datadir}/locale/ja/LC_MESSAGES/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -1783,10 +1783,10 @@
 %attr(755,root,root) %{_libdir}/libQt3Support.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/libQt3Support.so.?
 
-%files -n QtAssistant
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libQtAssistantClient.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libQtAssistantClient.so.?
+#%files -n QtAssistant
+#%defattr(644,root,root,755)
+#%attr(755,root,root) %{_libdir}/libQtAssistantClient.so.*.*
+#%attr(755,root,root) %ghost %{_libdir}/libQtAssistantClient.so.?
 
 %files -n QtCLucene
 %defattr(644,root,root,755)
@@ -1986,7 +1986,7 @@
 %attr(755,root,root) %{_qtdir}/bin/pixeltool
 %attr(755,root,root) %{_qtdir}/bin/qcollectiongenerator
 %attr(755,root,root) %{_qtdir}/bin/assistant
-%attr(755,root,root) %{_qtdir}/bin/assistant_adp
+#%attr(755,root,root) %{_qtdir}/bin/assistant_adp
 %lang(da) %{_datadir}/locale/da/LC_MESSAGES/qt4-assistant*.qm
 %lang(de) %{_datadir}/locale/de/LC_MESSAGES/qt4-assistant*.qm
 %lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/qt4-assistant*.qm
@@ -2229,9 +2229,9 @@
 %defattr(644,root,root,755)
 %{_libdir}/libQtUiTools.a
 
-%files -n QtWebKit-static
-%defattr(644,root,root,755)
-%{_libdir}/libQtWebKit.a
+#%files -n QtWebKit-static
+#%defattr(644,root,root,755)
+#%{_libdir}/libQtWebKit.a
 
 %files -n QtXml-static
 %defattr(644,root,root,755)
@@ -2254,6 +2254,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.250  2010/09/21 20:53:29  shadzik
+- %files first try, QtAssistant libs seem to be gone, needs checking
+
 Revision 1.249  2010/09/21 20:41:50  arekm
 - kde patch is back
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/qt4/qt4.spec?r1=1.249&r2=1.250&f=u



More information about the pld-cvs-commit mailing list