Accepting request 994776 from home:coolo:branches:openSUSE:Factory

- Move ftpdump from ft2demos to freetype - it's required by other
  packages and doesn't require any of the toolkits, so move its
  build early

- Move ftpdump from ft2demos to freetype - it's required by other
  packages and doesn't require any of the toolkits, so move its
  build early

OBS-URL: https://build.opensuse.org/request/show/994776
OBS-URL: https://build.opensuse.org/package/show/M17N/freetype2?expand=0&rev=179
This commit is contained in:
Dirk Mueller 2022-08-12 13:43:47 +00:00 committed by Git OBS Bridge
parent 1f6e97ec39
commit 4f2817aabc
4 changed files with 38 additions and 14 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Aug 12 12:30:19 UTC 2022 - Stephan Kulow <coolo@suse.com>
- Move ftpdump from ft2demos to freetype - it's required by other
packages and doesn't require any of the toolkits, so move its
build early
-------------------------------------------------------------------
Mon May 2 10:12:04 UTC 2022 - Dirk Müller <dmueller@suse.com>

View File

@ -29,6 +29,8 @@ Source1: https://downloads.sourceforge.net/project/freetype/freetype-docs
Source2: %{name}.sh
Source10: https://downloads.sourceforge.net/project/freetype/freetype2/%{version}/freetype-%{version}.tar.xz.sig
Source11: https://downloads.sourceforge.net/project/freetype/freetype-docs/%{version}/freetype-doc-%{version}.tar.xz.sig
Source20: https://downloads.sourceforge.net/project/freetype/freetype-demos/%{version}/ft2demos-%{version}.tar.xz
Source21: https://downloads.sourceforge.net/project/freetype/freetype-demos/%{version}/ft2demos-%{version}.tar.xz.sig
Source12: freetype2.keyring
Source1000: baselibs.conf
Patch0: bugzilla-308961-cmex-workaround.patch
@ -90,9 +92,18 @@ TrueType font library.
It also contains a small tutorial for using that library.
%package -n ftdump
Summary: Simple font dumper
Group: Productivity/Publishing/Other
Conflicts: ft2demos < %{version}-%{release}
%description -n ftdump
Simple font dumper
This tool is part of the FreeType project
%prep
%setup -q -n freetype-%{version} -a 1
%setup -q -n freetype-%{version} -a 1 -a 20
%autopatch -p1
%build
@ -105,8 +116,14 @@ export CFLAGS="%{optflags} -D_GNU_SOURCE $(getconf LFS_CFLAGS)"
--disable-static
make %{?_smp_mflags} ANSIFLAGS=
cd ft2demos-%{version}
make %{?_smp_mflags} TOP_DIR=.. $PWD/bin/ftdump
%install
%make_install
cd ft2demos-%{version}
../builds/unix/libtool --mode=install /usr/bin/install -c bin/ftdump %{buildroot}%_bindir/ftdump
cd ..
install -Dm 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/%{name}.sh
# remove documentation that does not belong in an rpm
@ -134,4 +151,8 @@ rm %{buildroot}%{_libdir}/libfreetype.la
%{_mandir}/man1/freetype-config.1%{?ext_man}
%{_datadir}/aclocal
%files -n ftdump
%defattr(-,root,root)
%{_bindir}/ftdump
%changelog

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Aug 12 12:30:19 UTC 2022 - Stephan Kulow <coolo@suse.com>
- Move ftpdump from ft2demos to freetype - it's required by other
packages and doesn't require any of the toolkits, so move its
build early
-------------------------------------------------------------------
Mon May 2 09:04:23 UTC 2022 - Paolo Stivanin <info@paolostivanin.com>

View File

@ -86,15 +86,6 @@ Conflicts: %{name} < %{version}-%{release}
Compare font hinting modes
This tool is part of the FreeType project
%package -n ftdump
Summary: Simple font dumper
Group: Productivity/Publishing/Other
Conflicts: %{name} < %{version}-%{release}
%description -n ftdump
Simple font dumper
This tool is part of the FreeType project
%package -n ftgamma
Summary: Screen gamma calibration helper
Group: Productivity/Publishing/Other
@ -207,6 +198,8 @@ popd
%install
mkdir -p %{buildroot}%{_bindir}
pushd ../ft2demos-%{version}/bin/.libs
# packaged in freetype2.spec
rm ftdump
install -m 755 ft* %{buildroot}%{_bindir}
install -m 755 ../../src/ftinspect/ftinspect %{buildroot}%{_bindir}
popd
@ -230,10 +223,6 @@ popd
%defattr(-,root,root)
%{_bindir}/ftdiff
%files -n ftdump
%defattr(-,root,root)
%{_bindir}/ftdump
%files -n ftgamma
%defattr(-,root,root)
%{_bindir}/ftgamma