rpms/Miro/F-7 Miro-setup.py.patch,NONE,1.1 Miro.spec,1.5,1.6

[Alex Lancaster (alexlan)]

Author: alexlan

Update of /cvs/pkgs/rpms/Miro/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32661

Modified Files:
	Miro.spec 
Added Files:
	Miro-setup.py.patch 
Log Message:
* Thu Nov 01 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.9.9.1-6
- Update patch with workaround suggested on:
  http://bugzilla.pculture.org/show_bug.cgi?id=8579

* Wed Oct 31 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.9.9.1-5
- Add setup.py patch to ignore call to svn.


Miro-setup.py.patch:

--- NEW FILE Miro-setup.py.patch ---
--- platform/gtk-x11/setup.py.old	2007-10-31 22:42:40.000000000 -0700
+++ platform/gtk-x11/setup.py	2007-11-01 12:00:56.000000000 -0700
@@ -342,15 +342,9 @@
     def install_app_config(self):
         source = os.path.join(resource_dir, 'app.config.template')
         dest = '/usr/share/miro/resources/app.config'
-        revision = util.queryRevision(root_dir)
-        if revision is None:
-            revision = "unknown"
-            revisionurl = "unknown"
-            revisionnum = "unknown"
-        else:
-            revisionurl = revision[0]
-            revisionnum = revision[1]
-            revision = "%s - %s" % revision
+        revision = "unknown"
+        revisionurl = "unknown"
+        revisionnum = "unknown"
         if self.root:
             dest = change_root(self.root, dest)
         self.mkpath(os.path.dirname(dest))
@@ -361,7 +355,7 @@
                              APP_REVISION_NUM=revisionnum,
                              APP_REVISION_URL=revisionurl,
                              APP_PLATFORM='gtk-x11',
-                             BUILD_MACHINE="%s@%s" % (os.getlogin(),
+                             BUILD_MACHINE="%s@%s" % (os.getenv("USER"),
                                                       os.uname()[1]),
                              BUILD_TIME=str(time.time()),
                              MOZILLA_LIB_PATH=mozilla_lib_path[0])


Index: Miro.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Miro/F-7/Miro.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Miro.spec	31 Oct 2007 10:27:28 -0000	1.5
+++ Miro.spec	1 Nov 2007 19:22:43 -0000	1.6
@@ -5,12 +5,13 @@
 
 Name:           Miro
 Version:        0.9.9.1
-Release:        3%{?dist}
+Release:        6%{?dist}
 Summary:        Miro - Internet TV Player
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://www.getmiro.com/
 Source0:	http://ftp.osuosl.org/pub/pculture.org/miro/src/%{name}-%{version}.tar.gz
+Patch0:         Miro-setup.py.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  python-devel xine-lib-devel Pyrex 
 BuildRequires:  boost-devel qt-devel pygtk2-devel libXcursor-devel libXv-devel
@@ -28,6 +29,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p0
 
 %build
 cd platform/gtk-x11 && CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
@@ -63,6 +65,13 @@
 
 
 %changelog
+* Thu Nov 01 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.9.9.1-6
+- Update patch with workaround suggested on:
+  http://bugzilla.pculture.org/show_bug.cgi?id=8579
+
+* Wed Oct 31 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.9.9.1-5
+- Add setup.py patch to ignore call to svn.
+
 * Tue Oct 30 2007 Alex Lancaster <alexl at users.sourceforge.net> 0.9.9.1-3
 - Add BuildRequires: libXv-devel
 - Drop dbus patch