summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authoraus40002015-07-24 23:24:27 -0600
committeraus40002015-07-24 23:24:27 -0600
commit5edbe68bfb0d0e4051561e8a59b2db20db547c1c (patch)
tree6680b48f4d2ac705265418a36ed844e2df95a424
parent3220a8c5bd2835d5a0a329a70bfd2220a2eb70b4 (diff)
downloadaur-5edbe68bfb0d0e4051561e8a59b2db20db547c1c.tar.gz
Removed split package for cnijfilter-common since it doesn't want to commit with it.
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD20
2 files changed, 3 insertions, 24 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 39f07e8d4e06..6939147c6c7c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -27,15 +27,10 @@ pkgbase = cnijfilter-mg5500series
depends = libxml2
depends = libxrandr
depends = libxrender
- depends = cnijfilter-common<=4.00
+ depends = cnijfilter-common
options = emptydirs
source = http://gdlp01.c-wss.com/gds/5/0100005505/01/cnijfilter-mg5500series-4.00-1-rpm.tar.gz
md5sums = 4abe4396e4efc7ff90f459ccf493bb9c
pkgname = cnijfilter-mg5500series
-pkgname = cnijfilter-common
- pkgdesc = Canon IJ Printer Driver (Common Package)
- depends = libcups
- depends = popt
-
diff --git a/PKGBUILD b/PKGBUILD
index 056246a4a0bd..9e0b29b34c50 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
#Maintainer: aus4000 - 9aus4000@gmail.com
-pkgname=('cnijfilter-mg5500series' 'cnijfilter-common')
+pkgname=('cnijfilter-mg5500series')
pkgver=4.00
pkgrel=1
pkgdesc="Canon MG5500 series printer driver"
@@ -7,7 +7,7 @@ arch=('i686' 'x86_64')
url="http://support-sg.canon-asia.com/contents/SG/EN/0100467102.html"
license=('custom')
depends=('atk' 'glibc' 'glib2' 'cairo' 'cups' 'fontconfig' 'gtk2' 'pango' 'libpng' 'popt' 'libtiff' 'libx11'
-'libxcursor' 'libxext' 'libxfixes' 'libxi' 'libxinerama' 'libxml2' 'libxrandr' 'libxrender' 'cnijfilter-common<=4.00' )
+'libxcursor' 'libxext' 'libxfixes' 'libxi' 'libxinerama' 'libxml2' 'libxrandr' 'libxrender' 'cnijfilter-common' )
makedepends=('rpmextract')
options=('emptydirs')
source=("http://gdlp01.c-wss.com/gds/5/0100005505/01/cnijfilter-mg5500series-4.00-1-rpm.tar.gz")
@@ -23,19 +23,3 @@ cd $pkgdir
rpmextract.sh $rpmfile
mv usr/lib64 usr/lib
}
-
-package_cnijfilter-common() {
-pkgdesc="Canon IJ Printer Driver (Common Package)"
-depends=('libcups' 'popt')
-makedepends=('autoconf>=2.13' 'automake>=1.6' 'make' 'tar' 'gcc' 'popt')
-
-if [ "${CARCH}" = 'x86_64' ]; then
- rpmfile=$(find "$srcdir" -name $pkgname-$pkgver*${CARCH}*.rpm)
-elif [ "${CARCH}" = 'i686' ]; then
- rpmfile=$(find "$srcdir" -name $pkgname-$pkgver*i386*.rpm)
-fi
-cd $pkgdir
-rpmextract.sh $rpmfile
-mv usr/lib usr/lib32
-mv usr/lib64 usr/lib
-}