Browse Source

new upstream

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9856 ec354946-7b23-47d6-9f5a-488ba84defc7
kudoh 8 years ago
parent
commit
975629fb9b
1 changed files with 13 additions and 6 deletions
  1. 13 6
      f/freetype2/freetype2-vl.spec

+ 13 - 6
f/freetype2/freetype2-vl.spec

@@ -1,7 +1,7 @@
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
 %bcond_with subpixel_rendering
-%define ver_majar 2.5.5
+%define ver_majar 2.6.2
 
 Summary: FreeType 2 library
 Summary(ja): FreeType 2 ライブラリ
@@ -24,7 +24,7 @@ Patch46:  freetype-2.2.1-enable-valid.patch
 Patch88:  freetype-multilib.patch
 # Fix crash https://bugs.freedesktop.org/show_bug.cgi?id=6841
 Patch89:  freetype-2.2.1-memcpy-fix.patch
-Patch90:  freetype-2.5.4-pkgconfig.patch
+#Patch90:  freetype-2.5.4-pkgconfig.patch
 
 Patch200: freetype-2.1.10-slight-embolden.patch
 Patch201: freetype-2.4.12-x86_64-invalid_outline.patch
@@ -209,13 +209,13 @@ This package contains the static library for %{name}
 %patch46 -p1 -b .enable-valid
 %patch88 -p1 -b .multilib
 %patch89 -p1 -b .memcpy
-%patch90 -p1 -b .pkgconfig
+#%patch90 -p1 -b .pkgconfig
 
 %patch200 -p1 -b .slight-embolden
 
-%ifarch x86_64
-%patch201 -p1 -b .invalid_outline
-%endif
+#%ifarch x86_64
+#%patch201 -p1 -b .invalid_outline
+#%endif
 
 %build
 %configure
@@ -295,6 +295,13 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 %endif
 
 %changelog
+* Sat Dec 05 2015 Toshiharu Kudoh <toshi.kd2@gmail.com> 2.6.2-1
+- new upstream release
+- remade Patch88
+- deleted Pacth90
+- did not apply Patch201
+  - but included src.rpm
+
 * Fri Jan 16 2015 Toshiharu Kudoh <toshi.kd2@gmail.com> 2.5.5-1
 - new upstream release