Author: qboosh Date: Sat Apr 16 20:43:49 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 2.3.i
- removed outdated debian patch
- updated DESTDIR and hpdj patches
- added configure patch (fix enscript media option, remove acroread and lpq
usage, disable stripping)
---- Files affected:
packages/magicfilter:
magicfilter-DESTDIR.patch (1.1 -> 1.2) , magicfilter-hpdj.patch (1.1 -> 1.2)
, magicfilter.spec (1.35 -> 1.36) , magicfilter-configure.patch (NONE -> 1.1)
(NEW), magicfilter_1.2-28.diff.gz (1.1 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/magicfilter/magicfilter-DESTDIR.patch
diff -u packages/magicfilter/magicfilter-DESTDIR.patch:1.1
packages/magicfilter/magicfilter-DESTDIR.patch:1.2
--- packages/magicfilter/magicfilter-DESTDIR.patch:1.1 Fri Jun 4 12:16:06 1999
+++ packages/magicfilter/magicfilter-DESTDIR.patch Sat Apr 16 22:43:44 2011
@@ -1,24 +1,65 @@
---- Makefile.in~ Tue Mar 28 07:18:39 1995
-+++ Makefile.in Wed Jun 2 21:49:20 1999
-@@ -57,8 +57,8 @@
- cd filters; make
-
- install: magicfilter magicfilter.man
-- ${INSTALL_EXEC} magicfilter ${bindir}/magicfilter
-- ${INSTALL_DATA} magicfilter.man ${mandir}/magicfilter.${mansec}
-+ ${INSTALL_EXEC} magicfilter $(DESTDIR)${bindir}/magicfilter
-+ ${INSTALL_DATA} magicfilter.man
$(DESTDIR)${mandir}/magicfilter.${mansec}
-
- install_filters:
- cd filters; make install
---- filters/Makefile.in~ Wed Jun 2 21:46:59 1999
-+++ filters/Makefile.in Wed Jun 2 21:50:51 1999
-@@ -69,7 +69,7 @@
-
- install: all
- for filter in ${FILTERS}; do \
-- ${INSTALL_EXEC} $$filter ${bindir}/$$filter; \
-+ ${INSTALL_EXEC} $$filter $(DESTDIR)${bindir}/$$filter; \
+--- Orc-magicfilter-39e8faf/Makefile.in.orig 2009-11-23 04:45:02.000000000
+0100
++++ Orc-magicfilter-39e8faf/Makefile.in 2011-04-16 14:09:45.130653438
+0200
+@@ -44,46 +44,46 @@
+ @MAKE_MAGIC@ magic
+
+ commoninstall: textonly @CFMAGIC@
+- @INSTALL_DIR@ $(prefix)/@exedir@
+- @INSTALL_DIR@ $(prefix)/@mandir@/man8
+- @INSTALL_DIR@ $(prefix)/@mandir@/man5
+- @INSTALL_DIR@ $(prefix)/@filterdir@
+- @INSTALL_MAGIC@ -m 444 file/magic $(prefix)/@MAGIC@
+- @INSTALL_PROGRAM@ -m 511 textonly $(prefix)/@filterdir@
++ @INSTALL_DIR@ $(DESTDIR)$(prefix)/@exedir@
++ @INSTALL_DIR@ $(DESTDIR)$(prefix)/@mandir@/man8
++ @INSTALL_DIR@ $(DESTDIR)$(prefix)/@mandir@/man5
++ @INSTALL_DIR@ $(DESTDIR)$(prefix)/@filterdir@
++ @INSTALL_MAGIC@ -m 444 file/magic $(DESTDIR)$(prefix)/@MAGIC@
++ @INSTALL_PROGRAM@ -m 511 textonly $(DESTDIR)$(prefix)/@filterdir@
+
+ install: @DO_WHAT@
+
+ install-bin-t: traditional commoninstall
+- @INSTALL_PROGRAM@ -m 511 traditional $(prefix)/@exedir@/magicfilter-t
++ @INSTALL_PROGRAM@ -m 511 traditional
$(DESTDIR)$(prefix)/@exedir@/magicfilter-t
+
+ install-bin: magicfilter commoninstall
+- @INSTALL_PROGRAM@ -m 511 magicfilter $(prefix)/@exedir@
++ @INSTALL_PROGRAM@ -m 511 magicfilter $(DESTDIR)$(prefix)/@exedir@
+
+ install-data-t: traditional commoninstall
+ @srcdir@/mkmpp
+ for x in @srcdir@/filters/*.def;do \
+- ./mpp @exedir@/magicfilter-t $$x > $(prefix)/@filterdir@/`basename
$$x .def`-filter; \
+- chmod +x $(prefix)/@filterdir@/`basename $$x .def`-filter; \
++ ./mpp @exedir@/magicfilter-t $$x >
$(DESTDIR)$(prefix)/@filterdir@/`basename $$x .def`-filter; \
++ chmod +x $(DESTDIR)$(prefix)/@filterdir@/`basename $$x
.def`-filter; \
done
+ @rm -f mpp
+
+ install-data: magicfilter commoninstall
+ for x in @srcdir@/filters/*.def;do \
+- sed -e 's,@MAGIC''FILTER@,@exedir@/magicfilter,' < $$x >
$(prefix)/@filterdir@/`basename $$x .def`; \
+- chmod +x $(prefix)/@filterdir@/`basename $$x .def`; \
++ sed -e 's,@MAGIC''FILTER@,@exedir@/magicfilter,' < $$x >
$(DESTDIR)$(prefix)/@filterdir@/`basename $$x .def`; \
++ chmod +x $(DESTDIR)$(prefix)/@filterdir@/`basename $$x .def`; \
+ done
+
+ install-man: VERSION commoninstall
+ @SED@ -n -e 's/&PROGRAM&/magicfilter/g' -e 's/^MAN //p' -e @LPD_OPTS@ <
magicfilter.8templ > $$$$; \
+- @INSTALL_DATA@ -m 444 $$$$ $(prefix)/@mandir@/man8/magicfilter.8; \
++ @INSTALL_DATA@ -m 444 $$$$
$(DESTDIR)$(prefix)/@mandir@/man8/magicfilter.8; \
+ rm -f $$$$
+- @INSTALL_DATA@ -m 444 magicfilter.5 $(prefix)/@mandir@/man5
++ @INSTALL_DATA@ -m 444 magicfilter.5 $(DESTDIR)$(prefix)/@mandir@/man5
+
+ install-man-t: VERSION commoninstall
+ @SED@ -n -e 's/&PROGRAM&/magicfilter-t/g' -e 's/^MAN //p' -e
's/^TRAD//p' -e @LPD_OPTS@ < magicfilter.8templ > $$$$; \
+- @INSTALL_DATA@ -m 444 $$$$ $(prefix)/@mandir@/man8/magicfilter-t.8; \
++ @INSTALL_DATA@ -m 444 $$$$
$(DESTDIR)$(prefix)/@mandir@/man8/magicfilter-t.8; \
+ rm -f $$$$
+- @INSTALL_DATA@ -m 444 magicfilter-t.5 $(prefix)/@mandir@/man5
++ @INSTALL_DATA@ -m 444 magicfilter-t.5 $(DESTDIR)$(prefix)/@mandir@/man5
+
+ install-traditional: install-man-t install-bin-t install-data-t
- clean:
================================================================
Index: packages/magicfilter/magicfilter-hpdj.patch
diff -u packages/magicfilter/magicfilter-hpdj.patch:1.1
packages/magicfilter/magicfilter-hpdj.patch:1.2
--- packages/magicfilter/magicfilter-hpdj.patch:1.1 Sat Nov 17 21:35:43 2001
+++ packages/magicfilter/magicfilter-hpdj.patch Sat Apr 16 22:43:44 2011
@@ -1,150 +1,36 @@
---- magicfilter-1.2/filters/Makefile.in Wed Jun 21 16:23:46 2000
-+++ magicfilter-1.2patch/filters/Makefile.in Wed Jun 21 16:17:51 2000
-@@ -35,8 +35,8 @@
- cpsonly300-filter cpsonly400-filter cpsonly600-filter \
- stylus800-filter stylus_color_360dpi-filter \
- stylus_color_720dpi-filter \
-- bj600-filter bj600_draft-filter
--
-+ bj600-filter bj600_draft-filter \
-+ hpdj-best-filter hpdj-econo-filter hpdj-normal-filter
-
- .SUFFIXES:
- .SUFFIXES: .x .xc .h .xh .mh .xt
-@@ -152,3 +152,6 @@
- stylus800-filter.xc: genericps.mh stdconv.mh stdrejects.mh
- stylus_color_360dpi-filter.xc: genericps.mh stdconv.mh stdrejects.mh
- stylus_color_720dpi-filter.xc: genericps.mh stdconv.mh stdrejects.mh
-+hpdj-best-filter.xc: genericps.mh stdconv.mh stdrejects.mh
-+hpdj-econo-filter.xc: genericps.mh stdconv.mh stdrejects.mh
-+hpdj-normal-filter.xc: genericps.mh stdconv.mh stdrejects.mh
-
---- magicfilter-1.2.orig/filters/hpdj-best-filter.x
-+++ magicfilter-1.2/filters/hpdj-best-filter.x
-@@ -0,0 +1,40 @@
-+%include <filters.h>
-+#
-+# Magic filter setup file for HP DeskJet 600 C series color printers with
-+# both black and CMY cartridges installed
-+#
-+# This file has been automatically adapted to your system.
-+%ifndef HAVE_GHOSTSCRIPT
-+# However, since you didn't have GhostScript installed, most entries
-+# are going to be rejects.
-+%endif
-+#
-+/*
-+ * Printer resolution
-+ */
-+%define DPI 300
-+%define IS_COLOR 1
-+/*
-+ * PostScript
-+ */
-+%ifdef HAVE_GHOSTSCRIPT
-+%define HANDLE_PS filter PATH_GHOSTSCRIPT -q -dSAFER -dNOPAUSE -r300
-sDEVICE=cdj670 -dQuality=1 -dRetStatus=1 -dPapertype=0 -sOutputFile=- -
-+%define HANDLE_PDF fpipe PATH_GHOSTSCRIPT -q -dSAFER -dNOPAUSE -r300
-sDEVICE=cdj670 -dQuality=1 -dRetStatus=1 -dPapertype=0 -sOutputFile=- $FILE
-+%endif
-+/*
-+ * PCL, PJL
-+ */
-+%define HANDLE_PCL cat
-+/*
-+ * Text
-+ */
-+%define HANDLE_TEXT cat \eE\e&k2G\e(2N\e*o1M \eE
-+%define LATIN1_OK 1
-+
-+%include <stdconv.mh>
-+
-+# wild guess: PCL control codes start with <ESC>
-+0 \033 HANDLE_PCL
-+
-+# Default entry -- for normal (text) files. MUST BE LAST.
-+default HANDLE_TEXT
---- magicfilter-1.2.orig/filters/hpdj-normal-filter.x
-+++ magicfilter-1.2/filters/hpdj-normal-filter.x
-@@ -0,0 +1,40 @@
-+%include <filters.h>
-+#
-+# Magic filter setup file for HP DeskJet 600 C series color printers with
-+# both black and CMY cartridges installed
-+#
-+# This file has been automatically adapted to your system.
-+%ifndef HAVE_GHOSTSCRIPT
-+# However, since you didn't have GhostScript installed, most entries
-+# are going to be rejects.
-+%endif
-+#
-+/*
-+ * Printer resolution
-+ */
-+%define DPI 300
-+%define IS_COLOR 1
-+/*
-+ * PostScript
-+ */
-+%ifdef HAVE_GHOSTSCRIPT
-+%define HANDLE_PS filter PATH_GHOSTSCRIPT -q -dSAFER -dNOPAUSE -r300
-sDEVICE=cdj670 -dQuality=0 -dRetStatus=1 -dPapertype=0 -sOutputFile=- -
-+%define HANDLE_PDF fpipe PATH_GHOSTSCRIPT -q -dSAFER -dNOPAUSE -r300
-sDEVICE=cdj670 -dQuality=0 -dRetStatus=1 -dPapertype=0 -sOutputFile=- SFILE
-+%endif
-+/*
-+ * PCL, PJL
-+ */
-+%define HANDLE_PCL cat
-+/*
-+ * Text
-+ */
-+%define HANDLE_TEXT cat \eE\e&k2G\e(2N\e*o0M \eE
-+%define LATIN1_OK 1
-+
-+%include <stdconv.mh>
-+
-+# wild guess: PCL control codes start with <ESC>
-+0 \033 HANDLE_PCL
-+
-+# Default entry -- for normal (text) files. MUST BE LAST.
-+default HANDLE_TEXT
---- magicfilter-1.2.orig/filters/hpdj-econo-filter.x
-+++ magicfilter-1.2/filters/hpdj-econo-filter.x
-@@ -0,0 +1,40 @@
-+%include <filters.h>
-+#
-+# Magic filter setup file for HP DeskJet 600 C series color printers with
-+# both black and CMY cartridges installed
-+#
-+# This file has been automatically adapted to your system.
-+%ifndef HAVE_GHOSTSCRIPT
-+# However, since you didn't have GhostScript installed, most entries
-+# are going to be rejects.
-+%endif
-+#
-+/*
-+ * Printer resolution
-+ */
-+%define DPI 300
-+%define IS_COLOR 1
-+/*
-+ * PostScript
-+ */
-+%ifdef HAVE_GHOSTSCRIPT
-+%define HANDLE_PS filter PATH_GHOSTSCRIPT -q -dSAFER -dNOPAUSE -r300
-sDEVICE=cdj670 -dQuality=-1 -dRetStatus=1 -dPapertype=0 -sOutputFile=- -
-+%define HANDLE_PDF fpipe PATH_GHOSTSCRIPT -q -dSAFER -dNOPAUSE -r300
-sDEVICE=cdj670 -dQuality=-1 -dRetStatus=1 -dPapertype=0 -sOutputFile=- $FILE
-+%endif
-+/*
-+ * PCL, PJL
-+ */
-+%define HANDLE_PCL cat
-+/*
-+ * Text
-+ */
-+%define HANDLE_TEXT cat \eE\e&k2G\e(2N\e*o-1M \eE
-+%define LATIN1_OK 1
-+
-+%include <stdconv.mh>
-+
-+# wild guess: PCL control codes start with <ESC>
-+0 \033 HANDLE_PCL
-+
-+# Default entry -- for normal (text) files. MUST BE LAST.
-+default HANDLE_TEXT
+--- Orc-magicfilter-39e8faf/filters/dj600c.def.orig 1970-01-01
01:00:00.000000000 +0100
++++ Orc-magicfilter-39e8faf/filters/dj600c.def 2011-04-16 14:23:44.297348205
+0200
+@@ -0,0 +1,9 @@
++#! @MAGICFILTER@
++define(Vendor, `Hewlett-Packard')dnl
++define(Printer, `DeskJet 600 series color printers with both black and CMY
cartridges - NORMAL mode')dnl
++define(DPI,`300')dnl
++define(COLOR,`true')dnl
++define(PCL,`true')dnl
++define(DEVICE,`cdj670')dnl
++define(PS_OPTIONS,`-dQuality=0 -dRetStatus=1')dnl
++define(HANDLE_TEXT,`cat \eE\e&k2G\e(2N\e*o0M \eE')dnl
+--- Orc-magicfilter-39e8faf/filters/dj600c-best.def.orig 1970-01-01
01:00:00.000000000 +0100
++++ Orc-magicfilter-39e8faf/filters/dj600c-best.def 2011-04-16
14:23:39.854014718 +0200
+@@ -0,0 +1,9 @@
++#! @MAGICFILTER@
++define(Vendor, `Hewlett-Packard')dnl
++define(Printer, `DeskJet 600 series color printers with both black and CMY
cartridges - BEST mode')dnl
++define(DPI,`300')dnl
++define(COLOR,`true')dnl
++define(PCL,`true')dnl
++define(DEVICE,`cdj670')dnl
++define(PS_OPTIONS,`-dQuality=1 -dRetStatus=1')dnl
++define(HANDLE_TEXT,`cat \eE\e&k2G\e(2N\e*o1M \eE')dnl
+--- Orc-magicfilter-39e8faf/filters/dj600c-econo.def.orig 1970-01-01
01:00:00.000000000 +0100
++++ Orc-magicfilter-39e8faf/filters/dj600c-econo.def 2011-04-16
14:23:34.647347879 +0200
+@@ -0,0 +1,9 @@
++#! @MAGICFILTER@
++define(Vendor, `Hewlett-Packard')dnl
++define(Printer, `DeskJet 600 series color printers with both black and CMY
cartridges - ECONO mode')dnl
++define(DPI,`300')dnl
++define(COLOR,`true')dnl
++define(PCL,`true')dnl
++define(DEVICE,`cdj670')dnl
++define(PS_OPTIONS,`-dQuality=-1 -dRetStatus=1')dnl
++define(HANDLE_TEXT,`cat \eE\e&k2G\e(2N\e*o-1M \eE')dnl
================================================================
Index: packages/magicfilter/magicfilter.spec
diff -u packages/magicfilter/magicfilter.spec:1.35
packages/magicfilter/magicfilter.spec:1.36
--- packages/magicfilter/magicfilter.spec:1.35 Sat Jan 29 01:06:57 2011
+++ packages/magicfilter/magicfilter.spec Sat Apr 16 22:43:44 2011
@@ -2,36 +2,40 @@
Summary: Printer filters
Summary(pl.UTF-8): Filtry dla drukarek
Name: magicfilter
-Version: 1.2
-Release: 9
+Version: 2.3.i
+%define gitver 39e8faf
+Release: 1
Group: Applications/Printing
-License: GPL
-Source0:
ftp://sunsite.unc.edu/pub/Linux/system/printing/%{name}-%{version}.tar.gz
-# Source0-md5: dcece221e363ca5dbc79bdd84713c04e
-Patch0: %{name}_1.2-28.diff.gz
-Patch1: %{name}-DESTDIR.patch
-Patch2: %{name}-hpdj.patch
-BuildRequires: a2ps
+License: BSD (magicfilter itself), GPL (man pages), Public Domain
(filters)
+Source0:
http://github.com/Orc/magicfilter/tarball/v%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: 7292fd304b7b752fddc3417646a7c8a6
+Patch0: %{name}-DESTDIR.patch
+Patch1: %{name}-hpdj.patch
+Patch2: %{name}-configure.patch
+URL: http://www.pell.portland.or.us/~orc/Code/magicfilter/
+BuildRequires: bzip2
+BuildRequires: enscript
BuildRequires: ghostscript
-BuildRequires: groff
BuildRequires: gzip
BuildRequires: libjpeg-progs
-BuildRequires: libtiff-progs
+BuildRequires: libmagic-devel
+BuildRequires: m4
+BuildRequires: ncompress
BuildRequires: netpbm-progs
BuildRequires: tetex-dvips
BuildRequires: transfig
-BuildRequires: smtpdaemon
-Requires: a2ps
+# hp2pbm or lj2ps (for PCL conversion)
+Requires: bzip2
+Requires: enscript
+Requires: file
Requires: ghostscript
-Requires: groff
Requires: gzip
Requires: libjpeg-progs
-Requires: libtiff-progs
+Requires: ncompress
Requires: netpbm-progs
Requires: tetex-dvips
Requires: transfig
Requires: /usr/bin/lpr
-Requires: smtpdaemon
Obsoletes: apsfilter
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -43,44 +47,50 @@
drukarek.
%prep
-%setup -q
+%setup -q -n Orc-magicfilter-%{gitver}
%patch0 -p1
-%patch1 -p0
+%patch1 -p1
%patch2 -p1
%build
+CC="%{__cc}" \
CFLAGS="%{rpmcflags}" \
LDFLAGS="%{rpmldflags}" \
-./configure %{_target_platform} \
+./configure.sh \
--prefix=%{_prefix} \
- --bindir=%{_sbindir} \
- --mandir=%{_mandir}/man8
+ --execdir=%{_sbindir} \
+ --filterdir=%{_sysconfdir}/magicfilter \
+ --mandir=%{_mandir} \
+ --with-papersize=a4
-%{__make} bindir=%{_sbindir}
+%{__make}
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man8,%{_sysconfdir}/%{name}}
%{__make} install \
- DESTDIR=$RPM_BUILD_ROOT \
- bindir=%{_sbindir} \
- mandir=%{_mandir}/man8
+ DESTDIR=$RPM_BUILD_ROOT
-install magicfilterconfig $RPM_BUILD_ROOT%{_sbindir}
-install filters/*-filter $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
+# no ELFs in /etc
+install -d $RPM_BUILD_ROOT%{_prefix}/lib/magicfilter
+mv $RPM_BUILD_ROOT%{_sysconfdir}/magicfilter/textonly
$RPM_BUILD_ROOT%{_prefix}/lib/magicfilter
+ln -sf %{_prefix}/lib/magicfilter/textonly
$RPM_BUILD_ROOT%{_sysconfdir}/magicfilter/textonly
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc QuickInst ChangeLog TODO
+%doc README
+%attr(755,root,root) %{_sbindir}/magicfilter
%dir %{_sysconfdir}/%{name}
-
-%attr(755,root,root) %{_sbindir}/*
-%attr(755,root,root) %config(noreplace) %{_sysconfdir}/%{name}/*
-%{_mandir}/man*/*
+%attr(755,root,root) %config(noreplace) %{_sysconfdir}/%{name}/[!t]*
+%attr(755,root,root) %config(noreplace) %{_sysconfdir}/%{name}/tek*
+%attr(755,root,root) %{_sysconfdir}/%{name}/textonly
+%dir %{_prefix}/lib/%{name}
+%attr(755,root,root) %{_prefix}/lib/%{name}/textonly
+%{_mandir}/man5/magicfilter.5*
+%{_mandir}/man8/magicfilter.8*
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -88,6 +98,12 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.36 2011/04/16 20:43:44 qboosh
+- updated to 2.3.i
+- removed outdated debian patch
+- updated DESTDIR and hpdj patches
+- added configure patch (fix enscript media option, remove acroread and lpq
usage, disable stripping)
+
Revision 1.35 2011/01/29 00:06:57 sparky
- dropped pre-cvs changelog
================================================================
Index: packages/magicfilter/magicfilter-configure.patch
diff -u /dev/null packages/magicfilter/magicfilter-configure.patch:1.1
--- /dev/null Sat Apr 16 22:43:49 2011
+++ packages/magicfilter/magicfilter-configure.patch Sat Apr 16 22:43:44 2011
@@ -0,0 +1,65 @@
+--- Orc-magicfilter-39e8faf/configure.sh.orig 2009-11-23 04:45:02.000000000
+0100
++++ Orc-magicfilter-39e8faf/configure.sh 2011-04-16 14:55:24.624078447
+0200
+@@ -118,14 +118,6 @@
+ # AC_PROG_LN_S
+ # AC_PROG_YACC
+
+-if [ ! "$WITH_LPRNG" ]; then
+- S=`lpq -V 2>/dev/null | head -1 | grep -i lprng`
+-
+- if [ "$S" ]; then
+- LOG "Found LPRng -- building stupid filters"
+- WITH_LPRNG=1
+- fi
+-fi
+ if [ "$WITH_LPRNG" ]; then
+ AC_SUB "LPD_OPTS" "'s/^LPNG//p'"
+ AC_DEFINE "WITH_LPRNG" "1"
+@@ -191,14 +183,6 @@
+ fi
+ fi
+
+-if [ "${CF_PSTEXT:-$CF_NENSCRIPT}" -a "$paper" ]; then
+- PROG=${CF_PSTEXT:-$CF_NENSCRIPT}
+- if ! $PROG -T$paper </dev/null; then
+- AC_FAIL "$PROG cannot write to $paper sized paper"
+- unset paper
+- fi
+-fi
+-
+ test "$paper" && AC_DEFINE PAPERSIZE \"$WITH_PAPERSIZE\"
+
+ MF_PATH_INCLUDE GZIP gzip gzcat || MF_PATH_INCLUDE ZCAT zcat
+@@ -215,7 +199,6 @@
+ MF_PATH_INCLUDE BMPTOPPM bmptopnm bmptoppm
+ MF_PATH_INCLUDE RASTTOPNM rasttopnm
+ MF_PATH_INCLUDE FIG2DEV fig2dev
+-MF_PATH_INCLUDE ACROREAD acroread
+
+ # MF_PROG_GNU_ZCAT($ZCAT)
+
+--- Orc-magicfilter-39e8faf/configure.inc.orig 2009-11-23 04:45:02.000000000
+0100
++++ Orc-magicfilter-39e8faf/configure.inc 2011-04-16 15:30:34.920815702
+0200
+@@ -859,7 +859,7 @@
+ fi
+
+ AC_SUB 'INSTALL' "$PROG_INSTALL"
+- AC_SUB 'INSTALL_PROGRAM' "$PROG_INSTALL -s -m 755"
++ AC_SUB 'INSTALL_PROGRAM' "$PROG_INSTALL -m 755"
+ AC_SUB 'INSTALL_DATA' "$PROG_INSTALL -m 444"
+
+ # finally build a little directory installer
+--- Orc-magicfilter-39e8faf/magic.m4.in.orig 2009-11-23 04:45:02.000000000
+0100
++++ Orc-magicfilter-39e8faf/magic.m4.in 2011-04-16 22:35:29.635002818
+0200
+@@ -47,9 +47,9 @@
+ ifelse(defn(`PSfilter'),reject,,
+ define(PSfromText,
+ `ifdef(`PATH_PSTEXT',
+- pipe/postscript/ PATH_PSTEXT ifdef(`papersize',`-T'papersize,),
++ pipe/postscript/ PATH_PSTEXT ifdef(`papersize',`-M'papersize,),
+ `ifdef(`PATH_NENSCRIPT',
+- pipe/postscript/ PATH_NENSCRIPT
ifdef(`papersize',`-T'papersize,) @NENSCRIPT_QUIET@ -p -,
++ pipe/postscript/ PATH_NENSCRIPT
ifdef(`papersize',`-M'papersize,) @NENSCRIPT_QUIET@ -p -,
+ reject)')')dnl
+
+ #
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/magicfilter/magicfilter-DESTDIR.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/magicfilter/magicfilter-hpdj.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/magicfilter/magicfilter.spec?r1=1.35&r2=1.36&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
