rpms/t1lib/FC-4 t1lib-5.1.0-destdir.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 t1lib.spec, 1.6, 1.7

[Roozbeh Pournader (roozbeh)]

Author: roozbeh

Update of /cvs/extras/rpms/t1lib/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15430

Modified Files:
	.cvsignore sources t1lib.spec 
Added Files:
	t1lib-5.1.0-destdir.patch 
Log Message:
* Tue Jan 17 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 5.1.0-2
- remove unneeded %%{_datadir}/t1lib contents
- cleanup

* Tue Sep 27 2005 Michael A. Peters <mpeters at mac.com> - 5.1.0-1
- updated version
- remove Patch0 (in upstream), added Patch6
- Does not BuildRequire xfree/xorg devel
- no longer BuildRequire autoconf (Patch0 removed)



t1lib-5.1.0-destdir.patch:

--- NEW FILE t1lib-5.1.0-destdir.patch ---
diff -ur t1lib-5.1.0/type1afm/Makefile.in t1lib-5.1.0.new/type1afm/Makefile.in
--- t1lib-5.1.0/type1afm/Makefile.in	2004-12-12 18:45:12.000000000 -0800
+++ t1lib-5.1.0.new/type1afm/Makefile.in	2005-09-27 09:42:50.000000000 -0700
@@ -89,7 +89,7 @@
 install: dummy
 	$(MKINSTALLDIRS) $(DESTDIR)$(bindir)
 	$(LIBTOOL) --mode=install \
-		$(INSTALL_PROGRAM) type1afm $(bindir)/type1afm
+		$(INSTALL_PROGRAM) type1afm $(DESTDIR)$(bindir)/type1afm
 
 
 uninstall: dummy


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/t1lib/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:23:56 -0000	1.2
+++ .cvsignore	17 Jan 2006 13:40:30 -0000	1.3
@@ -1 +1 @@
-t1lib-5.0.2.tar.gz
+t1lib-5.1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/t1lib/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:23:56 -0000	1.2
+++ sources	17 Jan 2006 13:40:30 -0000	1.3
@@ -1 +1 @@
-cc5d4130b25bb8a1c930488b78930e9b  t1lib-5.0.2.tar.gz
+a05bed4aa63637052e60690ccde70421  t1lib-5.1.0.tar.gz


Index: t1lib.spec
===================================================================
RCS file: /cvs/extras/rpms/t1lib/FC-4/t1lib.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- t1lib.spec	22 May 2005 23:39:09 -0000	1.6
+++ t1lib.spec	17 Jan 2006 13:40:30 -0000	1.7
@@ -1,27 +1,21 @@
 Name:           t1lib
-Version:        5.0.2
-Release: 3
+Version:        5.1.0
+Release:        2%{?dist}
 
 Summary:        PostScript Type 1 font rasterizer
 
 Group:          Applications/Publishing
 License:        LGPL
 URL:            ftp://sunsite.unc.edu/pub/Linux/libs/graphics
-Source0:        ftp://sunsite.unc.edu/pub/Linux/libs/graphics/t1lib-5.0.2.tar.gz
-# Based on patches in Mandrakes's t1lib-1.3.1-9mdk.src.rpm:
-Patch0:         t1lib-5.0.0-install.patch
+Source0:        ftp://sunsite.unc.edu/pub/Linux/libs/graphics/t1lib-%{version}.tar.gz
 # From Debian's t1lib-5.0.0-4:
 Patch1:         t1lib-5.0.0-manpages.patch
 Patch2:         t1lib-5.0.0-xglyph-env.patch
-Patch3:         t1lib-5.0.0-hintfix.patch
 # From Debian's t1lib-5.0.0-4 (slightly tweaked):
 Patch5:         t1lib-5.0.0-t1libconfig.patch
+Patch6:         t1lib-5.1.0-destdir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  XFree86-devel
-BuildRequires:  autoconf
-BuildRequires:  perl
-
 %description
 T1lib is a rasterizer library for Adobe Type 1 Fonts. It supports
 rotation and transformation, kerning underlining and antialiasing. It
@@ -42,18 +36,16 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .install
 %patch1 -p1
 %patch2 -p1
 %patch5 -p1
+%patch6 -p1
 
 
 %build
-perl -pi -e 's/^dbl$$//' configure.in
-autoconf
 %configure
 make %{?_smp_mflags} without_doc
-ln README.t1lib-5.0.2 README
+ln README.t1lib-%{version} README
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -70,7 +62,11 @@
 install -p -m 755 debian/t1libconfig $RPM_BUILD_ROOT%{_sbindir}/
 
 touch FontDatabase
+install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/t1lib
 install -p -m 644 FontDatabase $RPM_BUILD_ROOT%{_sysconfdir}/t1lib/
+touch $RPM_BUILD_ROOT%{_sysconfdir}/t1lib/t1lib.config
+
+rm -rf $RPM_BUILD_ROOT%{_datadir}/t1lib
 
 
 %clean
@@ -94,18 +90,28 @@
 %config %{_sysconfdir}/t1lib/FontDatabase
 %{_bindir}/*
 %{_libdir}/*.so.*
-%{_mandir}/man[^3]/*
+%{_mandir}/man*/*
 %{_sbindir}/*
 
 %files devel
 %defattr(-,root,root,-)
 %doc doc/t1lib_doc.pdf
-%{_includedir}/*
+%{_includedir}/*.h
 %{_libdir}/*.a
 %{_libdir}/*.so
 
 
 %changelog
+* Tue Jan 17 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 5.1.0-2
+- remove unneeded %%{_datadir}/t1lib contents
+- cleanup
+
+* Tue Sep 27 2005 Michael A. Peters <mpeters at mac.com> - 5.1.0-1
+- updated version
+- remove Patch0 (in upstream), added Patch6
+- Does not BuildRequire xfree/xorg devel
+- no longer BuildRequire autoconf (Patch0 removed)
+
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 5.0.2-3
 - rebuild on all arches