Accepting request 36463 from M17N

checked in (request 36463)

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

ft2demos.spec

@@ -23,8 +23,10 @@ BuildRequires:  xorg-x11-devel
 License:        GPLv2+
 Group:          Productivity/Publishing/Other
 AutoReqProv:    on
+%if %suse_version > 1000
 Supplements:    fonts-config
-Version:        2.3.12
+%endif
+Version:        2.3.9
 Release:        3
 %define freetype_version %{version}
 Url:            http://www.freetype.org
@@ -39,19 +41,33 @@ Source0:        http://savannah.nongnu.org/download/freetype/freetype-%{version}
 Source1:        http://savannah.nongnu.org/download/freetype/ft2demos-%{version}.tar.bz2
 # pregenerated to avoid build-dependence on python:
 Source2:        freetype-doc-reference.tar.bz2
+Patch3:         freetype2-bitmap-foundry.patch
 Patch4:         ft2-stream-compat.diff
+Patch5:         revert-fix-bytecode.patch
+Patch8:         bugzilla-159166-reduce-embolden-distance.patch
 Patch9:         fix-build.patch
 Patch308961:    bugzilla-308961-cmex-workaround.patch
+Patch11:        bnc485889-overflow1.patch
+Patch12:        bnc485889-overflow2.patch
+Patch13:        bnc485889-overflow3.patch
+Patch14:        bnc485889-overflow4.patch
 Patch50:        ft2demos-build-testname.patch
 Patch100:       freetype2-bc.patch
 Patch101:       ft2demos-bc.patch
 Patch200:       freetype2-subpixel.patch
-Patch201:       use_unix.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 Freetype2 utilities and demo programs.
 
+
+
+Authors:
+--------
+    David Turner <david.turner@freetype.org>
+    Robert Wilhelm <robert.wilhelm@freetype.org>
+    Werner Lemberg <werner.lemberg@freetype.org>
+
 %prep
 # The byte code interpreter is compiled in by default
 # because of the following option.
@@ -64,11 +80,16 @@ Freetype2 utilities and demo programs.
 %define enable_bytecode_interpreter 1
 %define enable_subpixel_rendering 0%{?opensuse_bs}
 %setup -n freetype-%{freetype_version} -b 1
+%patch3 -p 1 -b .bitmap-foundry
 %patch4 -p 1 -b .ft2-stream-compat
 #%patch5 -p 1
 #%patch8 -p 1
 %patch9 -p 1
 %patch308961 -p 1
+%patch11 -p 1
+%patch12 -p 1
+%patch13 -p 1
+%patch14 -p 1
 pushd ../ft2demos-%{version}
 %patch50 -p 1
 popd
@@ -81,7 +102,6 @@ popd
 %if %{enable_subpixel_rendering}
 %patch200 -p 1 -b .subpixel
 %endif
-%patch201 -p1
 pushd docs
     tar xf $RPM_SOURCE_DIR/freetype-doc-reference.tar.bz2
 popd
@@ -90,6 +110,9 @@ find . -name ".cvsignore" | xargs rm -f
 cp /usr/share/automake*/config.{guess,sub} builds/unix
 
 %build
+%if %suse_version > 1110
+sh ./autogen.sh
+%endif
 export CFLAGS="$RPM_OPT_FLAGS -g -fno-strict-aliasing "
 ln -s /usr/bin/libtool ./builds/unix/libtool
 make setup CFG="--prefix=/usr --libdir=%{_libdir} --with-zlib"
@@ -111,7 +134,7 @@ popd
 #make prefix=$RPM_BUILD_ROOT/usr libdir=$RPM_BUILD_ROOT/%{_libdir} install
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 pushd ../ft2demos-%{version}/bin/.libs
-    install -m 755 ft* $RPM_BUILD_ROOT%{_bindir}
+    install -m 755 ft* testname $RPM_BUILD_ROOT%{_bindir}
 popd
 
 %clean
@@ -119,5 +142,6 @@ popd
 %files
 %defattr(-,root,root)
 %{_bindir}/ft*
+%{_bindir}/testname
 
 %changelog