rpms/qt/devel qt.spec,1.186,1.187

Than Ngo (than) fedora-extras-commits at redhat.com
Fri Jun 13 17:28:36 UTC 2008


Author: than

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

Modified Files:
	qt.spec 
Log Message:
let rpm handle binaries conflicts




Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/devel/qt.spec,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- qt.spec	13 Jun 2008 17:16:54 -0000	1.186
+++ qt.spec	13 Jun 2008 17:27:49 -0000	1.187
@@ -445,10 +445,12 @@
 ln -s  ../../share/doc/qt4 %{buildroot}%{_qt4_prefix}/doc
 %endif
 
-
-pushd %{buildroot}%{_bindir}/
-  ln -s ../%{_lib}/qt4/bin/* .
-popd
+# let rpm handle binaries conflicts
+pushd %{buildroot}%{_qt4_bindir}
+for i in * ; do
+  mv $i ../../../bin/
+  ln -s ../../../bin/$i .
+done
 
 # _debug lib symlinks (see bug #196513)
 pushd %{buildroot}%{_qt4_libdir}




More information about the fedora-extras-commits mailing list