- updated to 1.1.1

- pl
- updated fix_wrong_linker_opts,includes-libs-perl patches

Changed files:
    graphite2-fix_wrong_linker_opts.patch -> 1.2
    graphite2-includes-libs-perl.patch -> 1.2
    graphite2.spec -> 1.4

diff --git a/graphite2-fix_wrong_linker_opts.patch b/graphite2-fix_wrong_linker_opts.patch
index 77d1206e7bd3ba3c6d664cc07c3d875c2cb74ae5..edacd73629f30b3b0f4fe8873d68e993096434d9 100644 (file)
--- a/graphite2-fix_wrong_linker_opts.patch
+++ b/graphite2-fix_wrong_linker_opts.patch
@@ -9,10 +9,3 @@ diff -urN graphite2-1.0.1.old/src/CMakeLists.txt graphite2-1.0.1/src/CMakeLists.
      if (${CMAKE_CXX_COMPILER} MATCHES  ".*mingw.*")
          target_link_libraries(graphite2 "-lkernel32 -lmsvcr90 -lmingw32 -lgcc -luser32")
      else (${CMAKE_CXX_COMPILER} MATCHES  ".*mingw.*")
-@@ -121,4 +120,4 @@
- 
- 
- install(TARGETS graphite2 EXPORT graphite2 LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX} PUBLIC_HEADER DESTINATION include/graphite2 RUNTIME DESTINATION bin)
--install(EXPORT graphite2 DESTINATION share/graphite2 NAMESPACE gr2_)
-\ Chybí znak konce řádku na konci souboru
-+install(EXPORT graphite2 DESTINATION share/graphite2 NAMESPACE gr2_)

diff --git a/graphite2-includes-libs-perl.patch b/graphite2-includes-libs-perl.patch
index eb3783b1dc7a8280ba2283f568702a53fb16bf23..bc693a700b11072ad0f616822776b54bbb8e243c 100644 (file)
--- a/graphite2-includes-libs-perl.patch
+++ b/graphite2-includes-libs-perl.patch
@@ -1,12 +1,12 @@
---- graphite2-0.9.3.orig/contrib/perl/Build.PL
-+++ graphite2-0.9.3/contrib/perl/Build.PL
-@@ -8,8 +8,8 @@ my $builder = Module::Build->new(
+--- graphite2-1.1.1/contrib/perl/Build.PL.orig 2012-02-27 05:40:49.000000000 +0100
++++ graphite2-1.1.1/contrib/perl/Build.PL      2012-03-28 19:13:08.209767728 +0200
+@@ -8,8 +8,8 @@
      dist_author         => 'Simon Cozens <simon@cpan.org>',
-     dist_version_from   => 'lib/Text/Graphite2.pm',
-     extra_compiler_flags => '-Wall -Wno-unused-variable',
--    extra_linker_flags  => '-lgraphite2',
+     dist_version_from   => 'lib/Text/Gr2.pm',
+     extra_compiler_flags => $^O ne 'MSWin32' ? '-Wall -Wno-unused-variable' : '',
+-    extra_linker_flags  => $^O eq 'MSWin32' ? '../../build/src/graphite2.lib' : '-lgraphite2',
 -    include_dirs        => ['.'],
-+    extra_linker_flags  => '-L @BUILD_DIR@ -lgraphite2',
++    extra_linker_flags  => $^O eq 'MSWin32' ? '../../build/src/graphite2.lib' : '-L @BUILD_DIR@ -lgraphite2',
 +    include_dirs        => ['.', '../../include'],
      requires => {
          'Test::More' => 0,

diff --git a/graphite2.spec b/graphite2.spec
index 280abcaaf1811fff55c9f4b9ea78b1157d3dd351..8a28c37b4c06a26bcae8ef47683f60ffbcc763f4 100644 (file)
--- a/graphite2.spec
+++ b/graphite2.spec
@@ -1,34 +1,50 @@
 Summary:       Font rendering capabilities for complex non-Roman writing systems
+Summary(pl.UTF-8):     Wsparcie renderowania złożonych systemów pisma nierzymskiego
 Name:          graphite2
-Version:       1.0.3
+Version:       1.1.1
 Release:       1
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       http://downloads.sourceforge.net/silgraphite/graphite2/%{name}-%{version}.tgz
-# Source0-md5: 3bf481ca95109b14435125c0dd1f2217
+# Source0-md5: d2470967db5cdc6c04468950e423e9df
 Patch0:                %{name}-1.0.2-no_harfbuzz_tests.patch
 Patch1:                %{name}-fix_wrong_linker_opts.patch
 Patch2:                %{name}-includes-libs-perl.patch
 URL:           http://graphite.sil.org/
-BuildRequires: cmake
-BuildRequires: glib2-devel
+BuildRequires: cmake >= 2.8.0
+BuildRequires: libstdc++-devel
 BuildRequires: pkgconfig
+# the rest for tests only
+BuildRequires: freetype-devel >= 2
+BuildRequires: glib2-devel >= 2.0
+BuildRequires: libicu-devel
 BuildRequires: silgraphite-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-Graphite is a project within SIL’s Non-Roman Script Initiative and
+Graphite is a project within SIL's Non-Roman Script Initiative and
 Language Software Development groups to provide rendering capabilities
 for complex non-Roman writing systems. Graphite can be used to create
 "smart fonts" capable of displaying writing systems with various
 complex behaviors. With respect to the Text Encoding Model, Graphite
 handles the "Rendering" aspect of writing system implementation.
 
+%description -l pl.UTF-8
+Graphite to projekt w ramach grup SIL Non-Roman Script Initiative
+(inicjatywy pism nierzymskich SIL) oraz Language Software Development
+(tworzenia oprogramowania językowego) mający na celu zapewnienie
+wsparcia dla złożonych systemów pisma nierzymskiego. Graphite może być
+używany do tworzenia "inteligentnych fontów", będących w stanie
+wyświelać systemy pisma o różnych złożonych zachowaniach.
+Uwzględniając model kodowania tekstu (Text Encoding Model) Graphite
+obsługuje aspekt renderowania całości implementacji systemów pisma.
+
 %package devel
 Summary:       Header files for graphite2 library
 Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki graphite2
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
+Requires:      libstdc++-devel
 
 %description devel
 Header files for graphite2 library.
@@ -36,18 +52,6 @@ Header files for graphite2 library.
 %description devel -l pl.UTF-8
 Pliki nagłówkowe biblioteki graphite2.
 
-%package static
-Summary:       Static graphite2 library
-Summary(pl.UTF-8):     Statyczna biblioteka graphite2
-Group:         Development/Libraries
-Requires:      %{name}-devel = %{version}-%{release}
-
-%description static
-Static graphite2 library.
-
-%description static -l pl.UTF-8
-Statyczna biblioteka graphite2.
-
 %prep
 %setup -q
 %patch0 -p1
@@ -57,9 +61,8 @@ Statyczna biblioteka graphite2.
 %build
 install -d build
 cd build
-%cmake \
-       -DVM_MACHINE_TYPE=direct \
-       ..
+%cmake .. \
+       -DGRAPHITE2_VM_TYPE=direct
 
 %{__make}
 
@@ -71,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT
 
 /sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir}
 
+# cmake's fake (with no dependencies); also obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libgraphite2.la
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -83,7 +89,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/comparerenderer
 %attr(755,root,root) %{_bindir}/gr2fonttest
 %attr(755,root,root) %{_libdir}/libgraphite2.so.*.*.*
-#%attr(755,root,root) %ghost %{_libdir}/libgraphite2.so.2
 
 %files devel
 %defattr(644,root,root,755)