Accepting request 998188 from M17N
Automatic submission by obs-autosubmit OBS-URL: https://build.opensuse.org/request/show/998188 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/freetype2?expand=0&rev=96
This commit is contained in:
commit
cc6afb32ff
@ -1,3 +1,15 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 12 13:44:34 UTC 2022 - Dirk Müller <dmueller@suse.com>
|
||||
|
||||
- spec-cleaner
|
||||
|
||||
-------------------------------------------------------------------
|
||||
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>
|
||||
|
||||
|
@ -30,6 +30,8 @@ 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
|
||||
Source12: freetype2.keyring
|
||||
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
|
||||
Source1000: baselibs.conf
|
||||
Patch0: bugzilla-308961-cmex-workaround.patch
|
||||
# PATCH-FIX-OPENSUSE don-t-mark-libpng-as-required-library.patch -- it is private in .pc
|
||||
@ -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
|
||||
@ -103,10 +114,16 @@ export CFLAGS="%{optflags} -D_GNU_SOURCE $(getconf LFS_CFLAGS)"
|
||||
--with-zlib \
|
||||
--enable-freetype-config \
|
||||
--disable-static
|
||||
make %{?_smp_mflags} ANSIFLAGS=
|
||||
%make_build ANSIFLAGS=
|
||||
|
||||
cd ft2demos-%{version}
|
||||
%make_build TOP_DIR=.. $PWD/bin/ftdump
|
||||
|
||||
%install
|
||||
%make_install
|
||||
cd ft2demos-%{version}
|
||||
../builds/unix/libtool --mode=install %{_bindir}/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,7 @@ rm %{buildroot}%{_libdir}/libfreetype.la
|
||||
%{_mandir}/man1/freetype-config.1%{?ext_man}
|
||||
%{_datadir}/aclocal
|
||||
|
||||
%files -n ftdump
|
||||
%{_bindir}/ftdump
|
||||
|
||||
%changelog
|
||||
|
@ -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>
|
||||
|
||||
|
@ -63,7 +63,6 @@ Requires: ftstring = %{version}-%{release}
|
||||
Requires: ftvalid = %{version}-%{release}
|
||||
Requires: ftview = %{version}-%{release}
|
||||
Conflicts: dtc < 1.4.0
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
%description
|
||||
Freetype2 utilities and demo programs.
|
||||
@ -86,15 +85,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
|
||||
@ -192,21 +182,24 @@ export CFLAGS="%{optflags} -std=gnu99 -D_GNU_SOURCE $(getconf LFS_CFLAGS)"
|
||||
--enable-static \
|
||||
--without-bzip2
|
||||
|
||||
make %{?_smp_mflags}
|
||||
%make_build
|
||||
pushd ..
|
||||
ln -s freetype-%{freetype_version} freetype
|
||||
cd ft2demos-%{version}
|
||||
make %{?_smp_mflags}
|
||||
%make_build
|
||||
|
||||
cd src/ftinspect
|
||||
sed -i s/"-isystem "/"-I "/ ftinspect.pro
|
||||
# FIXME: you should use the %%qmake5 macro
|
||||
qmake-qt5 ftinspect.pro
|
||||
make
|
||||
%make_build
|
||||
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
|
||||
@ -219,55 +212,39 @@ popd
|
||||
%{buildroot}%{_bindir}/ftbench -c 1 %{SOURCE1016}
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%doc README
|
||||
|
||||
%files -n ftbench
|
||||
%defattr(-,root,root)
|
||||
%{_bindir}/ftbench
|
||||
|
||||
%files -n ftdiff
|
||||
%defattr(-,root,root)
|
||||
%{_bindir}/ftdiff
|
||||
|
||||
%files -n ftdump
|
||||
%defattr(-,root,root)
|
||||
%{_bindir}/ftdump
|
||||
|
||||
%files -n ftgamma
|
||||
%defattr(-,root,root)
|
||||
%{_bindir}/ftgamma
|
||||
|
||||
%files -n ftgrid
|
||||
%defattr(-,root,root)
|
||||
%{_bindir}/ftgrid
|
||||
|
||||
%files -n ftinspect
|
||||
%defattr(-,root,root)
|
||||
%{_bindir}/ftinspect
|
||||
|
||||
%files -n ftlint
|
||||
%defattr(-,root,root)
|
||||
%{_bindir}/ftlint
|
||||
|
||||
%files -n ftmulti
|
||||
%defattr(-,root,root)
|
||||
%{_bindir}/ftmulti
|
||||
|
||||
%files -n ftsdf
|
||||
%defattr(-,root,root)
|
||||
%{_bindir}/ftsdf
|
||||
|
||||
%files -n ftstring
|
||||
%defattr(-,root,root)
|
||||
%{_bindir}/ftstring
|
||||
|
||||
%files -n ftvalid
|
||||
%defattr(-,root,root)
|
||||
%{_bindir}/ftvalid
|
||||
|
||||
%files -n ftview
|
||||
%defattr(-,root,root)
|
||||
%{_bindir}/ftview
|
||||
|
||||
%changelog
|
||||
|
Loading…
x
Reference in New Issue
Block a user