diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-19 11:44:15 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-19 11:44:15 +0200 |
commit | f97d206e9152e1d29ad8fb9f2ea2aee95f1da625 (patch) | |
tree | af56a7953cb3e5e4619535b1509b85fec5408505 /libre/file-roller-libre | |
parent | 32ead4093d89e260920e5bb604e7eeeeff26e725 (diff) | |
parent | 85ca6bfccdec6939881572fb1154f1a07d54937c (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
core/openssl/PKGBUILD
testing/at-spi2-core/PKGBUILD
testing/brasero/PKGBUILD
testing/brasero/brasero.install
testing/cheese/PKGBUILD
testing/cheese/cheese.install
testing/clutter/PKGBUILD
testing/eog/PKGBUILD
testing/gdm/PKGBUILD
testing/gdm/gdm-autologin.pam
testing/gdm/gdm-fingerprint.pam
testing/gdm/gdm-password.pam
testing/gdm/gdm-smartcard.pam
testing/gedit/PKGBUILD
testing/gedit/gedit.install
testing/glib-networking/PKGBUILD
testing/glib-networking/glib-networking.install
testing/gnome-online-accounts/PKGBUILD
testing/gnome-screenshot/PKGBUILD
testing/gnome-system-log/PKGBUILD
testing/gnome-system-monitor/PKGBUILD
testing/gnome-system-monitor/gnome-system-monitor.install
testing/gobject-introspection/PKGBUILD
testing/gucharmap/PKGBUILD
testing/gucharmap/gucharmap.install
testing/libsoup/PKGBUILD
testing/nautilus/PKGBUILD
testing/nautilus/nautilus.install
testing/tomboy/PKGBUILD
testing/tomboy/tomboy.install
testing/vinagre/PKGBUILD
testing/vinagre/vinagre.install
testing/vino/PKGBUILD
testing/vino/vino.install
Diffstat (limited to 'libre/file-roller-libre')
-rw-r--r-- | libre/file-roller-libre/PKGBUILD | 6 | ||||
-rw-r--r-- | libre/file-roller-libre/file-roller.install | 17 |
2 files changed, 7 insertions, 16 deletions
diff --git a/libre/file-roller-libre/PKGBUILD b/libre/file-roller-libre/PKGBUILD index e5c488b79..14e9eab77 100644 --- a/libre/file-roller-libre/PKGBUILD +++ b/libre/file-roller-libre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 154606 2012-03-30 12:35:17Z heftig $ +# $Id: PKGBUILD 156381 2012-04-17 20:08:15Z ibiru $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> _pkgname=file-roller pkgname=file-roller-libre -pkgver=3.4.0 +pkgver=3.4.1 pkgrel=1 pkgdesc="Archive manipulator for GNOME" arch=('i686' 'x86_64' 'mips64el') @@ -25,7 +25,7 @@ options=('!libtool' '!emptydirs') install=file-roller.install url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz) -sha256sums=('79dfb3bc2e0fb68094180ae1845e4b6c253d5f231e3cf355521193848610c5dc') +sha256sums=('94600d880ce65ab171a174a83519e4911f570fd000c33497b4805100029ebd8b') build() { cd $_pkgname-$pkgver diff --git a/libre/file-roller-libre/file-roller.install b/libre/file-roller-libre/file-roller.install index 10a148241..8b17fa3d4 100644 --- a/libre/file-roller-libre/file-roller.install +++ b/libre/file-roller-libre/file-roller.install @@ -1,22 +1,13 @@ -pkgname=file-roller - post_install() { - glib-compile-schemas usr/share/glib-2.0/schemas + glib-compile-schemas /usr/share/glib-2.0/schemas update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then - usr/sbin/gconfpkg --uninstall ${pkgname} - fi + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor } post_upgrade() { - post_install $1 + post_install } - post_remove() { - post_install $1 + post_install } |