[arch-commits] Commit in transmission-cli/trunk (5 files)

Alexander Fehr alexanderf at archlinux.org
Mon Jul 21 13:03:50 UTC 2008


    Date: Monday, July 21, 2008 @ 09:03:49
  Author: alexanderf
Revision: 5831

upgpkg: transmission-cli 1.22-1

Added:
  transmission-cli/trunk/transmission-cli.install
    (from rev 5830, transmission-cli/trunk/transmission.install)
Modified:
  transmission-cli/trunk/ChangeLog
  transmission-cli/trunk/PKGBUILD
  transmission-cli/trunk/transmissiond
Deleted:
  transmission-cli/trunk/transmission.install

--------------------------+
 ChangeLog                |   33 ++++++++++++++++++---------
 PKGBUILD                 |   45 ++++++++++++++++++------------------
 transmission-cli.install |   13 ++++++++++
 transmission.install     |   55 ---------------------------------------------
 transmissiond            |   29 ++---------------------
 5 files changed, 60 insertions(+), 115 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2008-07-21 12:55:49 UTC (rev 5830)
+++ ChangeLog	2008-07-21 13:03:49 UTC (rev 5831)
@@ -1,16 +1,27 @@
-2008-01-07  Varun Acharya <varun at archlinux.org>
+2008-07-20  Alexander Fehr  <pizzapunk gmail com>
 
-	* 1.00-1 :
-	Adopted and moved to extra
+  * transmission-cli-1.22-1:
+  New upstream release.
+  Renamed from transmission to transmission-cli.
+  New maintainer.
+  Split out GTK+ GUI into transmission-gtk.
+  Changed url.
+  Added make dependency on intltool.
+  Cleaned up init script.
+  Cleaned up install file.
 
-2007-06-26  Alessio 'mOLOk' Bolognino <themolok at gmail.com>
+2008-01-07  Varun Acharya  <varun at archlinux.org>
 
-	* 0.72-4 :
-	I had to use gentoo's sources because the tarball provided by the
-	official site is broken (wtf?)
-	transmission-{daemon,remote} are back 
+  * transmission-1.00-1:
+  Adopted and moved to extra.
 
-2007-06-19  Alessio 'mOLOk' Bolognino <themolok at gmail.com>
+2007-06-26  Alessio 'mOLOk' Bolognino  <themolok at gmail.com>
 
-	* 0.72-3 :
-	rebuild against libevent-1.3b
+  * transmission-0.72-4:
+  I had to use gentoo's sources because the tarball provided by the official site is broken.
+  transmission-{daemon,remote} are back.
+
+2007-06-19  Alessio 'mOLOk' Bolognino  <themolok at gmail.com>
+
+  * transmission-0.72-3:
+  Rebuild against libevent-1.3b.

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-07-21 12:55:49 UTC (rev 5830)
+++ PKGBUILD	2008-07-21 13:03:49 UTC (rev 5831)
@@ -1,36 +1,35 @@
 # $Id$
-# Maintainer: Roman Kyrylych <roman at archlinux.org>
+# Maintainer: Alexander Fehr <pizzapunk gmail com>
 # Contributor: Alessio 'mOLOk' Bolognino <themolok at gmail.com>
 
-pkgname=transmission
-pkgver=1.21
+pkgname=transmission-cli
+pkgver=1.22
 pkgrel=1
-pkgdesc="A free, lightweight BitTorrent client with an intuitive interface"
+pkgdesc="Fast, easy, and free BitTorrent client (CLI tools and daemon)"
 arch=('i686' 'x86_64')
-url="http://transmission.m0k.org"
+url="http://www.transmissionbt.com/"
 license=('MIT')
-makedepends=('gtk2')
-depends=('openssl' 'curl')
-makedepends=('gtk2' 'libnotify')
-backup=(etc/conf.d/transmissiond)
-install=transmission.install
-source=(http://download.m0k.org/transmission/files/transmission-$pkgver.tar.bz2 \
-    	transmissiond transmissiond.conf)
-md5sums=('6ec565ac831484098a2db20ea0ca3ac7'
-         'b18a412502ac51207c79a4aa4066a686'
+depends=('curl')
+makedepends=('intltool')
+replaces=('transmission')
+backup=('etc/conf.d/transmissiond')
+install=transmission-cli.install
+source=(http://download.m0k.org/transmission/files/transmission-$pkgver.tar.bz2
+        transmissiond
+        transmissiond.conf)
+md5sums=('aa0a2db19b0f3dbfd75a0fb354d6c47d'
+         'a6b92873347554916a2e02765573efcd'
          '7b019a710493ec4f8b54a1f528e1981d')
 
 build() {
-  cd $startdir/src/transmission-$pkgver
-  ./configure --prefix=/usr
+  cd "$srcdir/transmission-$pkgver"
+
+  ./configure --prefix=/usr --disable-gtk || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
+  make DESTDIR="$pkgdir" install || return 1
 
-  install -m 755 -D $startdir/src/transmissiond \
-    $startdir/pkg/etc/rc.d/transmissiond
+  install -D -m755 "$srcdir/transmissiond" "$pkgdir/etc/rc.d/transmissiond" || return 1
+  install -D -m644 "$srcdir/transmissiond.conf" "$pkgdir/etc/conf.d/transmissiond" || return 1
 
-  install -m 644 -D $startdir/src/transmissiond.conf \
-    $startdir/pkg/etc/conf.d/transmissiond
-
-  install -m 644 -D LICENSE $startdir/pkg/usr/share/licenses/$pkgname/LICENSE
+  install -D -m644 LICENSE "$pkgdir/usr/share/licenses/transmission-cli/LICENSE" || return 1
 }

Copied: transmission-cli/trunk/transmission-cli.install (from rev 5830, transmission-cli/trunk/transmission.install)
===================================================================
--- transmission-cli.install	                        (rev 0)
+++ transmission-cli.install	2008-07-21 13:03:49 UTC (rev 5831)
@@ -0,0 +1,13 @@
+post_install() {
+  cat << _EOF
+
+  If you want to run the Transmission daemon at boot,
+  add transmissiond to the DAEMONS array in /etc/rc.conf.
+  You have to set the user in /etc/conf.d/transmissiond.
+
+_EOF
+}
+
+post_upgrade() {
+  post_install
+}

Deleted: transmission.install
===================================================================
--- transmission.install	2008-07-21 12:55:49 UTC (rev 5830)
+++ transmission.install	2008-07-21 13:03:49 UTC (rev 5831)
@@ -1,55 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-
-cat << EOM
-
-==> transmission post-install message:
-
-EOM
-
-LANG=C pacman -Q gtk2 2>&1 | grep error &>/dev/null
-if [ $? = 0 ]; then
-
-cat << EOM
-==> If you want to run transmission's GUI, install gtk2 package
-
-EOM
-else
-LANG=C pacman -Q libnotify 2>&1 | grep error &>/dev/null
-if [ $? = 0 ]; then
-
-cat << EOM
-==> If you want to see notifications, install libnotify package
-
-EOM
-
-fi
-fi
-
-cat << EOM
-==> This package now installs /etc/rc.d/transmissiond
-==> If you want to run transmission at boot put "transmissiond"
-==> in the DAEMONS array in /etc/rc.conf
-==> You have to set the user in /etc/conf.d/transmissiond
-
-EOM
-
-    if [[ ! $2 > 1.11 ]] # if you are upgrading from 1.11 or earlier...
-    then
-        echo -e "\n==> Configuration files are now stored in $XDG_*_HOME/transmission/"
-        echo -e "==> See http://trac.transmissionbt.com/ticket/684 for more details."
-        echo -e "==> If you don't have Xorg installed - you won't have $XDG_*_HOME variables set,"
-        echo -e "==> they are set in /etc/profile.d/xorg.sh which is available in libx11 package."
-    fi
-}
-
-post_upgrade() {
-    post_install
-}
-
-pre_upgrade() {
-    if [[ ! $2 > 0.72 ]] # if you are upgrading from 0.72 or earlier...
-    then
-        echo -e "\n==> COMPLETE YOUR DOWNLOADS BEFORE UPGRADING TRANSMISSION OR YOU WILL LOSE DATA."
-    fi
-}

Modified: transmissiond
===================================================================
--- transmissiond	2008-07-21 12:55:49 UTC (rev 5830)
+++ transmissiond	2008-07-21 13:03:49 UTC (rev 5831)
@@ -4,33 +4,12 @@
 . /etc/rc.d/functions
 . /etc/conf.d/transmissiond
 
-if [ "$(id -u)" != 0 ]
-then
-	echo "You must be root to start Transmission as daemon."
-	exit 2
-fi
-
-if [ -z $TRANS_USER ]
-then
-	echo "Unable to run Transmission. You must set the user in /etc/conf.d/transmissiond"
-	exit 2
-fi
-
-confdir=$(su -l $TRANS_USER -c "echo ~")/.transmission
-if [ ! -d $confdir ]; then 
-    su -l $TRANS_USER  -c "mkdir -p $confdir"
-fi
-
 PID=`pidof -o %PPID /usr/bin/transmission-daemon`
 case "$1" in
   start)
     stat_busy "Starting Transmission Daemon"
-
-    if [ -z "$PID" ]; then 
-       su -l $TRANS_USER -c "/usr/bin/transmission-daemon"
-    fi
-
-    if [ ! -z "$PID" -o $? -gt 0 ]; then
+    [ -z "$PID" ] && su -l -c "/usr/bin/transmission-daemon" $TRANS_USER
+    if [ $? -gt 0 ]; then
       stat_fail
     else
       add_daemon transmissiond
@@ -39,8 +18,7 @@
     ;;
   stop)
     stat_busy "Stopping Transmission Daemon"
-
-    [ ! -z "$PID" ]  && su -l $TRANS_USER -c "/usr/bin/transmission-remote -q"
+    [ ! -z "$PID" ] && su -l -c "/usr/bin/transmission-remote -q" $TRANS_USER
     if [ $? -gt 0 ]; then
       stat_fail
     else
@@ -57,4 +35,3 @@
     echo "usage: $0 {start|stop|restart}"
 esac
 exit 0
-





More information about the arch-commits mailing list