24789237 Printing broke after upgrade from s12_100.
authorJiri Sasek <Jiri.Sasek@Oracle.COM>
Tue, 04 Oct 2016 00:15:26 -0700
changeset 7391 df75a8cb8663
parent 7390 ed91ff551438
child 7392 b622c682317d
24789237 Printing broke after upgrade from s12_100.
components/foomatic/filters/Makefile
components/foomatic/filters/foomatic-rip.p5m
--- a/components/foomatic/filters/Makefile	Thu Nov 24 00:59:36 2016 +0000
+++ b/components/foomatic/filters/Makefile	Tue Oct 04 00:15:26 2016 -0700
@@ -42,13 +42,10 @@
 TEST_TARGET= $(NO_TESTS)
 include $(WS_MAKE_RULES)/common.mk
 
-CONFIGURE_BINDIR.$(BUILD_BITS)= $(USRLIBDIR)/lp/bin
-
-CONFIGURE_OPTIONS +=	--prefix=$(USRLIBDIR)/lp
 CONFIGURE_OPTIONS +=	--sysconfdir=$(ETCDIR)/gnu
 CONFIGURE_OPTIONS +=	--with-echo=wecho
 CONFIGURE_OPTIONS +=	--with-file-converter="a2ps -1 -q -c -B @@[email protected]@[email protected]@ -o -"
-CONFIGURE_OPTIONS +=	--with-execpath=$(USRLIBDIR)/lp/bin:$(USRBINDIR):$(BINDIR)
+CONFIGURE_OPTIONS +=	--with-execpath=$(USRLIBDIR)/cups/filter:$(USRBINDIR):$(BINDIR)
 CONFIGURE_OPTIONS +=	PERL=$(PERL)
 CONFIGURE_OPTIONS +=	A2PS=$(USRBINDIR)/a2ps
 
--- a/components/foomatic/filters/foomatic-rip.p5m	Thu Nov 24 00:59:36 2016 +0000
+++ b/components/foomatic/filters/foomatic-rip.p5m	Tue Oct 04 00:15:26 2016 -0700
@@ -36,8 +36,7 @@
 file path=etc/gnu/foomatic/filter.conf preserve=renamenew
 file path=etc/gnu/foomatic/filter.conf.sample
 file path=usr/lib/cups/backend/beh
-# drop also the LP scheduler support
-file usr/lib/lp/bin/foomatic-rip path=usr/lib/cups/filter/foomatic-rip
+file usr/bin/foomatic-rip path=usr/lib/cups/filter/foomatic-rip mode=0555
 file path=usr/share/man/man1/foomatic-rip.1
 #
 legacy pkg=SUNWffiltersr \