rpms/psutils/devel psutils-datadir.patch, NONE, 1.1 psutils.spec, 1.20, 1.21

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/psutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2469

Modified Files:
	psutils.spec 
Added Files:
	psutils-datadir.patch 
Log Message:
* Wed Jul 22 2009 Adam Jackson <ajax at redhat.com> 1.17-31
- Split perl scripts to a subpackage.


psutils-datadir.patch:
 Makefile.unix |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE psutils-datadir.patch ---
diff -up psutils/Makefile.unix.jx psutils/Makefile.unix
--- psutils/Makefile.unix.jx	2009-07-22 15:03:58.000000000 -0400
+++ psutils/Makefile.unix	2009-07-22 15:08:21.000000000 -0400
@@ -31,7 +31,7 @@ OS = UNIX
 
 BINDIR = $(DESTDIR)/usr/bin
 SCRIPTDIR = $(BINDIR)
-INCLUDEDIR = $(DESTDIR)/usr/lib/psutils
+INCLUDEDIR = $(DESTDIR)/usr/share/psutils
 PERL = /usr/bin/perl
 
 BINMODE = 0755


Index: psutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/psutils/devel/psutils.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- psutils.spec	27 Feb 2009 02:50:43 -0000	1.20
+++ psutils.spec	22 Jul 2009 19:11:59 -0000	1.21
@@ -1,7 +1,7 @@
 Summary: PostScript Utilities
 Name: psutils
 Version: 1.17
-Release: 30%{dist}
+Release: 31%{dist}
 License: psutils
 Group: Applications/Publishing
 Source: psutils-p17.tar.gz
@@ -11,6 +11,7 @@ Patch2: psutils-p17-paper.patch
 Patch3: psutils-p17-strip.patch
 Patch4: psutils-manpage.patch
 Patch5: psutils-psmerge.patch
+Patch6: psutils-datadir.patch
 BuildRoot: %{_tmppath}/psutils-root
 
 %description
@@ -18,6 +19,14 @@ This archive contains some utilities for
 Page selection and rearrangement are supported, including arrangement into
 signatures for booklet printing, and page merging for n-up printing.
 
+%package perl
+Summary: psutils scripts requiring perl
+Group: Applications/Publishing
+BuildArch: noarch
+
+%description perl
+Various scripts from the psutils distribution that require perl.
+
 %prep
 %setup -q -n psutils
 %patch0 -p1 -b .makefile
@@ -26,6 +35,7 @@ signatures for booklet printing, and pag
 %patch3 -p1 -b .strip
 %patch4 -p1 -b .manpage
 %patch5 -p1 -b .new
+%patch6 -p1 -b .datadir
 
 %build
 make -f Makefile.unix RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
@@ -41,13 +51,60 @@ make -f Makefile.unix \
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(0644, root, root, 0755)
+%defattr(-, root, root, -)
 %doc README LICENSE
-%attr(0755, root, root) /usr/bin/*
-%{_mandir}/*/*
-/usr/lib/psutils
+%{_bindir}/epsffit
+%{_bindir}/getafm
+%{_bindir}/psbook
+%{_bindir}/psnup
+%{_bindir}/psresize
+%{_bindir}/psselect
+%{_bindir}/pstops
+%{_bindir}/showchar
+%{_mandir}/man1/epsffit.1*
+%{_mandir}/man1/getafm.1*
+%{_mandir}/man1/psbook.1*
+%{_mandir}/man1/psnup.1*
+%{_mandir}/man1/psresize.1*
+%{_mandir}/man1/psselect.1*
+%{_mandir}/man1/pstops.1*
+#{_mandir}/man1/showchar.1*
+
+%files perl
+%defattr(-, root, root, -)
+%{_bindir}/extractres
+%{_bindir}/fixdlsrps  
+%{_bindir}/fixfmps
+%{_bindir}/fixmacps
+%{_bindir}/fixpsditps
+%{_bindir}/fixpspps
+%{_bindir}/fixscribeps
+%{_bindir}/fixtpps
+%{_bindir}/fixwfwps
+%{_bindir}/fixwpps
+%{_bindir}/fixwwps
+%{_bindir}/includeres
+%{_bindir}/psmerge
+%{_datadir}/psutils
+%{_mandir}/man1/extractres.1*
+%{_mandir}/man1/fixdlsrps.1*
+%{_mandir}/man1/fixfmps.1*
+%{_mandir}/man1/fixmacps.1*
+%{_mandir}/man1/fixpsditps.1*
+%{_mandir}/man1/fixpspps.1*
+%{_mandir}/man1/fixscribeps.1*
+%{_mandir}/man1/fixtpps.1*
+%{_mandir}/man1/fixwfwps.1*
+%{_mandir}/man1/fixwpps.1*
+%{_mandir}/man1/fixwwps.1*
+%{_mandir}/man1/includeres.1*
+%{_mandir}/man1/psmerge.1*
+
 
 %changelog
+* Wed Jul 22 2009 Adam Jackson <ajax at redhat.com> 1.17-31
+- Split perl scripts to a subpackage.
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.17-30
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild