Compare commits

...

No commits in common. "ada8e4fc40c8166693ad205f248e655b34a4ec0d" and "c8s" have entirely different histories.

7 changed files with 10 additions and 64 deletions

View File

@ -1 +0,0 @@
829473beb905a39f026fc0e9b4aeb10031a5a8a9 ttmkfdir-3.0.9.tar.bz2

View File

@ -1,6 +1,6 @@
--- !Policy
product_versions:
- rhel-9
- rhel-8
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

View File

@ -1 +1 @@
7fbf13e432aa519669899b13d00673f3 ttmkfdir-3.0.9.tar.bz2
SHA512 (ttmkfdir-3.0.9.tar.bz2) = ead6ff6ef364e71f14bbd70a04cc8a78a1add43b443cb46878da0896ee1826cb96c9caebd03295068e715851d426b51ad2b814fbaadf521570576f60324f773e

View File

@ -6,16 +6,16 @@ fi
mkdir /tmp/test-ttmkfdir
cd /tmp/test-ttmkfdir
ttmkfdir -d /usr/share/fonts/sazanami/gothic .
ttmkfdir -d /usr/share/X11/fonts/TTF .
if [ -f ./fonts.scale ]; then
diff -urN ./fonts.scale /usr/share/fonts/sazanami/gothic/fonts.scale
diff -urN ./fonts.scale /usr/share/X11/fonts/TTF/fonts.scale
retval=$?
echo $retval
if [ $retval -ne 0 ]; then
echo "check if sazanami-gothic-fonts is installed or its packaging is changed"
echo "FAIL: check if xorg-x11-fonts-ethiopic is installed or its packaging is changed"
exit 1
else
echo "ttmkfdir sucessfully generated fonts.scale file for sazanami-gothic-fonts directory"
echo "PASS: ttmkfdir sucessfully generated fonts.scale file for xorg-x11-fonts-ethiopic directory"
fi
fi

View File

@ -8,8 +8,7 @@
- name: Install required packages
dnf:
name:
- sazanami*fonts
- xorg-x11-fonts-misc
- xorg-x11-fonts-ethiopic
- name: Install the test files
copy: src={{ item.file }} dest=/usr/local/bin/{{ item.dest }} mode=0755

View File

@ -1,15 +0,0 @@
--- ttmkfdir-3.0.9.old/Makefile 2020-03-25 16:06:55.999792212 +0100
+++ ttmkfdir-3.0.9/Makefile 2020-03-25 17:04:16.179479496 +0100
@@ -40,10 +40,10 @@
all: ttmkfdir
.cpp.o:
- libtool --mode=compile $(CXX) $(CXXFLAGS) -o $@ -c $^
+ libtool --tag=CC --mode=compile $(CXX) $(CXXFLAGS) -o $@ -c $^
ttmkfdir: ttmkfdir.o directory.o commandline.o ttf.o encoding.o parser.o builtin.o
- libtool --mode=link $(CXX) -o $@ $^ $(LDFLAGS)
+ libtool --tag=CC --mode=link $(CXX) -o $@ $^ $(LDFLAGS)
parser.cpp: encoding.l
flex -i -8 -o$@ $<

View File

@ -1,7 +1,7 @@
Summary: Utility to create fonts.scale files for truetype fonts
Name: ttmkfdir
Version: 3.0.9
Release: 65%{?dist}
Release: 54%{?dist}
# Only licensing attribution is in README, no version.
License: LGPLv2+
# This is a Red Hat maintained package which is specific to
@ -20,10 +20,8 @@ Patch8: ttmkfdir-3.0.9-font-scale.patch
Patch9: ttmkfdir-3.0.9-bug434301.patch
Patch10:ttmkfdir-3.0.9-freetype-header-fix2.patch
Patch11:ttmkfdir-3.0.9-fedora-ldflags.patch
Patch12:ttmkfdir-3.0.9-tag.patch
Source10: ttmkfdir.1
BuildRequires: make
BuildRequires: freetype-devel >= 2.0
BuildRequires: flex libtool
BuildRequires: bzip2-devel
@ -39,10 +37,10 @@ by the font server.
%autosetup -p1
%build
%{make_build} OPTFLAGS="$RPM_OPT_FLAGS" RPM_LD_FLAGS="$RPM_LD_FLAGS -pie"
make %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS"
%install
%{make_install} PREFIX="%{_prefix}"
make DESTDIR=$RPM_BUILD_ROOT PREFIX="%{_prefix}" install INSTALL="install -p"
mkdir -p %{buildroot}%{_mandir}/man1/
cp -p %{SOURCE10} %{buildroot}%{_mandir}/man1/
@ -52,41 +50,6 @@ cp -p %{SOURCE10} %{buildroot}%{_mandir}/man1/
%{_mandir}/man1/ttmkfdir.1*
%changelog
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 3.0.9-65
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 3.0.9-64
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.9-63
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.9-62
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon Mar 30 2020 Timm Baeder <tbaeder@redhat.com> - 3.0.9-60
- Pass -pie separately to %%{make_build}
- Pass --tag=CC to libtool invocations
* Mon Mar 16 2020 Tom Stellard <tstellar@redhat.com> - 3.0.9-59
- Use make_build and make_install macros
- https://docs.fedoraproject.org/en-US/packaging-guidelines/#_parallel_make
- https://docs.fedoraproject.org/en-US/packaging-guidelines/#_why_the_makeinstall_macro_should_not_be_used
* Tue Jan 28 2020 Kalev Lember <klember@redhat.com> - 3.0.9-58
- Avoid hardcoding /usr prefix
- Use globs for man page compression
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.9-57
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.9-56
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.9-55
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Mar 07 2018 Parag Nemade <pnemade AT redhat DOT com> - 3.0.9-54
- Partial injection of build flags (rh#1548462)