diff --git a/Makefile b/Makefile deleted file mode 100644 index d427bd6..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# 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) diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index 6985029..0000000 --- a/gating.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- !Policy -product_versions: - - rhel-8 -decision_context: osci_compose_gate -rules: - - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional} diff --git a/tests/test-simple b/tests/test-simple deleted file mode 100644 index b769949..0000000 --- a/tests/test-simple +++ /dev/null @@ -1,22 +0,0 @@ -#!/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/X11/fonts/TTF . -if [ -f ./fonts.scale ]; then - diff -urN ./fonts.scale /usr/share/X11/fonts/TTF/fonts.scale - retval=$? - echo $retval - if [ $retval -ne 0 ]; then - echo "FAIL: check if xorg-x11-fonts-ethiopic is installed or its packaging is changed" - exit 1 - else - echo "PASS: ttmkfdir sucessfully generated fonts.scale file for xorg-x11-fonts-ethiopic directory" - fi -fi - - diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index 89d2a23..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,33 +0,0 @@ -- hosts: localhost - vars: - - artifacts: "{{ lookup('env', 'TEST_ARTIFACTS')|default('./artifacts', true) }}" - tags: - - classic - remote_user: root - tasks: - - name: Install required packages - dnf: - name: - - xorg-x11-fonts-ethiopic - - - 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 diff --git a/ttmkfdir-3.0.9-tag.patch b/ttmkfdir-3.0.9-tag.patch new file mode 100644 index 0000000..243d0fe --- /dev/null +++ b/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$@ $< diff --git a/ttmkfdir.spec b/ttmkfdir.spec index 5728fe3..5b332eb 100644 --- a/ttmkfdir.spec +++ b/ttmkfdir.spec @@ -1,9 +1,9 @@ Summary: Utility to create fonts.scale files for truetype fonts Name: ttmkfdir Version: 3.0.9 -Release: 54%{?dist} +Release: 72%{?dist} # Only licensing attribution is in README, no version. -License: LGPLv2+ +License: LGPL-2.0-or-later # This is a Red Hat maintained package which is specific to # our distribution. Thus the source is only available from # within this srpm. @@ -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,10 +39,10 @@ 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 PREFIX="%{_prefix}" install INSTALL="install -p" +%{make_install} PREFIX="%{_prefix}" mkdir -p %{buildroot}%{_mandir}/man1/ cp -p %{SOURCE10} %{buildroot}%{_mandir}/man1/ @@ -50,6 +52,62 @@ cp -p %{SOURCE10} %{buildroot}%{_mandir}/man1/ %{_mandir}/man1/ttmkfdir.1* %changelog +* Tue Oct 29 2024 Troy Dawson - 3.0.9-72 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 + +* Mon Jun 24 2024 Troy Dawson - 3.0.9-71 +- Bump release for June 2024 mass rebuild + +* Sat Jan 27 2024 Fedora Release Engineering - 3.0.9-70 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jul 22 2023 Fedora Release Engineering - 3.0.9-69 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jul 07 2023 Parag Nemade - 3.0.9-68 +- Migrate to SPDX license expression + +* Sat Jan 21 2023 Fedora Release Engineering - 3.0.9-67 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 3.0.9-66 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 3.0.9-65 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 3.0.9-64 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jan 27 2021 Fedora Release Engineering - 3.0.9-63 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 3.0.9-62 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Mar 30 2020 Timm Baeder - 3.0.9-60 +- Pass -pie separately to %%{make_build} +- Pass --tag=CC to libtool invocations + +* Mon Mar 16 2020 Tom Stellard - 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 - 3.0.9-58 +- Avoid hardcoding /usr prefix +- Use globs for man page compression + +* Sat Jul 27 2019 Fedora Release Engineering - 3.0.9-57 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 03 2019 Fedora Release Engineering - 3.0.9-56 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 3.0.9-55 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Mar 07 2018 Parag Nemade - 3.0.9-54 - Partial injection of build flags (rh#1548462)