Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=507a8aa0f10e6cdc16d10f9c287518500584c09e
commit 507a8aa0f10e6cdc16d10f9c287518500584c09e Author: Miklos Vajna <[email protected]> Date: Thu Aug 25 11:36:23 2011 +0200 gpm-1.20.6-6-i686 - drop no longer needed rc script diff --git a/source/base/gpm/FrugalBuild b/source/base/gpm/FrugalBuild index 70eaa55..5aa1401 100644 --- a/source/base/gpm/FrugalBuild +++ b/source/base/gpm/FrugalBuild @@ -3,7 +3,7 @@ pkgname=gpm pkgver=1.20.6 -pkgrel=5 +pkgrel=6 pkgdesc="General purpose mouse server" url="https://launchpad.net/gpm/"; depends=('ncurses>=5.6-4') @@ -12,17 +12,14 @@ groups=('base' 'chroot-core') archs=('i686' 'x86_64' 'ppc' 'arm') backup=(etc/sysconfig/gpm) up2date="Flasttar https://launchpad.net/gpm/"; -source=(http://launchpad.net/gpm/main/$pkgver/+download/gpm-$pkgver.tar.gz rc.gpm \ - rc.gpm-de.po gpm gpm.service) +source=(http://launchpad.net/gpm/main/$pkgver/+download/gpm-$pkgver.tar.gz \ + gpm gpm.service) sha1sums=('182ce6b0e3c376845063d01afae2bac865489f3e' \ - '809029674bc59833ffdc023e97a3b3cdf9f53d69' \ - '2f7c697b367ac05c61ec9f09649407be55daee91' \ 'c2c065d87d4a007ea923cea2bc7605c4cfc0451b' \ 'de2a9c6f0b9b4b899ec1b212f21c04c8d2aed39b') build() { - unset MAKEFLAGS ## 64bit need -fPIC if [ "$CARCH" == "x86_64" ]; then export CFLAGS="$CFLAGS -fPIC" @@ -31,7 +28,6 @@ build() # Fix for broken release (shipped .o in release tarball zz) find -name '*.o' -exec rm -v {} \; || Fdie Fbuild - Frcd2 Ffile /etc/sysconfig/gpm Ffile /lib/systemd/system/gpm.service } diff --git a/source/base/gpm/gpm.install b/source/base/gpm/gpm.install index 0e34415..a789d05 100644 --- a/source/base/gpm/gpm.install +++ b/source/base/gpm/gpm.install @@ -1,19 +1,14 @@ post_install() { - chkconfig --add rc.gpm systemctl enable gpm.service >/dev/null 2>&1 } post_upgrade() { systemctl daemon-reload >/dev/null 2>&1 - if [ `vercmp $2 1.20.6-3` -lt 0 ] ; then - if chkconfig rc.gpm; then - post_install - fi - fi + # this can be removed after Frugalware-1.6 + rm -f /etc/rc.d/rc?.d/???rc.gpm } pre_remove() { - chkconfig --del rc.gpm systemctl --no-reload disable gpm.service >/dev/null 2>&1 systemctl stop gpm.service >/dev/null 2>&1 } diff --git a/source/base/gpm/rc.gpm b/source/base/gpm/rc.gpm deleted file mode 100644 index 5cc484b..0000000 --- a/source/base/gpm/rc.gpm +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/bash - -# (c) 2005 Marcus Habermehl <[email protected]> -# (c) 2003-2004 Vajna Miklos <[email protected]> -# rc.gpm for Frugalware -# distributed under GPL License - -# chkconfig: 2345 85 15 -# description: GPM daemon - -source /lib/initscripts/functions -TEXTDOMAIN=gpm -TEXTDOMAINDIR=/lib/initscripts/messages - -actions=(restart start status stop) -daemon=$"gpm" - -pid="pidof gpm 2> /dev/null" - -rc_start() -{ - start_msg - if [ -e /etc/sysconfig/gpm ] && [[ "$(eval ${pid})" == "" ]] ; then - source /etc/sysconfig/gpm - [ ! -e /dev/mouse ] && ln -sf ${dev} /dev/mouse - # this enables the 2nd and 3rd mouse button on ppc - [ -d /proc/sys/dev/mac_hid ] && echo 1 > /proc/sys/dev/mac_hid/mouse_button_emulation - gpm -m /dev/mouse -t ${type} - ok $? - else - ok 999 - fi -} - -rc_stop() -{ - stop_msg - if [[ "$(eval ${pid})" != "" ]] ; then - /usr/sbin/gpm -k 2> /dev/null - ok $? - else - ok 999 - fi -} - -rc_exec $1 - -# vim: ft=sh diff --git a/source/base/gpm/rc.gpm-de.po b/source/base/gpm/rc.gpm-de.po deleted file mode 100644 index 377a804..0000000 --- a/source/base/gpm/rc.gpm-de.po +++ /dev/null @@ -1,21 +0,0 @@ -# rc.gpm. -# Copyright (C) 2005 THE rc.gpm'S COPYRIGHT HOLDER -# This file is distributed under the same license as the rc.gpm package. -# Marcus Habermehl <[email protected]>, 2005. -# -msgid "" -msgstr "" -"Project-Id-Version: rc.gpm\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-16 09:31+0100\n" -"PO-Revision-Date: 2005-11-16 09:33+0100\n" -"Last-Translator: Marcus Habermehl <[email protected]>\n" -"Language-Team: German <[email protected]>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-1\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: rc.gpm:18 -msgid "gpm" -msgstr "GPM" diff --git a/source/base/gpm/rc.gpm.pot b/source/base/gpm/rc.gpm.pot deleted file mode 100644 index fda7568..0000000 --- a/source/base/gpm/rc.gpm.pot +++ /dev/null @@ -1,21 +0,0 @@ -# rc.gpm. -# Copyright (C) YEAR THE rc.gpm'S COPYRIGHT HOLDER -# This file is distributed under the same license as the rc.gpm package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: rc.gpm\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-16 09:31+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <[email protected]>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: rc.gpm:18 -msgid "gpm" -msgstr "" _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
