rpms/t1lib/F-8 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 t1lib.spec, 1.17, 1.18 t1lib-5.0.0-manpages.patch, 1.1, NONE t1lib-5.0.0-t1libconfig.patch, 1.2, NONE t1lib-5.0.0-xglyph-env.patch, 1.1, NONE t1lib-cve-2007-4033.patch, 1.1, NONE

[Patrice Dumas (pertusus)]

Author: pertusus

Update of /cvs/extras/rpms/t1lib/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25251/F-8

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-cve-2007-4033.patch 
Log Message:
sync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/t1lib/F-8/.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 22:14:00 -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/F-8/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 22:14:00 -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/F-8/t1lib.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- t1lib.spec	27 Sep 2007 14:59:48 -0000	1.17
+++ t1lib.spec	8 Jan 2008 22:14:00 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           t1lib
 Version:        5.1.1
-Release:        3%{?dist}
+Release:        7%{?dist}
 
 Summary:        PostScript Type 1 font rasterizer
 
@@ -8,13 +8,9 @@
 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
+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)
+BuildRequires:  libXaw-devel
 
 Requires(post): coreutils, findutils
 
@@ -28,48 +24,67 @@
 is possible.
 
 %package        devel
-Summary:        Header files and static libraries for %{name}
+Summary:        Header files and development files for %{name}
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 
 %description    devel
-This package contains header files and static libraries for %{name}.
+This package contains header files and development files for %{name}.
 
+%package        static
+Summary:        Static libraries for %{name}
+Group:          Development/Libraries
+Requires:       %{name}-devel = %{version}-%{release}
+
+%description    static
+This package contains static libraries for %{name}.
 
 %prep
 %setup -q
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
+%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
+mv Changes.utf8 Changes
 
 
 %build
 %configure
 make %{?_smp_mflags} without_doc
+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;' \
+  -e 's;/usr/share/fonts/type1;%{_datadir}/fonts %{_datadir}/texmf/fonts;' \
+  -e 's;/etc/t1lib/;%{_datadir}/t1lib/;' \
+ debian/t1libconfig > t1libconfig
+touch -r README.t1lib-%{version} t1libconfig
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
+rm $RPM_BUILD_ROOT%{_libdir}/libt1*.la
+chmod a+x $RPM_BUILD_ROOT%{_libdir}/libt1*.so.*
 
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man{1,5,8}
 install -p -m 644 debian/FontDatabase.5 $RPM_BUILD_ROOT%{_mandir}/man5/
 install -p -m 644 debian/t1libconfig.8 $RPM_BUILD_ROOT%{_mandir}/man8/
 install -p -m 644 debian/type1afm.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 install -p -m 644 debian/xglyph.1 $RPM_BUILD_ROOT%{_mandir}/man1/
+touch -r README.t1lib-%{version} $RPM_BUILD_ROOT%{_mandir}/man?/*.* 
 
 mkdir -p $RPM_BUILD_ROOT%{_sbindir}
-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
+install -p -m 755 t1libconfig $RPM_BUILD_ROOT%{_sbindir}/
 
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/t1lib/
+touch $RPM_BUILD_ROOT%{_datadir}/t1lib/{FontDatabase,t1lib.config}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -85,23 +100,49 @@
 %files
 %defattr(-,root,root,-)
 %doc Changes LGPL LICENSE README
-%dir %{_sysconfdir}/t1lib
-%ghost %{_sysconfdir}/t1lib/t1lib.config
-%ghost %{_sysconfdir}/t1lib/FontDatabase
-%{_bindir}/*
-%{_libdir}/*.so.*
+%dir %{_datadir}/t1lib
+%ghost %verify(not size mtime md5) %{_datadir}/t1lib/t1lib.config
+%ghost %verify(not size mtime md5) %{_datadir}/t1lib/FontDatabase
+%{_bindir}/type1afm
+%{_bindir}/xglyph
+%{_libdir}/libt1.so.*
+%{_libdir}/libt1x.so.*
 %{_mandir}/man*/*
-%{_sbindir}/*
+%{_sbindir}/t1libconfig
 
 %files devel
 %defattr(-,root,root,-)
 %doc doc/t1lib_doc.pdf
-%{_includedir}/*.h
-%{_libdir}/*.a
-%{_libdir}/*.so
+%{_includedir}/t1lib*.h
+%{_libdir}/libt1.so
+%{_libdir}/libt1x.so
+
+%files static
+%defattr(-,root,root,-)
+%{_libdir}/libt1.a
+%{_libdir}/libt1x.a
 
 
 %changelog
+* Tue Jan  8 2008 Patrice Dumas <pertusus[AT]free.fr> - 5.1.1-7
+- add X libs BuildRequires (#353861)
+
+* 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)
+
+* Sat Jan  5 2008 Patrice Dumas <pertusus[AT]free.fr> - 5.1.1-4
+- separate subpackage for static library
+- keep timestamps
+- add more paths to t1libconfig and use rpm macros for those paths
+- fix the -maxdepth position in find
+- put t1lib.config and FontDatabase in %%{_datadir} these are not 
+  config files, they are generated
+- fix a segfault in t1lib with long TYPE1 lines
+
 * Thu Sep 27 2007 José Matos <jamatos[AT]fc.up.pt> - 5.1.1-3
 - Apply patch to fix CVE-2007-4033
 


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


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


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


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