[Gnash-commit] /srv/bzr/gnash/trunk r12116: edit the Distribution field in the spec file too.

[Rob Savoye]

------------------------------------------------------------
revno: 12116
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Sat 2010-03-27 16:02:02 -0600
message:
  edit the Distribution field in the spec file too.
modified:
  packaging/redhat/gnash.spec
  packaging/rpm.am

=== modified file 'packaging/redhat/gnash.spec'
--- a/packaging/redhat/gnash.spec       2010-03-10 21:42:54 +0000
+++ b/packaging/redhat/gnash.spec       2010-03-27 22:02:02 +0000
@@ -1,9 +1,10 @@
 Name:           gnash
+# This next field gets edited by "make gnash.spec" when building an rpm
 Version:        trunk
 Release:        0
 Epoch:                 1
+# This next field gets edited by "make gnash.spec" when building an rpm
 Distribution:  fc12
-#Distribution: ydl6
 Summary:        GNU SWF player
 
 Group:          Applications/Multimedia

=== modified file 'packaging/rpm.am'
--- a/packaging/rpm.am  2010-03-11 21:04:55 +0000
+++ b/packaging/rpm.am  2010-03-27 22:02:02 +0000
@@ -27,14 +27,10 @@
 gnash.spec spec: $(srcdir)/packaging/redhat/gnash.spec
        snapshot_version="$(SNAPSHOT_VERSION)"; \
        snapshot_version=`echo $${snapshot_version}|tr "~" "_"`; \
-       echo "Editing the version in the spec file to be 
$${snapshot_version}..."; \
        distver=`cat /etc/redhat-release | cut -d ' ' -f 3`; \
-       if test ${distdir} -eq 12; then \
-         sed -e "s/Version.*/Version:  $${snapshot_version}/" 
$(srcdir)/packaging/redhat/gnash.spec > gnash.spec; \
-       else \
-         sed -e "s/Version.*/Version:  $${snapshot_version}/" \
-             -e "s/Distribution:   fc12/Distribution:   fc11/" 
$(srcdir)/packaging/redhat/gnash.spec > gnash.spec; \
-       fi
+       echo "Editing the version in the spec file to be $${snapshot_version} 
for Distribution $${distver}..."; \
+       sed -e "s/Version.*/Version:    $${snapshot_version}/" \
+           -e "s/Distribution:.*/Distribution:   fc$${distver}/" 
$(srcdir)/packaging/redhat/gnash.spec > gnash.spec; 
 
 
 # Build an Redhat/Fedora .rpm package