rpms/PyQt4/devel PyQt4.spec,1.51,1.52

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/PyQt4/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv8921

Modified Files:
	PyQt4.spec 
Log Message:
handle case where rpath is gone (yay)



Index: PyQt4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PyQt4/devel/PyQt4.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- PyQt4.spec	14 Jul 2010 16:17:27 -0000	1.51
+++ PyQt4.spec	14 Jul 2010 17:05:03 -0000	1.52
@@ -2,7 +2,7 @@
 # Fedora review: http://bugzilla.redhat.com/190189
 
 %if 0%{?fedora} > 13
-#global with_python3 1
+%global with_python3 1
 %endif
 
 Summary: Python bindings for Qt4
@@ -142,18 +142,17 @@ InstallPyQt4() {
   make install DESTDIR=%{buildroot} INSTALL_ROOT=%{buildroot}
 
   # fix/remove rpaths
-  chrpath --list   %{buildroot}$PySiteArch/PyQt4/QtCore.so
-  chrpath --delete %{buildroot}$PySiteArch/PyQt4/QtCore.so
+  chrpath --list   %{buildroot}$PySiteArch/PyQt4/QtCore.so && \
+  chrpath --delete %{buildroot}$PySiteArch/PyQt4/QtCore.so ||:
 
-  chrpath --list   %{buildroot}$PySiteArch/PyQt4/QtGui.so
-  chrpath --delete %{buildroot}$PySiteArch/PyQt4/QtGui.so
+  chrpath --list   %{buildroot}$PySiteArch/PyQt4/QtGui.so && \
+  chrpath --delete %{buildroot}$PySiteArch/PyQt4/QtGui.so ||:
 
-  chrpath --list   %{buildroot}$PySiteArch/PyQt4/QtDesigner.so
-  chrpath --delete %{buildroot}$PySiteArch/PyQt4/QtDesigner.so
+  chrpath --list   %{buildroot}$PySiteArch/PyQt4/QtDesigner.so && \
+  chrpath --delete %{buildroot}$PySiteArch/PyQt4/QtDesigner.so ||:
 }
 
 
-
 # Install Python 3 first, and move aside any executables, to avoid clobbering
 # the Python 2 installation:
 %if 0%{?with_python3}
@@ -165,10 +164,8 @@ popd
 InstallPyQt4 %{python_sitearch}
 
 # DBus bindings only work for Python 2 so far:
-chrpath --list   %{buildroot}%{python_sitelib}/dbus/mainloop/qt.so
-chrpath --delete %{buildroot}%{python_sitelib}/dbus/mainloop/qt.so
-
-
+chrpath --list   %{buildroot}%{python_sitelib}/dbus/mainloop/qt.so && \
+chrpath --delete %{buildroot}%{python_sitelib}/dbus/mainloop/qt.so ||:
 
 # HACK: fix multilb conflict, http://bugzilla.redhat.com/509415
 rm -fv %{buildroot}%{_bindir}/pyuic4