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

Sun Apr 22 18:03:39 UTC 2007

Date: Sunday, April 22, 2007 @ 14:03:39
  Author: jgc
    Path: /home/cvs-extra/extra/network/firestarter

Modified: PKGBUILD (1.14 -> 1.15) firestarter.install (1.8 -> 1.9)

upgpkg: firestarter 1.0.3-5
Move to /usr


---------------------+
 PKGBUILD            |   35 ++++++++++++++++++-----------------
 firestarter.install |   28 +++++++++++++---------------
 2 files changed, 31 insertions(+), 32 deletions(-)


Index: extra/network/firestarter/PKGBUILD
diff -u extra/network/firestarter/PKGBUILD:1.14 extra/network/firestarter/PKGBUILD:1.15

--- extra/network/firestarter/PKGBUILD:1.14	Thu Jan 18 19:51:30 2007
+++ extra/network/firestarter/PKGBUILD	Sun Apr 22 14:03:39 2007
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD,v 1.14 2007/01/19 00:51:30 tobias Exp $
+# $Id: PKGBUILD,v 1.15 2007/04/22 18:03:39 jgc Exp $
 # Maintainer: tobias <tobias at archlinux.org>
 # Contributor: Tobias Kieslich <tobias at justdreams.de>
 # kernel_log_path.patch by Darwin Bautista
@@ -6,10 +6,12 @@
 
 pkgname=firestarter
 pkgver=1.0.3
-pkgrel=4
+pkgrel=5
+arch=(i686)
+license=('GPL')
 pkgdesc="A frontend for the ip-tables netfilter, a kernel based firewall."
 url="http://www.fs-security.com/"
-depends=('libgnomeui>=2.16.1' 'iptables' 'logger' 'dhcp')
+depends=('libgnomeui>=2.18.1-2' 'iptables' 'logger' 'dhcp')
 install=firestarter.install
 source=(http://dl.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz
         firestarter.rc.d
@@ -18,7 +20,6 @@
          '9d6e37da8eb0d2f78ffc51f0f81b266e')
 
 build() {
-  [ -f /etc/profile.d/gnome.sh ] && . /etc/profile.d/gnome.sh
   cd ${startdir}/src/${pkgname}-${pkgver}/
 
   patch -Np1 -i ../firestarter-1.0.3-kernel_log_path.patch || return 1
@@ -27,28 +28,28 @@
   sed -i 's|/sbin/iptables|/usr/sbin/iptables|' src/firestarter.c
   sed -i 's|/sbin/iptables|/usr/sbin/iptables|' src/netfilter-script.c
 
-  ./configure --prefix=/opt/gnome --sysconfdir=/opt/gnome/etc
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
   make || return 1
-  make DESTDIR=${startdir}/pkg install
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install
+
+  mkdir -p ${startdir}/pkg/usr/share/gconf/schemas
+  gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/etc/gconf/schemas/*.schemas
+  rm -f ${startdir}/pkg/etc/gconf/schemas/*.schemas
 
   # install initscript
   install -Dm755 ../firestarter.rc.d ${startdir}/pkg/etc/rc.d/firestarter
 
-   # fix the .desktop files icon path to fully qualified
-  sed -i "s|firestarter.png|/opt/gnome/share/pixmaps/\0|" \
-    ${startdir}/pkg/opt/gnome/share/gnome/apps/Internet/${pkgname}.desktop
-
   # we move the .desktop file to a standard location and 
   # provide a second .desktop file that shows up only if gksu is installed
-  install -Dm644 ${startdir}/pkg/opt/gnome/share/gnome/apps/Internet/${pkgname}.desktop \
-    ${startdir}/pkg/opt/gnome/share/applications/${pkgname}.desktop
-  install -Dm644 ${startdir}/pkg/opt/gnome/share/gnome/apps/Internet/${pkgname}.desktop \
-    ${startdir}/pkg/opt/gnome/share/applications/${pkgname}-gksu.desktop
+  install -Dm644 ${startdir}/pkg/usr/share/gnome/apps/Internet/${pkgname}.desktop \
+    ${startdir}/pkg/usr/share/applications/${pkgname}.desktop
+  install -Dm644 ${startdir}/pkg/usr/share/gnome/apps/Internet/${pkgname}.desktop \
+    ${startdir}/pkg/usr/share/applications/${pkgname}-gksu.desktop
 
   # tweaks it to use gksu as starter
   sed -i "s|Exec=|TryExec=gksu\n\0gksu |" \
-    ${startdir}/pkg/opt/gnome/share/applications/${pkgname}-gksu.desktop
+    ${startdir}/pkg/usr/share/applications/${pkgname}-gksu.desktop
   sed -i "s|^Name.*$|\0 gksu|" \
-    ${startdir}/pkg/opt/gnome/share/applications/${pkgname}-gksu.desktop
-  rm -rf ${startdir}/pkg/opt/gnome/share/gnome
+    ${startdir}/pkg/usr/share/applications/${pkgname}-gksu.desktop
+  rm -rf ${startdir}/pkg/usr/share/gnome
 }
Index: extra/network/firestarter/firestarter.install
diff -u extra/network/firestarter/firestarter.install:1.8 extra/network/firestarter/firestarter.install:1.9
--- extra/network/firestarter/firestarter.install:1.8	Thu Jan 18 19:51:30 2007
+++ extra/network/firestarter/firestarter.install	Sun Apr 22 14:03:39 2007
@@ -1,7 +1,3 @@
-schemas=(
-  'opt/gnome/etc/gconf/schemas/firestarter.schemas'
-)
-
 post_install() {
   cat << EOM
   -->  This version comes with a system init script now. You have to run the
@@ -23,28 +19,30 @@
 EOM
 
   echo "installing gnome schemas ..."
-  for schema in "${schemas[@]}" ; do
-    GCONF_CONFIG_SOURCE=`opt/gnome/bin/gconftool-2 --get-default-source` \
-      opt/gnome/bin/gconftool-2 \
-      --makefile-install-rule "$schema" > /dev/null 2>&1
+  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
   done
   echo "update desktop mime database..."
   update-desktop-database -q
 }
 
+pre_upgrade() {
+  pre_remove
+}
+
 post_upgrade() {
   post_install $1
 }
 
 pre_remove() {
-  rm -rf /opt/gnome/etc/firestarter
-  rm -f /root/.firestarter
   echo "unregistering gnome schemas ..."
-  for schema in "${schemas[@]}" ; do
-    GCONF_CONFIG_SOURCE=`opt/gnome/bin/gconftool-2 --get-default-source` \
-      opt/gnome/bin/gconftool-2 \
-      --makefile-uninstall-rule "$schema" > /dev/null 2>&1
-  done
+  if [ -f opt/gnome/etc/gconf/schemas/firestarter.schemas ]; then
+    schema=opt/gnome/etc/gconf/schemas/firestarter.schemas
+  else
+    schema=usr/share/gconf/schemas/firestarter.schemas
+  fi
+    GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source` \
+      usr/bin/gconftool-2 --makefile-uninstall-rule $schema > /dev/null
 }
 
 post_remove() {


