- 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 - Use cmake macros for nice and tidy setup. OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/graphite2?expand=0&rev=10
2014-01-25 22:41:21 +00:00 · 2014-01-25 22:41:21 +00:00 · 4f914ae9cd
commit 4f914ae9cd
parent 1b5cd50e88
7 changed files with 81 additions and 52 deletions
--- a/graphite2-1.2.0.tgz
+++ b/graphite2-1.2.0.tgz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:630fba251c7e570f2b0c4a0c63a7abb4d45b0246d390f53188b1a9b73de7b96e
-size 4663935
--- a/graphite2-1.2.4.tgz
+++ b/graphite2-1.2.4.tgz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4bc3d5168029bcc0aa00eb2c973269d29407be2796ff56f9c80e10736bd8b003
+size 6938866
--- a/graphite2-arm.patch
+++ b/graphite2-arm.patch
@ -1,30 +0,0 @@
--- tests/CMakeLists.txt.orig
-+++ tests/CMakeLists.txt
-@@ -39,14 +39,12 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Windo
-                             COMPILE_DEFINITIONS "GRAPHITE2_STATIC;GRAPHITE2_NTRACING;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;UNICODE")
- else (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
-     set_target_properties(graphite2-base PROPERTIES 
-        COMPILE_FLAGS       "-Wall -Wextra -fdiagnostics-show-option -fno-rtti -fno-exceptions -fno-stack-protector"
-+        COMPILE_FLAGS       "-Wall -Wextra -fdiagnostics-show-option -fno-rtti -fno-exceptions"
-         COMPILE_DEFINITIONS "GRAPHITE2_STATIC"
-        LINK_FLAGS          "-nodefaultlibs" 
-         LINKER_LANGUAGE     C)
-     set_target_properties(graphite2-segcache PROPERTIES 
-        COMPILE_FLAGS       "-Wall -Wextra -fdiagnostics-show-option -fno-rtti -fno-exceptions -fno-stack-protector"
-+        COMPILE_FLAGS       "-Wall -Wextra -fdiagnostics-show-option -fno-rtti -fno-exceptions"
-         COMPILE_DEFINITIONS "GRAPHITE2_STATIC;GRAPHITE2_NTRACING"
-        LINK_FLAGS          "-nodefaultlibs" 
-         LINKER_LANGUAGE     C)
- endif (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
- 
--- gr2fonttest/CMakeLists.txt.orig
-+++ gr2fonttest/CMakeLists.txt
-@@ -16,7 +16,7 @@ target_link_libraries(gr2fonttest graphi
- if  (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-     # -lgcc LINKER_LANGUAGE C
-     add_definitions(-fno-rtti -fno-exceptions)
-    set_target_properties(gr2fonttest PROPERTIES LINK_FLAGS "-nodefaultlibs" LINKER_LANGUAGE C)
-+    set_target_properties(gr2fonttest PROPERTIES LINKER_LANGUAGE C)
-     set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "")
-     # This script just fails
-     nolib_test(stdc++ $<TARGET_FILE:gr2fonttest>)
--- a/graphite2.changes
+++ b/graphite2.changes
@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Sat Jan 25 22:28:21 UTC 2014 - tchvatal@suse.com
+
+- 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 - tchvatal@suse.com
+
+- Use cmake macros for nice and tidy setup.
+
 -------------------------------------------------------------------
 Fri Jun 28 11:15:36 UTC 2013 - dimstar@opensuse.org

--- a/graphite2.spec
+++ b/graphite2.spec
@ -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,25 @@ Group:          Productivity/Publishing/Word
 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:  doxygen
+BuildRequires:  fontconfig-devel
 BuildRequires:  freetype2-devel
 BuildRequires:  gcc-c++
+BuildRequires:  glib2-devel
+BuildRequires:  harfbuzz-devel
 BuildRequires:  pkgconfig
+BuildRequires:  python-base
+BuildRequires:  texlive-helvetic
+BuildRequires:  texlive-multirow
+BuildRequires:  texlive-sectsty
+BuildRequires:  texlive-tocloft
+BuildRequires:  texlive-xtab
+BuildRequires:  xsltproc
 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 +84,34 @@ This package contains the libexttextcat development files.

 %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
+# Do not use O3, from debian
+find . -type f \
+	-exec sed -i -e 's/\-O3//g' {} \;

 make %{?_smp_mflags}
+make docs %{?_smp_mflags}
+sed -i -e 's!<a id="id[a-z]*[0-9]*"></a>!!g' doc/manual.html

 %install
-make DESTDIR=%{buildroot} install
-rm %{buildroot}%{_libdir}/*.la
+%cmake_install
+find %{buildroot} -type f -name "*.la" -delete -print
+
+#%check
+# FAILS bunch of tests:
+#         25 - padauk12Output (Failed)
+#         34 - scher5 (Failed)
+#         35 - scher5Output (Failed)
+#         51 - charis8Output (Failed)
+#         79 - grsegcachetest (SEGFAULT)
+#cd build
+#ctest --extra-verbose --output-on-failure

 %post -n %{libname} -p /sbin/ldconfig

@ -109,6 +128,7 @@ rm %{buildroot}%{_libdir}/*.la

 %files devel
 %defattr(-,root,root)
+%doc build/doc/manual.html
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/%{name}*.pc
 %{_includedir}/%{name}*
--- a/no-specific-nunit-version.diff
+++ b/no-specific-nunit-version.diff
@ -0,0 +1,15 @@
+--- 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>
--- a/soname.diff
+++ b/soname.diff
@ -0,0 +1,7 @@
+--- 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>