[Gnash-commit] /srv/bzr/gnash/trunk r10587: use 'system' install option instead of a pile of seperate options.

[rob]

------------------------------------------------------------
revno: 10587
committer: address@hidden
branch nick: trunk
timestamp: Sun 2009-02-15 08:36:01 -0700
message:
  use 'system' install option instead of a pile of seperate options.
modified:
  packaging/redhat/gnash.spec
  packaging/redhat/klash.spec

=== modified file 'packaging/redhat/gnash.spec'
--- a/packaging/redhat/gnash.spec       2009-02-14 16:31:57 +0000
+++ b/packaging/redhat/gnash.spec       2009-02-15 15:36:01 +0000
@@ -156,7 +156,8 @@
         --prefix=/usr \
        --mandir=%{_prefix}/share/man \
        --infodir=%{_prefix}/share/info \
-       --with-npapi-plugindir=%{_libdir}/mozilla/plugins
+        --with-npapi-install=system 
+#      --with-npapi-plugindir=%{_libdir}/mozilla/plugins
 
 make $(MAKEFLAGS) dumpconfig all
 %endif

=== modified file 'packaging/redhat/klash.spec'
--- a/packaging/redhat/klash.spec       2009-02-14 16:31:57 +0000
+++ b/packaging/redhat/klash.spec       2009-02-15 15:36:01 +0000
@@ -68,16 +68,16 @@
 GUI="" # --enable-gui=gtk,kde3,kde4
 SOUND="--enable-media=ffmpeg --enable-jemalloc"
 RENDERER="" # --enable-render=ogl
-KDE3_OPTS="--with-kde3-plugindir=%{_libdir}/kde3/plugins \
-        --with-kde3-pluginprefix=%{_prefix} \
-        --with-kde3-servicesdir=%{_prefix}/share/services \
-        --with-kde3-appsdatadir=%{_prefix}/share/apps/klash \
-        --with-kde3-configdir=${_datadir}/config"
-KDE4_OPTS="--with-kde4-plugindir=%{_libdir}/kde4/plugins \
-        --with-kde4-pluginprefix=%{_prefix} \
-        --with-kde4-servicesdir=%{_prefix}/share/services \
-        --with-kde4-appsdatadir=%{_prefix}/share/apps/klash \
-        --with-kde4-configdir=${_datadir}/config"
+# KDE3_OPTS="--with-kde3-plugindir=%{_libdir}/kde3/plugins \
+#         --with-kde3-pluginprefix=%{_prefix} \
+#         --with-kde3-servicesdir=%{_prefix}/share/services \
+#         --with-kde3-appsdatadir=%{_prefix}/share/apps/klash \
+#         --with-kde3-configdir=${_datadir}/config"
+# KDE4_OPTS="--with-kde4-plugindir=%{_libdir}/kde4/plugins \
+#         --with-kde4-pluginprefix=%{_prefix} \
+#         --with-kde4-servicesdir=%{_prefix}/share/services \
+#         --with-kde4-appsdatadir=%{_prefix}/share/apps/klash \
+#         --with-kde4-configdir=${_datadir}/config"
 
 # we disable the testuites by default, as when building packages we
 # should have already been running the testsuites as part of the 
@@ -93,9 +93,7 @@
         --prefix=/usr \
        --mandir=%{_prefix}/share/man \
        --infodir=%{_prefix}/share/info \
-       --with-npapi-plugindir=%{_libdir}/mozilla/plugins \
-       $KDE3_OPTS \
-       $KDE$_OPTS
+        --with-plugins-install=system
 
 make $(MAKEFLAGS) dumpconfig all
 # When testing the spec file, try setting MAKEFLAGS to