.gitignore

@@ -1 +1 @@
-SOURCES/ttmkfdir-3.0.9.tar.bz2
+ttmkfdir-3.0.9.tar.bz2

.ttmkfdir.metadata

@@ -1 +1 @@
-829473beb905a39f026fc0e9b4aeb10031a5a8a9 SOURCES/ttmkfdir-3.0.9.tar.bz2
+829473beb905a39f026fc0e9b4aeb10031a5a8a9 ttmkfdir-3.0.9.tar.bz2

Makefile

@@ -0,0 +1,21 @@
+# Makefile for source rpm: ttmkfdir
+# $Id$
+NAME := ttmkfdir
+SPECFILE = $(firstword $(wildcard *.spec))
+
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON := $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attempt a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+endef
+
+MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
+endif
+
+include $(MAKEFILE_COMMON)

gating.yaml

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

sources

@@ -0,0 +1 @@
+7fbf13e432aa519669899b13d00673f3  ttmkfdir-3.0.9.tar.bz2

tests/test-simple

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+if [ -d /tmp/test-ttmkfdir ];then
+	rm -rf /tmp/test-ttmkfdir
+fi
+
+mkdir /tmp/test-ttmkfdir
+cd /tmp/test-ttmkfdir
+ttmkfdir -d /usr/share/fonts/sazanami/gothic .
+if [ -f ./fonts.scale ]; then
+	diff -urN ./fonts.scale /usr/share/fonts/sazanami/gothic/fonts.scale
+	retval=$?
+	echo $retval
+	if [ $retval -ne 0 ]; then
+		echo "check if sazanami-gothic-fonts is installed or its packaging is changed"
+		exit 1
+	else
+		echo "ttmkfdir sucessfully generated fonts.scale file for sazanami-gothic-fonts directory"
+	fi
+fi
+
+

tests/tests.yml

@@ -0,0 +1,34 @@
+- hosts: localhost
+  vars:
+  - artifacts: "{{ lookup('env', 'TEST_ARTIFACTS')|default('./artifacts', true) }}"
+  tags:
+  - classic
+  remote_user: root
+  tasks:
+  - name: Install required packages
+    dnf:
+     name:
+      - sazanami*fonts
+      - xorg-x11-fonts-misc
+
+  - name: Install the test files
+    copy: src={{ item.file }} dest=/usr/local/bin/{{ item.dest }} mode=0755
+    with_items:
+    - {file: test-simple, dest: test-simple }
+
+  - name: Test block
+    block:
+      - name: Execute the tests
+        shell: |
+          /usr/local/bin/test-simple &> /tmp/test.log && result=pass || result=fail
+          echo -e "results:\n- {result: $result, test: simple}" > /tmp/results.yml
+
+    always:
+      - name: Pull out the logs
+        fetch:
+          dest: "{{ artifacts }}/"
+          src: "{{ item }}"
+          flat: yes
+        with_items:
+          - /tmp/test.log
+          - /tmp/results.yml

ttmkfdir-3.0.9-tag.patch

@@ -0,0 +1,15 @@
+--- 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$@ $<

ttmkfdir.spec

@@ -1,7 +1,7 @@
 Summary: Utility to create fonts.scale files for truetype fonts
 Name: ttmkfdir
 Version: 3.0.9
-Release: 54%{?dist}
+Release: 65%{?dist}
 # Only licensing attribution is in README, no version.
 License: LGPLv2+
 # This is a Red Hat maintained package which is specific to
@@ -20,8 +20,10 @@ 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
@@ -37,19 +39,54 @@ by the font server.
 %autosetup -p1
 
 %build
-make %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS"
+%{make_build} OPTFLAGS="$RPM_OPT_FLAGS" RPM_LD_FLAGS="$RPM_LD_FLAGS -pie"
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT install INSTALL="install -p"
+%{make_install} PREFIX="%{_prefix}"
 mkdir -p %{buildroot}%{_mandir}/man1/
 cp -p %{SOURCE10} %{buildroot}%{_mandir}/man1/
 
 %files
 %doc README
 %{_bindir}/ttmkfdir
-%{_mandir}/man1/ttmkfdir.1.gz
+%{_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)