Accepting request 97870 from home:tiwai:branches:M17N

- provide libfreetype.la for older distros; otherwise it breaks
  too many package builds in M17N repo
- fix build on FACTORY by owning aclocal dir

OBS-URL: https://build.opensuse.org/request/show/97870
OBS-URL: https://build.opensuse.org/package/show/M17N/freetype2?expand=0&rev=56

freetype2.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Dec 22 12:39:23 CET 2011 - tiwai@suse.de
+
+- provide libfreetype.la for older distros; otherwise it breaks
+  too many package builds in M17N repo
+- fix build on FACTORY by owning aclocal dir
+
 -------------------------------------------------------------------
 Tue Nov 15 08:24:00 UTC 2011 - idonmez@suse.com
 

freetype2.spec

@@ -15,11 +15,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
-
 Name:           freetype2
-License:        Freetype License (BSD-like). See http://freetype.sourceforge.net/FTL.TXT
-Group:          System/Libraries
 BuildRequires:  pkg-config
 BuildRequires:  zlib-devel
 # bug437293
@@ -28,8 +24,10 @@ Obsoletes:      freetype2-64bit
 %endif
 #
 Version:        2.4.8
-Release:        1
+Release:        0
 Summary:        A TrueType Font Library
+License:        Freetype License (BSD-like). See http://freetype.sourceforge.net/FTL.TXT
+Group:          System/Libraries
 Url:            http://www.freetype.org
 Source0:        http://download.savannah.gnu.org/releases/freetype/freetype-%{version}.tar.bz2
 Source1:        http://download.savannah.gnu.org/releases/freetype/freetype-doc-%{version}.tar.bz2
@@ -46,8 +44,8 @@ This library features TrueType fonts for open source projects. This
 version also contains an autohinter for producing improved output.
 
 %package -n libfreetype6
-License:        Freetype License (BSD-like). See http://freetype.sourceforge.net/FTL.TXT
 Summary:        A TrueType Font Library
+License:        Freetype License (BSD-like). See http://freetype.sourceforge.net/FTL.TXT
 Group:          System/Libraries
 Obsoletes:      freetype2 < 2.3.10
 Provides:       freetype2 = 2.3.10
@@ -57,8 +55,8 @@ This library features TrueType fonts for open source projects. This
 version also contains an autohinter for producing improved output.
 
 %package devel
-License:        GPLv2+ ; Freetype License (BSD-like). See http://freetype.sourceforge.net/FTL.TXT
 Summary:        Development environment for the freetype2 TrueType font library
+License:        GPL-2.0+ ; Freetype License (BSD-like). See http://freetype.sourceforge.net/FTL.TXT
 Group:          Development/Libraries/C and C++
 Requires:       libfreetype6 = %{version}
 Requires:       zlib-devel
@@ -121,10 +119,14 @@ rm -rf %{buildroot}
 %defattr(-,root,root)
 %doc freetype-%{version}/docs/*
 %{_includedir}/*
+%if %suse_version >= 1140
 %exclude %{_libdir}/libfreetype.*a
+%else
+%{_libdir}/libfreetype.*a
+%endif
 %{_libdir}/libfreetype.so
 %{_libdir}/pkgconfig/freetype2.pc
 %{_bindir}/*
-%{_datadir}/aclocal/*
+%{_datadir}/aclocal
 
 %changelog

ft2demos.spec

@@ -15,16 +15,14 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
-
 Name:           ft2demos
 Version:        2.4.8
-Release:        1
-License:        GPL-2.0+
+Release:        0
 Summary:        Freetype2 Utilities and Demo Programs
+License:        GPL-2.0+
+Group:          Productivity/Publishing/Other
 %define freetype_version %{version}
 Url:            http://www.freetype.org
-Group:          Productivity/Publishing/Other
 Source0:        http://savannah.nongnu.org/download/freetype/freetype-%{version}.tar.bz2
 Source1:        http://savannah.nongnu.org/download/freetype/ft2demos-%{version}.tar.bz2
 Patch9:         fix-build.patch