Skip to content

Commit 7a5a9db

Browse files
authored
t1lib: Fix SRPM packing (#3192)
1 parent 1e3a106 commit 7a5a9db

File tree

3 files changed

+1843
-6
lines changed

3 files changed

+1843
-6
lines changed

SPECS-EXTENDED/t1lib/t1lib.spec

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@ Vendor: Microsoft Corporation
22
Distribution: Mariner
33
Name: t1lib
44
Version: 5.1.2
5-
Release: 27%{?dist}
5+
Release: 28%{?dist}
66

77
Summary: PostScript Type 1 font rasterizer
88

9-
License: LGPLv2+
9+
License: LGPLv2+ AND GPLv2+
1010
URL: https://t1lib.org/
11-
Source0: ftp://sunsite.unc.edu/pub/Linux/libs/graphics/t1lib-%{version}.tar.gz
12-
Patch0: http://ftp.de.debian.org/debian/pool/main/t/t1lib/t1lib_5.1.2-3.diff.gz
11+
Source0: %{_mariner_sources_url}/t1lib-%{version}.tar.gz
12+
# Patch originally from Debian at http://ftp.de.debian.org/debian/pool/main/t/t1lib/t1lib_5.1.2-3.diff.gz
13+
Patch0: t1lib_5.1.2-3.patch
1314
Patch1: t1lib-5.1.2-segf.patch
1415
# Fixes CVE-2010-2642, CVE-2011-0433
1516
# http://bugzilla.redhat.com/show_bug.cgi?id=679732
@@ -120,7 +121,8 @@ touch $RPM_BUILD_ROOT%{_datadir}/t1lib/{FontDatabase,t1lib.config}
120121

121122

122123
%files
123-
%doc Changes LGPL LICENSE README
124+
%license LGPL LICENSE
125+
%doc Changes README
124126
%dir %{_datadir}/t1lib
125127
%ghost %verify(not size mtime md5) %{_datadir}/t1lib/t1lib.config
126128
%ghost %verify(not size mtime md5) %{_datadir}/t1lib/FontDatabase
@@ -143,6 +145,11 @@ touch $RPM_BUILD_ROOT%{_datadir}/t1lib/{FontDatabase,t1lib.config}
143145

144146

145147
%changelog
148+
* Fri Jun 17 2022 Olivia Crain <[email protected]> - 5.1.2-28
149+
- Rename Debian patch to fix SRPM packing
150+
- Fix dead upstream URL
151+
- License verified
152+
146153
* Mon Mar 29 2021 Henry Li <[email protected]> - 5.1.2-27
147154
- Initial CBL-Mariner import from Fedora 32 (license: MIT).
148155
- Remove libXaw-devel from build requirment

0 commit comments

Comments
 (0)