Hello community, here is the log from the commit of package fontforge for openSUSE:Factory checked in at 2013-01-13 14:07:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fontforge (Old) and /work/SRC/openSUSE:Factory/.fontforge.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fontforge", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/fontforge/fontforge.changes 2011-12-25 17:34:10.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.fontforge.new/fontforge.changes 2013-01-13 14:07:26.000000000 +0100 @@ -1,0 +2,14 @@ +Fri Jan 4 12:44:05 UTC 2013 - [email protected] + +- Build with cairo and pango support + +------------------------------------------------------------------- +Sun Dec 30 06:44:35 UTC 2012 - [email protected] + +- Update to 20120731b + * see included changelog.html for details + * removed obsolete fontforge.py27.diff + * removed obsolete fontforge-missing-closedir.diff + * removed obsolete libpng14.diff + +------------------------------------------------------------------- Old: ---- fontforge-missing-closedir.diff fontforge.desktop fontforge.png fontforge.py27.diff fontforge_full-20110222.tar.bz2 fontforge_htdocs-20110221.tar.bz2 fontforge_ja_htdocs-20060822.tar.bz2 libpng14.diff New: ---- fontforge_full-20120731-b.tar.bz2 fontforge_htdocs-20120731-b.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fontforge.spec ++++++ --- /var/tmp/diff_new_pack.7wfOWD/_old 2013-01-13 14:07:28.000000000 +0100 +++ /var/tmp/diff_new_pack.7wfOWD/_new 2013-01-13 14:07:28.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package fontforge # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,39 +15,44 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: fontforge -BuildRequires: dos2unix +Version: 20120731 +Release: 0 +%define src_version %{version}-b +Summary: A Font Editor +License: BSD-3-Clause +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: docdir.patch +Patch1: fontforge-20090622-fdleak.patch +Patch2: libpng14-dynamic.diff +# PATCH-FIX-OPENSUSE fontforge-python-module-name.diff -- change python module name according to naming policy +Patch3: fontforge-python-module-name.diff + +BuildRequires: cairo-devel +BuildRequires: fdupes BuildRequires: freetype2-devel +BuildRequires: gettext-tools BuildRequires: giflib-devel +BuildRequires: libjpeg-devel BuildRequires: libpng-devel +%if 0%{?suse_version} > 1210 +BuildRequires: libspiro-devel +%endif BuildRequires: libtiff-devel +BuildRequires: libuninameslist-devel BuildRequires: libxml2-devel +BuildRequires: pango-devel BuildRequires: python-devel BuildRequires: update-desktop-files BuildRequires: xorg-x11-devel -Version: 20110222 -Release: 0 Obsoletes: PfaEdit < 20110222 Provides: PfaEdit = %{version} -Url: http://fontforge.sourceforge.net/ -Source0: http://dfn.dl.sourceforge.net/sourceforge/fontforge/fontforge_full-%{version}.tar.bz2 -Source1: http://sourceforge.net/projects/fontforge/files/fontforge-docs/fontforge_htdocs-20110221.tar.bz2 -Source2: http://belnet.dl.sourceforge.net/sourceforge/fontforge/fontforge_ja_htdocs-20060822.tar.bz2 -Source10: %{name}.desktop -Source11: %name.png -Patch0: docdir.patch -Patch2: fontforge-missing-closedir.diff -Patch3: fontforge-20090622-fdleak.patch -# libpng14.diff upstreamed from 20110222 -Patch4: libpng14.diff -# fontforge.py27.diff upstreamed from 20110222 -Patch5: fontforge.py27.diff -Patch6: libpng14-dynamic.diff -Patch7: fontforge-python-module-name.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build -Summary: A Font Editor -License: BSD-3-Clause -Group: Productivity/Graphics/Vector Editors %description FontForge allows editing of outline and bitmap fonts. With it, you can @@ -58,49 +63,39 @@ %package devel Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/Other -Requires: %{name} = %{version} freetype2-devel +Requires: %{name} = %{version} +Requires: freetype2-devel %description devel This package contains all necessary include files and libraries needed -to develop applications that require these. +to develop applications that use FontForge libraries. %prep -%setup -q -T -n fontforge-%{version} -b 0 +%setup -q -T -n fontforge-%{src_version} -b 0 %patch0 -p 1 -b .docdir -%patch2 -p1 -%patch3 -%if %suse_version > 1120 -# change <= 1130 to <= 1140 as soon as factory will have suse_version > 1140 -%if %suse_version <= 1130 -%patch4 -p1 -%endif -%endif -%if %suse_version > 1130 -# change the nonsense <= 1130 to <= 1140 as soon as factory will have suse_version > 1140 -%if %suse_version <= 1130 -%patch5 -p1 -%endif +%patch1 +%if 0%{?suse_version} > 1120 +%patch2 %endif -%if %suse_version > 1120 -%patch6 -%endif -%patch7 +%patch3 + mkdir docs -tar -jxvf %{S:1} -C docs -tar -jxvf %{S:2} -C docs +tar -jxvf %{SOURCE1} -C docs chmod 644 docs/quadraticspline.gif -dos2unix docs/ja/*html docs/ja/nonBMP/index.html docs/corpchar.txt docs/Big5.txt -tar zxvf docs/cidmaps.tgz -find . -name "*.html" -o -name "*.png" | xargs chmod 644 +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} %build -#libtoolize --force -#autoreconf --force --install -export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" -# --with-multilayer -%configure --disable-static --with-pic \ - --enable-pyextension +export CFLAGS="%{optflags} -fno-strict-aliasing" +%configure \ + --disable-static \ + --enable-pyextension \ + --with-regular-link + make %{?_smp_mflags} pushd pyhook @@ -108,39 +103,44 @@ popd %install -make DESTDIR=$RPM_BUILD_ROOT install -pushd $RPM_BUILD_ROOT/usr/bin +make DESTDIR=%{buildroot} install +# 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* $RPM_BUILD_ROOT/usr/share/fontforge -install -d $RPM_BUILD_ROOT%_datadir/pixmaps -install -m644 $RPM_SOURCE_DIR/%name.png $RPM_BUILD_ROOT%_datadir/pixmaps/%name.png -%find_lang FontForge +# 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 -%{__rm} -f %{buildroot}%{_libdir}/*.la + +%find_lang FontForge +rm -f %{buildroot}%{_libdir}/*.la pushd pyhook python setup.py install \ - --root=$RPM_BUILD_ROOT \ + --root=%{buildroot} \ --prefix=%{_prefix} \ --record-rpm=%{name}-python.files popd +%fdupes -s %{buildroot}%{_datadir}/%{name} + %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -f FontForge.lang %defattr(-,root,root) -%doc AUTHORS VERSION LICENSE README* docs +%doc AUTHORS VERSION LICENSE README-unix docs/ %{_bindir}/* %{_libdir}/lib*.so.* -%dir /usr/share/fontforge/ -/usr/share/fontforge/* -%doc %{_mandir}/man1/*.1* -/usr/share/applications/%{name}.desktop -%_datadir/pixmaps/%name.png +%{_datadir}/fontforge/ +%{_mandir}/man1/*.1* +%{_datadir}/applications/%{name}.desktop +%{_datadir}/pixmaps/%{name}.png %py_sitedir/* %files devel -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
