[Gnash-commit] /srv/bzr/gnash/trunk r10793: fix quote marks around none for revno. Reverse logic of which X11 dependencies are used when building rpms.

[rob]

------------------------------------------------------------
revno: 10793
committer: address@hidden
branch nick: trunk
timestamp: Wed 2009-04-15 10:13:42 -0600
message:
  fix quote marks around none for revno. Reverse logic of which X11 
dependencies are used when building rpms.
modified:
  Makefile.am
  packaging/redhat/gnash.spec

=== modified file 'Makefile.am'
--- a/Makefile.am       2009-04-14 18:43:12 +0000
+++ b/Makefile.am       2009-04-15 16:13:42 +0000
@@ -155,7 +155,7 @@
            echo "Using existing bzrversion.h"; \
        else \
            echo "Generating bzrversion.h"; \
-           echo "static const char *BRANCH_REVNO  = "none";\nstatic const char 
*BRANCH_NICK = "none";\n" > bzrversion.h; \
+           echo 'static const char *BRANCH_REVNO  = "none";\nstatic const char 
*BRANCH_NICK = "none";\n' > bzrversion.h; \
          fi; \
        fi
 

=== modified file 'packaging/redhat/gnash.spec'
--- a/packaging/redhat/gnash.spec       2009-04-15 04:36:35 +0000
+++ b/packaging/redhat/gnash.spec       2009-04-15 16:13:42 +0000
@@ -22,8 +22,8 @@
 %if %{distribution} != "ydl6"
 BuildRequires:  ffmpeg-devel
 %endif
-# Mandriva uses differ names for the X11 library packages
-%if %{distribution} != "mnb"
+# Mandriva uses different names for the X11 library packages
+%if %{distribution} != "fc10"
 BuildRequires:  libx11_6-devel libxt_6-devel
 %else
 BuildRequires:  libX11-devel libXt-devel xorg-x11-proto-devel 
@@ -32,10 +32,10 @@
 # Installation requirements
 Requires: libpng libjpeg libogg gtk2 glib2 atk pango
 # Mandriva uses differ names for the X11 library packages
-%if %{distribution} != "mnb"
+%if %{distribution} != "fc10"
+Requires: libx11_6 libxt_6
+%else
 Requires: libX11 libXt 
-%else
-Requires: libx11_6 libxt_6
 %endif
 Requires: agg boost libcurl SDL
 # YellowDog doesn't ship ffmpeg