[arch-commits] CVS update of extra/network/firestarter (PKGBUILD firestarter.install)

[Jan de Groot]

    Date: Thursday, April 26, 2007 @ 17:11:53
  Author: jgc
    Path: /home/cvs-extra/extra/network/firestarter

Modified: PKGBUILD (1.16 -> 1.17) firestarter.install (1.10 -> 1.11)

upgpkg: firestarter 1.0.3-7
Fix install scriptlet:
- mkdir /etc/firestarter if it does not exist yet
- migrate old config from /opt/gnome unless new config has been made in /etc
- remove update-desktop-database, there is no trace of mimetypes
Do not restart the firestarter daemon, it will give unexpected results when users make changes outside of firestarter that get overwritten on restart.


---------------------+
 PKGBUILD            |    4 ++--
 firestarter.install |   16 ++++------------
 2 files changed, 6 insertions(+), 14 deletions(-)


Index: extra/network/firestarter/PKGBUILD
diff -u extra/network/firestarter/PKGBUILD:1.16 extra/network/firestarter/PKGBUILD:1.17
--- extra/network/firestarter/PKGBUILD:1.16	Mon Apr 23 12:28:21 2007
+++ extra/network/firestarter/PKGBUILD	Thu Apr 26 17:11:52 2007
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD,v 1.16 2007/04/23 16:28:21 jgc Exp $
+# $Id: PKGBUILD,v 1.17 2007/04/26 21:11:52 jgc Exp $
 # Maintainer: tobias <tobias at archlinux.org>
 # Contributor: Tobias Kieslich <tobias at justdreams.de>
 # kernel_log_path.patch by Darwin Bautista
@@ -6,7 +6,7 @@
 
 pkgname=firestarter
 pkgver=1.0.3
-pkgrel=6
+pkgrel=7
 arch=(i686 x86_64)
 license=('GPL')
 pkgdesc="A frontend for the ip-tables netfilter, a kernel based firewall."
Index: extra/network/firestarter/firestarter.install
diff -u extra/network/firestarter/firestarter.install:1.10 extra/network/firestarter/firestarter.install:1.11
--- extra/network/firestarter/firestarter.install:1.10	Mon Apr 23 12:28:21 2007
+++ extra/network/firestarter/firestarter.install	Thu Apr 26 17:11:53 2007
@@ -21,18 +21,15 @@
   echo "installing gnome schemas ..."
   GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source` \
       usr/bin/gconftool-2 --makefile-install-rule usr/share/gconf/schemas/firestarter.schemas > /dev/null
-  echo "update desktop mime database..."
-  update-desktop-database -q
 }
 
 pre_upgrade() {
-  if [ -d opt/gnome/etc/firestarter ]; then
+  [ ! -d etc/firestarter ] && mkdir -p etc/firestarter
+  if [ -d opt/gnome/etc/firestarter ] && [ "`find etc/firestarter -type f | wc -l`" = "1" ]; then
     mv opt/gnome/etc/firestarter/* etc/firestarter/
     rmdir opt/gnome/etc/firestarter
-    for file in etc/firestarter/*; do
-      if [ -f "${file}" ]; then
-        sed -e 's|/opt/gnome/bin|/usr/bin|g' -e 's|/opt/gnome||g' -i "${file}"
-      fi
+    for file in `find etc/firestarter -type f`; do
+      sed -e 's|/opt/gnome/bin|/usr/bin|g' -e 's|/opt/gnome||g' -i "${file}"
     done
   fi
   pre_remove
@@ -53,11 +50,6 @@
       usr/bin/gconftool-2 --makefile-uninstall-rule $schema > /dev/null
 }
 
-post_remove() {
-  echo "update desktop mime database..."
-  update-desktop-database -q
-}
-
 op=$1
 shift
 $op $*