rpms/t1lib/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 t1lib.spec, 1.19, 1.20 t1lib-5.0.0-manpages.patch, 1.1, NONE t1lib-5.0.0-t1libconfig.patch, 1.3, NONE t1lib-5.0.0-xglyph-env.patch, 1.1, NONE t1lib-5.1.1-findchk.patch, 1.1, NONE t1lib-5.1.1-segf.patch, 1.1, NONE t1lib-cve-2007-4033.patch, 1.1, NONE

[Patrice Dumas (pertusus)]

Author: pertusus

Update of /cvs/extras/rpms/t1lib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28315

Modified Files:
	.cvsignore sources t1lib.spec 
Removed Files:
	t1lib-5.0.0-manpages.patch t1lib-5.0.0-t1libconfig.patch 
	t1lib-5.0.0-xglyph-env.patch t1lib-5.1.1-findchk.patch 
	t1lib-5.1.1-segf.patch t1lib-cve-2007-4033.patch 
Log Message:
* Tue Jan  8 2008 Patrice Dumas <pertusus[AT]free.fr> - 5.1.1-6
- apply debian patch
- use debian patches directly



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/t1lib/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	7 Jun 2007 20:22:01 -0000	1.4
+++ .cvsignore	8 Jan 2008 09:54:28 -0000	1.5
@@ -1 +1,2 @@
 t1lib-5.1.1.tar.gz
+t1lib_5.1.1-3.diff.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/t1lib/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	7 Jun 2007 20:22:01 -0000	1.4
+++ sources	8 Jan 2008 09:54:28 -0000	1.5
@@ -1 +1,2 @@
 b1b86b5014364d92ab3b7cee6c81e29d  t1lib-5.1.1.tar.gz
+293442d7226eff695b0f4115cbeba0f0  t1lib_5.1.1-3.diff.gz


Index: t1lib.spec
===================================================================
RCS file: /cvs/extras/rpms/t1lib/devel/t1lib.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- t1lib.spec	6 Jan 2008 00:01:24 -0000	1.19
+++ t1lib.spec	8 Jan 2008 09:54:28 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           t1lib
 Version:        5.1.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 
 Summary:        PostScript Type 1 font rasterizer
 
@@ -8,14 +8,7 @@
 License:        LGPLv2+
 URL:            ftp://sunsite.unc.edu/pub/Linux/libs/graphics
 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
-# From Debian's t1lib-5.0.0-4 (slightly tweaked):
-Patch3:         t1lib-5.0.0-t1libconfig.patch
-Patch4:         t1lib-cve-2007-4033.patch
-Patch5:         t1lib-5.1.1-segf.patch
-Patch6:         t1lib-5.1.1-findchk.patch
+Patch0:         http://ftp.de.debian.org/debian/pool/main/t/t1lib/t1lib_5.1.1-3.diff.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post): coreutils, findutils
@@ -43,16 +36,18 @@
 Requires:       %{name}-devel = %{version}-%{release}
 
 %description    static
-This package contains header files and static libraries for %{name}.
+This package contains static libraries for %{name}.
 
 %prep
 %setup -q
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1 -b .segf
-%patch6 -p1 -b .findchk
+%patch0 -p1
+
+# use debian patches directly instead of duplicating them
+patch -p1 < debian/patches/cve-2007-4033.diff
+patch -p1 < debian/patches/segfault.diff -b -z .segf
+patch -p1 < debian/patches/no-config.diff
+patch -p1 < debian/patches/no-docs.diff
+patch -p1 < debian/patches/lib-cleanup.diff
 
 iconv -f latin1 -t utf8 < Changes > Changes.utf8
 touch -r Changes Changes.utf8
@@ -65,9 +60,9 @@
 touch -r lib/t1lib/t1lib.h.in lib/t1lib.h
 touch -r lib/t1lib/t1libx.h lib/t1libx.h
 ln README.t1lib-%{version} README
-sed -e 's;/usr/share/X11/fonts;%{_datadir}/X11/fonts %{_datadir}/fonts %{_datadir}/texmf/fonts;' \
+sed -e 's;/usr/share/X11/fonts;%{_datadir}/X11/fonts;' \
+  -e 's;/usr/share/fonts/type1;%{_datadir}/fonts %{_datadir}/texmf/fonts;' \
   -e 's;/etc/t1lib/;%{_datadir}/t1lib/;' \
-  -e 's;/usr/lib/ghostscript/fonts;;' \
  debian/t1libconfig > t1libconfig
 touch -r README.t1lib-%{version} t1libconfig
 
@@ -87,10 +82,8 @@
 mkdir -p $RPM_BUILD_ROOT%{_sbindir}
 install -p -m 755 t1libconfig $RPM_BUILD_ROOT%{_sbindir}/
 
-touch $RPM_BUILD_ROOT%{_datadir}/t1lib/FontDatabase
-
-rm -rf $RPM_BUILD_ROOT%{_datadir}/t1lib/doc
-
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/t1lib/
+touch $RPM_BUILD_ROOT%{_datadir}/t1lib/{FontDatabase,t1lib.config}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -126,6 +119,10 @@
 
 
 %changelog
+* Tue Jan  8 2008 Patrice Dumas <pertusus[AT]free.fr> - 5.1.1-6
+- apply debian patch
+- use debian patches directly
+
 * Sat Jan  5 2008 Patrice Dumas <pertusus[AT]free.fr> - 5.1.1-5
 - silence t1libconfig when the directories don't exist (#183108)
 


--- t1lib-5.0.0-manpages.patch DELETED ---


--- t1lib-5.0.0-t1libconfig.patch DELETED ---


--- t1lib-5.0.0-xglyph-env.patch DELETED ---


--- t1lib-5.1.1-findchk.patch DELETED ---


--- t1lib-5.1.1-segf.patch DELETED ---


--- t1lib-cve-2007-4033.patch DELETED ---