Hello community, here is the log from the commit of package freetype for openSUSE:Factory checked in at 2020-06-16 13:45:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/freetype (Old) and /work/SRC/openSUSE:Factory/.freetype.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "freetype" Tue Jun 16 13:45:36 2020 rev:27 rq:814770 version:1.3.1 Changes: -------- --- /work/SRC/openSUSE:Factory/freetype/freetype.changes 2017-12-08 12:55:22.814035871 +0100 +++ /work/SRC/openSUSE:Factory/.freetype.new.3606/freetype.changes 2020-06-16 13:46:07.553984261 +0200 @@ -1,0 +2,6 @@ +Mon Jun 15 11:03:32 UTC 2020 - Martin Pluskal <[email protected]> + +- Fix building with gcc10 +- Small spec file cleanup with spec-cleaner + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ freetype.spec ++++++ --- /var/tmp/diff_new_pack.f8VpcK/_old 2020-06-16 13:46:09.149997097 +0200 +++ /var/tmp/diff_new_pack.f8VpcK/_new 2020-06-16 13:46:09.153997129 +0200 @@ -1,7 +1,7 @@ # # spec file for package freetype # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,25 +12,17 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: freetype -BuildRequires: autoconf -BuildRequires: pkgconfig(x11) -# bug437293 -%ifarch ppc64 -Obsoletes: freetype-64bit -%endif -# -PreReq: fileutils Version: 1.3.1 Release: 0 -Url: http://www.freetype.org Summary: TrueType Font Engine -License: SUSE-Freetype or GPL-2.0+ +License: SUSE-Freetype OR GPL-2.0-or-later Group: System/Libraries +URL: https://www.freetype.org Source: ftp://ftp.freetype.org/pub/freetype1/freetype-%{version}.tar.bz2 Source2: baselibs.conf Patch0: freetype-tools-1.3.1.patch @@ -39,11 +31,14 @@ Patch3: freetype-%{version}-gcc.patch Patch4: freetype-%{version}-kpathsea.patch Patch5: update-config-files.diff -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: autoconf +BuildRequires: pkgconfig +BuildRequires: pkgconfig(x11) +Requires(pre): fileutils %description A library for working with TrueType Fonts. Documentation is in the -/usr/share/doc/packages/freetype directory. +%{_docdir}/freetype directory. %package -n libttf2 Summary: TrueType Font Engine @@ -51,16 +46,16 @@ %description -n libttf2 A library for working with TrueType Fonts. Documentation is in the -/usr/share/doc/packages/freetype directory. +%{_docdir}/freetype directory. %package devel Summary: Development files for the TrueType Font Engine Group: Development/Libraries/C and C++ -Requires: libttf2 = %version +Requires: libttf2 = %{version} %description devel A library for working with TrueType Fonts. Documentation is in the -/usr/share/doc/packages/freetype directory. +%{_docdir}/freetype directory. %package -n freetype-tools Summary: Bundled Tests, Demos and Tools for FreeType (Needed for CJK-LaTeX) @@ -80,7 +75,7 @@ utilities, such as ttf2bdf, ttf2pfb, and ttfbanner. %prep -%setup +%setup -q %patch0 -p1 %patch1 %patch2 @@ -91,40 +86,47 @@ %build # fix build with newer glibc sed "s:getline:getline_nonlibc:" -i contrib/*/*.{c,h} -export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" +export CFLAGS="%{optflags} -fno-strict-aliasing -fcommon" -# Neither %%configure nor %%_smp_mflags is supported in this package.. -./configure --prefix=/usr \ - --with-locale-dir=/usr/share/locale \ +# Neither %%configure nor %%{?_smp_mflags} is supported in this package.. +./configure \ + --prefix=%{_prefix} \ + --with-locale-dir=%{_datadir}/locale \ --libdir=%{_libdir} \ %{_target_cpu}-suse-linux-gnu make pushd contrib/ttf2bdf - ./configure --prefix=/usr --mandir=$RPM_BUILD_ROOT%{_mandir} \ +./configure \ + --prefix=%{_prefix} \ + --mandir=%{buildroot}%{_mandir} \ --libdir=%{_libdir} \ %{_target_cpu}-suse-linux-gnu - make +make popd pushd contrib/ttf2pfb - ./configure --prefix=/usr --mandir=$RPM_BUILD_ROOT%{_mandir} \ +./configure \ + --prefix=%{_prefix} \ + --mandir=%{buildroot}%{_mandir} \ --libdir=%{_libdir} \ %{_target_cpu}-suse-linux-gnu - make +make popd pushd contrib/ttfbanner - ./configure --prefix=/usr --mandir=$RPM_BUILD_ROOT%{_mandir} \ +./configure \ + --prefix=%{_prefix} \ + --mandir=%{buildroot}%{_mandir} \ --libdir=%{_libdir} \ %{_target_cpu}-suse-linux-gnu - make +make popd %install -make prefix=$RPM_BUILD_ROOT/usr \ - libdir=$RPM_BUILD_ROOT/%{_libdir} \ - gnulocaledir=$RPM_BUILD_ROOT/usr/share/locale \ - localedir=$RPM_BUILD_ROOT/usr/share/locale install +make prefix=%{buildroot}%{_prefix} \ + libdir=%{buildroot}/%{_libdir} \ + gnulocaledir=%{buildroot}%{_datadir}/locale \ + localedir=%{buildroot}%{_datadir}/locale install for i in ttf2bdf ttf2pfb ttfbanner; do - make -C contrib/$i prefix=$RPM_BUILD_ROOT/usr install + make -C contrib/$i prefix=%{buildroot}%{_prefix} install done # copy documentation for freetype-tools: mkdir -p freetype-tools-doc/ttf2bdf @@ -133,28 +135,26 @@ cp contrib/ttf2bdf/README freetype-tools-doc/ttf2bdf cp contrib/ttf2pfb/TODO freetype-tools-doc/ttf2pfb cp contrib/ttfbanner/README freetype-tools-doc/ttfbanner -pushd $RPM_BUILD_ROOT/usr/bin +pushd %{buildroot}%{_bindir} # rename the utility programs to avoid the name conflict with the same # utilities from freetype2: rename ft ft1 ft* popd -pushd $RPM_BUILD_ROOT/usr/include/freetype +pushd %{buildroot}%{_includedir}/freetype # Creeate extend sub directory and link all ftx*.h into this directory mkdir extend cd extend/ ln -sf ../ftx*.h . popd # don't pack t1asm, because this file is in package t1utils: -rm -f $RPM_BUILD_ROOT/usr/bin/t1asm +rm -f %{buildroot}%{_bindir}/t1asm # don't pack getafm, because it is in the package psutils: -rm -f $RPM_BUILD_ROOT/usr/bin/getafm -rm -f "%buildroot/%_libdir"/*.la +rm -f %{buildroot}%{_bindir}/getafm +find %{buildroot} -type f -name "*.la" -delete -print %find_lang %{name} %post -n libttf2 -p /sbin/ldconfig - %postun -n libttf2 -p /sbin/ldconfig - %post -n freetype-tools mkdir -p var/adm/SuSEconfig ; touch var/adm/SuSEconfig/run-texhash test -x usr/bin/texhash && usr/bin/texhash @@ -166,37 +166,34 @@ exit 0 %files -f %{name}.lang -%defattr(-,root,root) -%doc README license.txt docs/FAQ docs/TODO docs/*.txt -/usr/bin/ft1view -/usr/bin/ft1timer -/usr/bin/ft1lint -/usr/bin/ft1dump -/usr/bin/ft1zoom -/usr/bin/ft1string -/usr/bin/ft1strpnm -/usr/bin/ft1error -/usr/bin/ft1metric -/usr/bin/ft1sbit -/usr/bin/ft1strtto +%license license.txt +%doc README docs/FAQ docs/TODO docs/*.txt +%{_bindir}/ft1view +%{_bindir}/ft1timer +%{_bindir}/ft1lint +%{_bindir}/ft1dump +%{_bindir}/ft1zoom +%{_bindir}/ft1string +%{_bindir}/ft1strpnm +%{_bindir}/ft1error +%{_bindir}/ft1metric +%{_bindir}/ft1sbit +%{_bindir}/ft1strtto %files -n libttf2 -%defattr(-,root,root) %{_libdir}/libttf.so.2 %{_libdir}/libttf.so.2.2.0 %files devel -%defattr(-,root,root) -/usr/include/freetype -/usr/include/freetype/extend +%{_includedir}/freetype +%{_includedir}/freetype/extend %{_libdir}/libttf.so %files -n freetype-tools -%defattr(-, root, root) %doc ./freetype-tools-doc -/usr/bin/ttf2bdf -/usr/bin/ttf2pfb -/usr/bin/ttfbanner -/usr/share/man/man1/ttf2bdf.1.gz +%{_bindir}/ttf2bdf +%{_bindir}/ttf2pfb +%{_bindir}/ttfbanner +%{_mandir}/man1/ttf2bdf.1%{?ext_man} %changelog
