Hello community, here is the log from the commit of package graphite2 for openSUSE:Factory checked in at 2014-01-30 09:02:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/graphite2 (Old) and /work/SRC/openSUSE:Factory/.graphite2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "graphite2" Changes: -------- --- /work/SRC/openSUSE:Factory/graphite2/graphite2.changes 2013-06-29 19:42:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.graphite2.new/graphite2.changes 2014-01-30 09:02:03.000000000 +0100 @@ -1,0 +2,39 @@ +Wed Jan 29 17:57:37 UTC 2014 - [email protected] + +- Remove harfbuzz dep. Breaks another buildcycle. + This effectively means we are not running tests. No functional + changes otherwise. + +------------------------------------------------------------------- +Wed Jan 29 13:50:06 UTC 2014 - [email protected] + +- Remove texlive dep to remove dep circle. + +------------------------------------------------------------------- +Sun Jan 26 12:05:43 UTC 2014 - [email protected] + +- Use rpath so the tests work. + +------------------------------------------------------------------- +Sat Jan 25 22:57:20 UTC 2014 - [email protected] + +- Enable the tests. They work on 13.1 but fail on Factory... + +------------------------------------------------------------------- +Sat Jan 25 22:28:21 UTC 2014 - [email protected] + +- Version bump to 1.2.4: + * Various bugfixes + * Expanded testsuite +- Remove graphite2-arm.patch - applied upstream +- Add patches from debian: + * soname.diff + * no-specific-nunit-version.diff +- Run^Wdocument tests and generate documentation + +------------------------------------------------------------------- +Sat Jan 25 21:34:18 UTC 2014 - [email protected] + +- Use cmake macros for nice and tidy setup. + +------------------------------------------------------------------- Old: ---- graphite2-1.2.0.tgz graphite2-arm.patch New: ---- graphite2-1.2.4.tgz no-specific-nunit-version.diff soname.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ graphite2.spec ++++++ --- /var/tmp/diff_new_pack.JH53F4/_old 2014-01-30 09:02:04.000000000 +0100 +++ /var/tmp/diff_new_pack.JH53F4/_new 2014-01-30 09:02:04.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package graphite2 # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -17,9 +17,8 @@ %define libname libgraphite2-3 - Name: graphite2 -Version: 1.2.0 +Version: 1.2.4 Release: 0 Summary: Font rendering capabilities for complex non-Roman writing systems License: LGPL-2.1+ or GPL-2.0+ or MPL-1.1 @@ -27,12 +26,17 @@ Url: http://sourceforge.net/projects/silgraphite/ Source0: http://downloads.sourceforge.net/silgraphite/graphite2-%{version}.tgz Source1: baselibs.conf +Patch0: no-specific-nunit-version.diff +Patch1: soname.diff +BuildRequires: asciidoc BuildRequires: cmake +BuildRequires: fontconfig-devel BuildRequires: freetype2-devel BuildRequires: gcc-c++ +BuildRequires: glib2-devel BuildRequires: pkgconfig +BuildRequires: python-base BuildRoot: %{_tmppath}/%{name}-%{version}-build -Patch0: graphite2-arm.patch %description Graphite2 is a project within SIL’s Non-Roman Script Initiative and Language @@ -72,27 +76,27 @@ %prep %setup -q -%patch0 +%patch0 -p1 +%patch1 -p1 + %build -cmake \ - -DCMAKE_C_FLAGS:STRING="%{optflags} -D_GNU_SOURCE" \ - -DCMAKE_CXX_FLAGS:STRING="%{optflags} -D_GNU_SOURCE" \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=%{_prefix} \ - -DBUILD_SHARED_LIBS=ON \ -%if %{_lib} == lib64 - -DLIB_SUFFIX=64 \ -%endif +%cmake \ -DGRAPHITE2_COMPARE_RENDERER=OFF \ - -DVM_MACHINE_TYPE=direct \ - -DCMAKE_VERBOSE_MAKEFILE=ON + -DGRAPHITE2_NTRACING=ON \ + -DCMAKE_SKIP_RPATH=OFF +# Do not use O3, from debian +find . -type f \ + -exec sed -i -e 's/\-O3//g' {} \; make %{?_smp_mflags} %install -make DESTDIR=%{buildroot} install -rm %{buildroot}%{_libdir}/*.la +%cmake_install +find %{buildroot} -type f -name "*.la" -delete -print + +%check +cd build +ctest --extra-verbose --output-on-failure %post -n %{libname} -p /sbin/ldconfig ++++++ graphite2-1.2.0.tgz -> graphite2-1.2.4.tgz ++++++ /work/SRC/openSUSE:Factory/graphite2/graphite2-1.2.0.tgz /work/SRC/openSUSE:Factory/.graphite2.new/graphite2-1.2.4.tgz differ: char 5, line 1 ++++++ no-specific-nunit-version.diff ++++++ --- graphite2-1.2.0.orig/contrib/C#/NGraphiteTests/NGraphiteTests.csproj +++ graphite2-1.2.0/contrib/C#/NGraphiteTests/NGraphiteTests.csproj @@ -30,10 +30,10 @@ </PropertyGroup> <ItemGroup> <Reference Include="System" /> - <Reference Include="nunit.core, Version=2.4.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77"> + <Reference Include="nunit.core"> <Package>mono-nunit</Package> </Reference> - <Reference Include="nunit.framework, Version=2.4.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77"> + <Reference Include="nunit.framework"> <Package>mono-nunit</Package> </Reference> </ItemGroup> ++++++ soname.diff ++++++ --- graphite2-1.2.0.orig/contrib/C#/NGraphite/NGraphite.dll.config +++ graphite2-1.2.0/contrib/C#/NGraphite/NGraphite.dll.config @@ -1,3 +1,3 @@ <configuration> - <dllmap dll="graphite2.dll" target="libgraphite2.so.2.0.0" os="!windows"/> + <dllmap dll="graphite2.dll" target="libgraphite2.so.3" os="!windows"/> </configuration> -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
