rpms/Miro/devel Miro.spec,1.38,1.39

[Michel Alexandre Salim]

Author: salimma

Update of /cvs/pkgs/rpms/Miro/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv427

Modified Files:
	Miro.spec 
Log Message:
* Fri Aug 22 2008 Michel Alexandre Salim <salimma at fedoraproject.org> - 1.2.6-3
- Do not create backup files when patching; the backup files get re-added during the build process



Index: Miro.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Miro/devel/Miro.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- Miro.spec	23 Aug 2008 01:00:30 -0000	1.38
+++ Miro.spec	23 Aug 2008 02:08:27 -0000	1.39
@@ -5,7 +5,7 @@
 
 Name:           Miro
 Version:        1.2.6
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Miro - Internet TV Player
 Group:          Applications/Multimedia
 License:        GPLv2+
@@ -33,11 +33,14 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1 -b .utf8
-%patch1 -p1 -b .xulrunner
-%patch2 -p1 -b .gcc43
+# Intentionally not using -b .<descr> :
+# Otherwise, the unpatched files get re-added into Miro
+# (and '.' breaks Python imports)
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
 # Enable this once Boost 1.36 enters, post-F10
-#patch3 -p1 -b .boost
+#patch3 -p1
 
 %build
 cd platform/gtk-x11 && CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
@@ -82,6 +85,9 @@
 
 
 %changelog
+* Fri Aug 22 2008 Michel Alexandre Salim <salimma at fedoraproject.org> - 1.2.6-3
+- Do not create backup files when patching; the backup files get re-added during the build process
+
 * Fri Aug 22 2008 Michel Salim <salimma at fedoraproject.org> - 1.2.6-2
 - Unapply boost patch; boost-1.36 has been backed out for F10