rpms/Miro/devel Miro.spec,1.15,1.16 Miro-xulrunner.patch,1.1,1.2

Alex Lancaster (alexlan) fedora-extras-commits at redhat.com
Wed Jan 9 06:20:35 UTC 2008 

Author: alexlan

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

Modified Files:
	Miro.spec Miro-xulrunner.patch 
Log Message:
* Tue Jan  8 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.0-5
- Update xulrunner patch to use upstream .pc files



Index: Miro.spec
===================================================================
RCS file: /cvs/extras/rpms/Miro/devel/Miro.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Miro.spec	23 Dec 2007 08:14:19 -0000	1.15
+++ Miro.spec	9 Jan 2008 06:19:56 -0000	1.16
@@ -5,7 +5,7 @@
 
 Name:           Miro
 Version:        1.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Miro - Internet TV Player
 Group:          Applications/Multimedia
 License:        GPLv2+
@@ -69,48 +69,51 @@
 
 
 %changelog
-* Sun Dec 23 2007 Alex Lancaster <alexlan at fedoraproject.org> 1.0-4
+* Tue Jan  8 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.0-5
+- Update xulrunner patch to use upstream .pc files
+
+* Sun Dec 23 2007 Alex Lancaster <alexlan[AT]fedoraproject org> 1.0-4
 - Add support for python eggs for F9+
 
-* Sun Dec 23 2007 Alex Lancaster <alexlan at fedoraproject.org> 1.0-3
+* Sun Dec 23 2007 Alex Lancaster <alexlan[AT]fedoraproject org> 1.0-3
 - Re-enable gecko-libs 1.9, as 1.8.1.10 has now gone away as a BR.
 - Add first-cut patch from Martin Stransky from #393521 that attempts to
   patch Miro to work against xulrunner. Likely incomplete. 
 
-* Tue Dec  4 2007 Alex Lancaster <alexlan at fedoraproject.org> 1.0-2
+* Tue Dec  4 2007 Alex Lancaster <alexlan[AT]fedoraproject org> 1.0-2
 - Back to building against 1.8.1.10 (firefox) until #393521 is fixed.
 
-* Fri Nov 16 2007 Alex Lancaster <alexlan at fedoraproject.org> 1.0-1
+* Fri Nov 16 2007 Alex Lancaster <alexlan[AT]fedoraproject org> 1.0-1
 - Update to latest upstream (1.0).
 
-* Wed Nov 14 2007 Alex Lancaster <alexlan at fedoraproject.org> 0.9.9.9-2
+* Wed Nov 14 2007 Alex Lancaster <alexlan[AT]fedoraproject org> 0.9.9.9-2
 - Build against gecko-libs 1.9 (new xulrunner)
 
-* Fri Nov 09 2007 Alex Lancaster <alexlan at fedoraproject.org> 0.9.9.9-1
+* Fri Nov 09 2007 Alex Lancaster <alexlan[AT]fedoraproject org> 0.9.9.9-1
 - Update to latest upstream (0.9.9.9)
 - Build against gecko-libs 1.8.1.9 (firefox 2.0.0.9)
 - Include xine_extractor in package (thanks to Jason Farrell)
 - Drop Miro-setup.py.patch
 
-* Thu Nov 01 2007 Alex Lancaster <alexlan at fedoraproject.org> 0.9.9.1-6
+* Thu Nov 01 2007 Alex Lancaster <alexlan[AT]fedoraproject org> 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 <alexlan at fedoraproject.org> 0.9.9.1-5
+* Wed Oct 31 2007 Alex Lancaster <alexlan[AT]fedoraproject org> 0.9.9.1-5
 - Add setup.py patch to ignore call to svn.
 
-* Tue Oct 30 2007 Alex Lancaster <alexlan at fedoraproject.org> 0.9.9.1-3
+* Tue Oct 30 2007 Alex Lancaster <alexlan[AT]fedoraproject org> 0.9.9.1-3
 - Add BuildRequires: libXv-devel
 - Drop dbus patch
 
-* Sun Oct 28 2007 Alex Lancaster <alexlan at fedoraproject.org> 0.9.9.1-1
+* Sun Oct 28 2007 Alex Lancaster <alexlan[AT]fedoraproject org> 0.9.9.1-1
 - Update to latest upstream (0.9.9.1)
 
-* Fri Oct 26 2007 Alex Lancaster <alexlan at fedoraproject.org> 0.9.8.1-8
+* Fri Oct 26 2007 Alex Lancaster <alexlan[AT]fedoraproject org> 0.9.8.1-8
 - Replace Requires and BuildRequires for firefox with gecko to 
   smooth eventual xulrunner transition 
 
-* Thu Oct 25 2007 Alex Lancaster <alexlan at fedoraproject.org> 0.9.8.1-7
+* Thu Oct 25 2007 Alex Lancaster <alexlan[AT]fedoraproject org> 0.9.8.1-7
 - Rebuild for new Firefox (2.0.0.8)
 - License: GPLv2+ to conform with Fedora licensing guidelines
 

Miro-xulrunner.patch:

Index: Miro-xulrunner.patch
===================================================================
RCS file: /cvs/extras/rpms/Miro/devel/Miro-xulrunner.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Miro-xulrunner.patch	23 Dec 2007 08:02:20 -0000	1.1
+++ Miro-xulrunner.patch	9 Jan 2008 06:19:56 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up Miro-1.0/platform/gtk-x11/setup.py.xl Miro-1.0/platform/gtk-x11/setup.py
 --- Miro-1.0/platform/gtk-x11/setup.py.xl	2007-11-13 02:22:57.000000000 +0100
-+++ Miro-1.0/platform/gtk-x11/setup.py	2007-12-03 12:27:11.000000000 +0100
++++ Miro-1.0/platform/gtk-x11/setup.py	2008-01-07 13:30:47.000000000 +0100
 @@ -168,7 +168,7 @@ def getCommandOutput(cmd, warnOnStderr =
                  (cmd, p.returncode))
      return stdout
@@ -23,6 +23,19 @@
      output = getCommandOutput(commandLine).strip()
      for comp in output.split():
          prefix, rest = comp[:2], comp[2:]
+@@ -216,9 +220,9 @@ try:
+     packages = getCommandOutput("pkg-config --list-all")
+ except RuntimeError, error:
+     sys.exit("Package config error:\n%s" % (error,))
+-if re.search("^xulrunner-xpcom", packages, re.MULTILINE):
+-    xpcom = 'xulrunner-xpcom'
+-    gtkmozembed = 'xulrunner-gtkmozembed'
++if re.search("^libxul", packages, re.MULTILINE):
++    xpcom = 'libxul'
++    gtkmozembed = 'mozilla-gtkmozembed'
+ elif re.search("^mozilla-xpcom", packages, re.MULTILINE):
+     xpcom = 'mozilla-xpcom'
+     gtkmozembed = 'mozilla-gtkmozembed'
 @@ -250,21 +254,10 @@ def allInDir(directory, subdirs):
          if not os.path.exists(os.path.join(directory, subdir)):
              return False
@@ -51,7 +64,7 @@
  for dir in mozilla_browser_options['include_dirs']:
 diff -up Miro-1.0/platform/gtk-x11/frontend_implementation/XPCOMUtil.cc.xl Miro-1.0/platform/gtk-x11/frontend_implementation/XPCOMUtil.cc
 --- Miro-1.0/platform/gtk-x11/frontend_implementation/XPCOMUtil.cc.xl	2007-11-13 02:22:57.000000000 +0100
-+++ Miro-1.0/platform/gtk-x11/frontend_implementation/XPCOMUtil.cc	2007-12-03 12:27:11.000000000 +0100
++++ Miro-1.0/platform/gtk-x11/frontend_implementation/XPCOMUtil.cc	2008-01-07 13:28:24.000000000 +0100
 @@ -17,13 +17,12 @@
   * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
@@ -69,7 +82,7 @@
  // XPCOMUtil.cc
 diff -up Miro-1.0/platform/gtk-x11/frontend_implementation/MozillaBrowserXPCOM.cc.xl Miro-1.0/platform/gtk-x11/frontend_implementation/MozillaBrowserXPCOM.cc
 --- Miro-1.0/platform/gtk-x11/frontend_implementation/MozillaBrowserXPCOM.cc.xl	2007-11-13 02:22:57.000000000 +0100
-+++ Miro-1.0/platform/gtk-x11/frontend_implementation/MozillaBrowserXPCOM.cc	2007-12-03 12:35:42.000000000 +0100
++++ Miro-1.0/platform/gtk-x11/frontend_implementation/MozillaBrowserXPCOM.cc	2008-01-07 13:28:24.000000000 +0100
 @@ -17,7 +17,6 @@
   * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
@@ -100,7 +113,7 @@
  void freeString(char* str)
 diff -up Miro-1.0/platform/gtk-x11/frontend_implementation/HttpObserver.cc.xl Miro-1.0/platform/gtk-x11/frontend_implementation/HttpObserver.cc
 --- Miro-1.0/platform/gtk-x11/frontend_implementation/HttpObserver.cc.xl	2007-11-13 02:22:57.000000000 +0100
-+++ Miro-1.0/platform/gtk-x11/frontend_implementation/HttpObserver.cc	2007-12-03 12:27:11.000000000 +0100
++++ Miro-1.0/platform/gtk-x11/frontend_implementation/HttpObserver.cc	2008-01-07 13:28:24.000000000 +0100
 @@ -26,7 +26,6 @@
  // NOTE: we could have code to register the class with XPCOM, but since we
  // only construct it from inside miro, there's no need.
@@ -145,7 +158,7 @@
          channel->SetRequestHeader(nsDependentCString("X-Miro"), 
 diff -up Miro-1.0/platform/gtk-x11/frontend_implementation/XPCOMUtil.h.xl Miro-1.0/platform/gtk-x11/frontend_implementation/XPCOMUtil.h
 --- Miro-1.0/platform/gtk-x11/frontend_implementation/XPCOMUtil.h.xl	2007-11-13 02:22:57.000000000 +0100
-+++ Miro-1.0/platform/gtk-x11/frontend_implementation/XPCOMUtil.h	2007-12-03 12:27:11.000000000 +0100
++++ Miro-1.0/platform/gtk-x11/frontend_implementation/XPCOMUtil.h	2008-01-07 13:28:24.000000000 +0100
 @@ -21,7 +21,7 @@
  #define XPCOM_UTIL_H
  
@@ -157,7 +170,7 @@
  
 diff -up Miro-1.0/platform/gtk-x11/frontend_implementation/DragAndDrop.cc.xl Miro-1.0/platform/gtk-x11/frontend_implementation/DragAndDrop.cc
 --- Miro-1.0/platform/gtk-x11/frontend_implementation/DragAndDrop.cc.xl	2007-11-13 02:22:57.000000000 +0100
-+++ Miro-1.0/platform/gtk-x11/frontend_implementation/DragAndDrop.cc	2007-12-03 12:27:11.000000000 +0100
++++ Miro-1.0/platform/gtk-x11/frontend_implementation/DragAndDrop.cc	2008-01-07 13:28:24.000000000 +0100
 @@ -17,13 +17,11 @@
   * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */

More information about the fedora-extras-commits mailing list