Hello community, here is the log from the commit of package fontforge for openSUSE:Factory checked in at 2015-04-27 22:06:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fontforge (Old) and /work/SRC/openSUSE:Factory/.fontforge.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fontforge" Changes: -------- --- /work/SRC/openSUSE:Factory/fontforge/fontforge.changes 2015-02-06 10:55:18.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.fontforge.new/fontforge.changes 2015-04-27 22:06:39.000000000 +0200 @@ -1,0 +2,26 @@ +Mon Apr 20 07:10:42 UTC 2015 - [email protected] + +- repack source [bnc#926061] + +------------------------------------------------------------------- +Tue Mar 31 09:55:24 UTC 2015 - [email protected] + +- updated to 20150330: + * fixes a few crashes, enhances round-tripping of information in + certain file formats, and fixes some bad logic + * adds support for fine point adjustment + * etc. see https://github.com/fontforge/fontforge/releases + for details +- remove %requires_ge libpng16-16 as it seems fontforge is not so + picky anymore +- doc is generated +- remove pfaedit compat +- removed patches (upstreamed or not needed): + - fontforge-fixgiflib.patch + - fontforge-arraysubscript.patch + - fontforge-fdleak.patch + - fontforge-libpng.diff + - fontforge-docdir.patch + - fontforge-python-module-name.diff + +------------------------------------------------------------------- Old: ---- fontforge-arraysubscript.patch fontforge-docdir.patch fontforge-fdleak.patch fontforge-fixgiflib.patch fontforge-libpng.diff fontforge-python-module-name.diff fontforge_full-20120731-b.tar.bz2 fontforge_htdocs-20120731-b.tar.bz2 New: ---- fontforge-20150330-repacked.tar.gz get-source.sh ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fontforge.spec ++++++ --- /var/tmp/diff_new_pack.P6l3tW/_old 2015-04-27 22:06:42.000000000 +0200 +++ /var/tmp/diff_new_pack.P6l3tW/_new 2015-04-27 22:06:42.000000000 +0200 @@ -16,37 +16,33 @@ # -%define src_version %{version}-b Name: fontforge -Version: 20120731 +Version: 20150330 Release: 0 Summary: A Font Editor -License: BSD-3-Clause +License: GPL-3.0+ Group: Productivity/Graphics/Vector Editors Url: http://fontforge.org/ -Source0: http://downloads.sourceforge.net/%{name}/%{name}_full-%{src_version}.tar.bz2 -Source1: http://downloads.sourceforge.net/%{name}/%{name}_htdocs-%{src_version}.tar.bz2 -# PATCH-FIX-OPENSUSE -- set path to documentation -Patch0: fontforge-docdir.patch -Patch1: fontforge-fdleak.patch -# workaround, this should be resolved upstream (use pkg-config) bnc#867041 -Patch2: fontforge-libpng.diff -# PATCH-FIX-OPENSUSE fontforge-python-module-name.diff -- change python module name according to naming policy -Patch3: fontforge-python-module-name.diff -Patch4: fontforge-fixgiflib.patch -# PATCH-FIX-UPSTREAM http://sourceforge.net/p/fontforge/git/ci/9ae25e0 -Patch5: fontforge-arraysubscript.patch +# Source: https://github.com/fontforge/fontforge/releases/download/%{version}/fontforge-%{version}.tar.gz +# see bug 926061, fontforge-*-repacked.tar.gz does not contain fontforge-*/win/gold/libX11-*.noarch.rpm +Source0: fontforge-%{version}-repacked.tar.gz +Source1: get-source.sh # suse specific -Patch6: propagate-creation-and-modification-times-to-ttf.patch +Patch0: propagate-creation-and-modification-times-to-ttf.patch +BuildRequires: autoconf +BuildRequires: automake BuildRequires: cairo-devel BuildRequires: fdupes BuildRequires: fontconfig-devel BuildRequires: freetype2-devel BuildRequires: gettext-tools BuildRequires: giflib-devel +BuildRequires: git +BuildRequires: hicolor-icon-theme BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: libtiff-devel +BuildRequires: libtool BuildRequires: libuninameslist-devel BuildRequires: libxml2-devel BuildRequires: pango-devel @@ -57,11 +53,6 @@ BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xft) BuildRequires: pkgconfig(xi) -# following to avoid warning -# 'Application built with libpng-1.5.14 but running with 1.6.1' -%requires_eq libpng16-16 -Obsoletes: PfaEdit < 20110222 -Provides: PfaEdit = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} > 1210 BuildRequires: libspiro-devel @@ -102,60 +93,24 @@ to develop applications that use FontForge libraries. %prep -%setup -q -T -n fontforge-%{src_version} -b 0 -%patch0 -p 1 -b .docdir -%patch1 -%patch2 -%patch3 -%if 0%{?suse_version} > 1230 -%patch4 -p1 -%endif -%patch5 -p1 -%patch6 -p1 -mkdir docs -tar -jxvf %{SOURCE1} -C docs -chmod 644 docs/quadraticspline.gif -chmod 644 docs/FontForgeSplash.png -chmod 644 docs/*.html -# tar zxvf docs/cidmaps.tgz -find . -name CVS -type d | xargs rm -rf -# fix wrong-file-end-of-line-encoding -sed -i 's/\r$//' docs/{Big5.txt,corpchar.txt} +%setup -q +%patch0 -p1 +sed -i 's/\r$//' doc/html/{Big5.txt,corpchar.txt} %build -# workaround, this should be resolved upstream (use pkg-config) bnc#867041 -pkg-config --exists 'libpng >= 1.7.0' && echo 'Libpng was updated to 1.7, fontforge-libpng.patch will probably need to be adapted.' && exit 1 -export CFLAGS="%{optflags} -fno-strict-aliasing" +./bootstrap %configure \ --disable-static \ --enable-pyextension \ - --with-regular-link - + --with-regular-link \ + --docdir=%{_docdir}/%{name}/html make %{?_smp_mflags} -pushd pyhook -python setup.py build -popd %install make DESTDIR=%{buildroot} install %{?_smp_mflags} -# symlink for old FontForge name - PfaEdit -pushd %{buildroot}%{_bindir} - ln -s fontforge pfaedit -popd -# install CMaps to be able to edit CID-keyed fonts: -# install -m 644 Adobe* %{buildroot}%{_datadir}/fontforge -# desktop file and icon -install -Dm 644 Packaging/%{name}.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop -install -Dm 644 Packaging/icons/48x48/apps/%{name}.png %{buildroot}%{_datadir}/pixmaps/%{name}.png %suse_update_desktop_file -i %{name} VectorGraphics %find_lang FontForge find %{buildroot} -type f -name "*.la" -delete -print -pushd pyhook -python setup.py install \ - --root=%{buildroot} \ - --prefix=%{_prefix} \ - --record-rpm=%{name}-python.files -popd %fdupes -s %{buildroot}%{_datadir}/%{name} %post -p /sbin/ldconfig @@ -164,21 +119,26 @@ %files -f FontForge.lang %defattr(-,root,root) -%doc LICENSE +%doc LICENSE COPYING.gplv3 +%exclude %{_docdir}/%{name}/html +%{_mandir}/man1/*.1* %{_bindir}/* %{_libdir}/lib*.so.* %{_datadir}/fontforge/ -%{_mandir}/man1/*.1* -%{_datadir}/applications/%{name}.desktop -%{_datadir}/pixmaps/%{name}.png %{py_sitedir}/* +%{_datadir}/applications/%{name}.desktop +%{_datadir}/icons/hicolor/*/apps/%{name}.png +%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg +%{_datadir}/mime/packages/%{name}.xml %files doc %defattr(-,root,root) -%doc AUTHORS VERSION LICENSE README-unix docs/ +%doc AUTHORS LICENSE README.md +%doc %{_docdir}/%{name}/html %files devel %defattr(-, root, root) +%doc CONTRIBUTING.md %{_includedir}/fontforge/ %{_libdir}/pkgconfig/*.pc %{_libdir}/lib*.so ++++++ get-source.sh ++++++ #!/bin/sh # # repack source -- delete libX11-*.noarch.rpm from there; see bug #926061 # VERSION=$1 if [ -z $VERSION ]; then echo "usage: $0 date_version" echo "example: $0 20150330" exit 1 fi wget "https://github.com/fontforge/fontforge/releases/download/$VERSION/fontforge-$VERSION.tar.gz"; tar xf fontforge-$VERSION.tar.gz rm fontforge-*/win/gold/libX11-*.noarch.rpm tar czf fontforge-$VERSION-repacked.tar.gz fontforge-$VERSION rm -rf fontforge-$VERSION rm fontforge-$VERSION.tar.gz
