diff options
| -rw-r--r-- | misc/conkyforecast/README | 2 | ||||
| -rw-r--r-- | misc/conkyforecast/conkyforecast.SlackBuild | 16 | ||||
| -rw-r--r-- | misc/conkyforecast/conkyforecast.info | 8 | ||||
| -rw-r--r-- | misc/conkyforecast/doinst.sh | 3 | ||||
| -rw-r--r-- | misc/conkyforecast/slack-desc | 4 |
5 files changed, 22 insertions, 11 deletions
diff --git a/misc/conkyforecast/README b/misc/conkyforecast/README index 10f89030be67b..ad065f1dcc363 100644 --- a/misc/conkyforecast/README +++ b/misc/conkyforecast/README @@ -2,4 +2,4 @@ conkyForecast is a python script created to provide weather forecast information to be displayed in Conky. It uses the Weather.com XOAP service to retrieve data for all over the world. -Requires: conky available at SlackBuilds.org. +This requires conky. diff --git a/misc/conkyforecast/conkyforecast.SlackBuild b/misc/conkyforecast/conkyforecast.SlackBuild index d966ac1de9fb8..118e176111ab5 100644 --- a/misc/conkyforecast/conkyforecast.SlackBuild +++ b/misc/conkyforecast/conkyforecast.SlackBuild @@ -5,7 +5,7 @@ # Written by M.Dinslage (daedra1980@gmail.com) PRGNAM=conkyforecast -VERSION=${VERSION:-2.15} +VERSION=${VERSION:-2.12} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -21,9 +21,10 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf src -tar xvf $CWD/${PRGNAM}_${VERSION}.tar.gz -cd src +rm -rf $PRGNAM-$VERSION +mkdir -p $PRGNAM-$VERSION +tar xvf $CWD/${PRGNAM}_${VERSION}.tar.gz -C $PRGNAM-$VERSION +cd $PRGNAM-$VERSION/src chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -39,6 +40,13 @@ python setup.py install --root=$PKG # remove font .sfd files, they shouldn't be needed rm -r $PKG/usr/share/fonts/TTF/*.tar.gz +# Put the .otf fonts in the right place +mkdir -p $PKG/usr/share/fonts/OTF +mv $PKG/usr/share/fonts/TTF/*.otf $PKG/usr/share/fonts/OTF + +# No need to put an arch-specific dir in here; the egg info file is useless +rm -rf $PKG/usr/lib{,64} + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ AUTHORS CHANGELOG COPYING README \ diff --git a/misc/conkyforecast/conkyforecast.info b/misc/conkyforecast/conkyforecast.info index 788c36ed1c3e5..cbc6f5f1d8d73 100644 --- a/misc/conkyforecast/conkyforecast.info +++ b/misc/conkyforecast/conkyforecast.info @@ -1,10 +1,10 @@ PRGNAM="conkyforecast" -VERSION="2.15" +VERSION="2.12" HOMEPAGE="https://code.launchpad.net/~m-buck/+junk/conkyforecast" -DOWNLOAD="https://launchpad.net/~conkyhardcore/+archive/ppa/+files/conkyforecast_2.15.tar.gz" -MD5SUM="49fc1bfba61708fcc3caf36ac2352b9f" +DOWNLOAD="https://launchpad.net/~conkyhardcore/+archive/ppa/+files/conkyforecast_2.12.tar.gz" +MD5SUM="b7e7dca641c9db604dac5931cf8b6773" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="M.Dinslage" EMAIL="daedra1980@gmail.com" -APPROVED="Niels Horn" +APPROVED="rworkman" diff --git a/misc/conkyforecast/doinst.sh b/misc/conkyforecast/doinst.sh index 3884b2a547c35..8b79d8c94e884 100644 --- a/misc/conkyforecast/doinst.sh +++ b/misc/conkyforecast/doinst.sh @@ -3,6 +3,9 @@ if [ -x /usr/bin/mkfontdir ]; then ( cd /usr/share/fonts/TTF mkfontscale . mkfontdir . + cd /usr/share/fonts/OTF + mkfontscale . + mkfontdir . ) fi if [ -x /usr/bin/fc-cache ]; then diff --git a/misc/conkyforecast/slack-desc b/misc/conkyforecast/slack-desc index b37a020d2b703..e4248d399bcf3 100644 --- a/misc/conkyforecast/slack-desc +++ b/misc/conkyforecast/slack-desc @@ -6,10 +6,10 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -conkyforecast: conkyforecast (Provides weather information to be displayed in conky) +conkyforecast: conkyforecast (weather information display for conky) conkyforecast: conkyforecast: conkyForecast is a python script created to provide weather forecast -conkyforecast: information to be displayed in Conky. It uses the Weather.com XOAP +conkyforecast: information to be displayed in Conky. It uses the Weather.com XOAP conkyforecast: service to retrieve data for all over the world. conkyforecast: conkyforecast: |