[arch-commits] Commit in cups/trunk (PKGBUILD cups.install)
Andreas Radke
andyrtr at nymeria.archlinux.org
Sat May 18 15:45:27 UTC 2013
Date: Saturday, May 18, 2013 @ 17:45:27
Author: andyrtr
Revision: 185776
upgpkg: cups 1.6.2-2
move to /usr/bin
Modified:
cups/trunk/PKGBUILD
cups/trunk/cups.install
--------------+
PKGBUILD | 4 ++--
cups.install | 15 ++++++---------
2 files changed, 8 insertions(+), 11 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-05-18 15:33:12 UTC (rev 185775)
+++ PKGBUILD 2013-05-18 15:45:27 UTC (rev 185776)
@@ -4,7 +4,7 @@
pkgbase="cups"
pkgname=('libcups' 'cups')
pkgver=1.6.2
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
license=('GPL')
url="http://www.cups.org/"
@@ -46,6 +46,7 @@
autoconf -I config-scripts
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+ --sbindir=/usr/bin \
--libdir=/usr/lib \
--with-systemdsystemunitdir=/usr/lib/systemd/system \
--with-logdir=/var/log/cups \
@@ -84,7 +85,6 @@
# install client.conf man page and config file
install -dm755 ${pkgdir}/usr/share/man/man5
- #install -Dm644 ${srcdir}/${pkgbase}-${pkgver}/man/client.conf.5.gz ${pkgdir}/usr/share/man/man5/
install -Dm644 ${srcdir}/${pkgbase}-${pkgver}/man/client.conf.5 ${pkgdir}/usr/share/man/man5/
install -dm755 ${pkgdir}/etc/cups
touch ${pkgdir}/etc/cups/client.conf
Modified: cups.install
===================================================================
--- cups.install 2013-05-18 15:33:12 UTC (rev 185775)
+++ cups.install 2013-05-18 15:45:27 UTC (rev 185776)
@@ -1,6 +1,6 @@
post_install() {
if [ -x usr/bin/xdg-icon-resource ]; then
- xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+ xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
fi
echo ">> If you use an HTTPS connection to CUPS, the first time you access"
echo ">> the interface it may take a very long time before the site comes up."
@@ -10,13 +10,9 @@
post_upgrade() {
if [ -x usr/bin/xdg-icon-resource ]; then
- xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+ xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
fi
- if [ "`vercmp $2 1.4.7-2`" -lt 0 ]; then
- # important upgrade notice
- echo "daemon script has been renamed to /etc/rc.d/cupsd"
- echo "change your entry in /etc/rc.conf"
- fi
+
if [ "`vercmp $2 1.6.0`" -lt 0 ]; then
# important upgrade notice
echo "* avahi-daemon should now run before you start cupsd for"
@@ -24,7 +20,8 @@
echo "* check your config with cupsd -t"
echo " and fix all Browsing related settings"
fi
- if [ "`vercmp $2 1.6.1-3`" -lt 0 ]; then
+
+ if [ "`vercmp $2 1.6.1-3`" -lt 0 ]; then
# important upgrade notice
echo "> It's now safe to load usblp kernel module."
echo "> There's no more need to blacklist it."
@@ -33,6 +30,6 @@
post_remove() {
if [ -x usr/bin/xdg-icon-resource ]; then
- xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+ xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
fi
}
More information about the arch-commits
mailing list