From 7ae841c24d9008d183fa2127ef28858fd703d9c4e54da8b1371265a94391d7ce Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 23 Jan 2007 00:16:00 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ftgl?expand=0&rev=2 --- ftgl-2.1.2-same-variable-used-twice.patch | 12 ++++++++++++ ftgl.changes | 5 +++++ ftgl.spec | 10 +++++++--- 3 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 ftgl-2.1.2-same-variable-used-twice.patch diff --git a/ftgl-2.1.2-same-variable-used-twice.patch b/ftgl-2.1.2-same-variable-used-twice.patch new file mode 100644 index 0000000..3c09a15 --- /dev/null +++ b/ftgl-2.1.2-same-variable-used-twice.patch @@ -0,0 +1,12 @@ +diff -Naur FTGL.org/demo/FTGLDemo.cpp FTGL/demo/FTGLDemo.cpp +--- FTGL.org/demo/FTGLDemo.cpp 2007-01-22 15:22:39.592135000 +0100 ++++ FTGL/demo/FTGLDemo.cpp 2007-01-22 15:23:36.128546000 +0100 +@@ -406,7 +406,7 @@ + { + myString[carat] = key; + myString[carat + 1] = 0; +- carat = carat > 14 ? 14 : ++carat; ++ carat = carat > 14 ? 14 : carat + 1; + } + } + diff --git a/ftgl.changes b/ftgl.changes index 32d5f4e..592f458 100644 --- a/ftgl.changes +++ b/ftgl.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jan 22 15:24:53 CET 2007 - ssommer@suse.de + +- fixed same variable used twice build error + ------------------------------------------------------------------- Wed Sep 13 16:00:09 CEST 2006 - sbrabec@suse.cz diff --git a/ftgl.spec b/ftgl.spec index 98717b1..1c39937 100644 --- a/ftgl.spec +++ b/ftgl.spec @@ -1,7 +1,7 @@ # # spec file for package ftgl (Version 2.1.2) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -13,14 +13,15 @@ Name: ftgl BuildRequires: doxygen freeglut-devel freetype2-devel gcc-c++ libdrm-devel Version: 2.1.2 -Release: 22 +Release: 41 URL: http://homepages.paradise.net.nz/henryj/code/index.html#FTGL Group: System/Libraries -License: LGPL +License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) Summary: Library for Using Arbitrary Fonts in OpenGL Applications Source: %{name}-%{version}.tar.bz2 Patch: %{name}-%{version}-qualification.patch Patch1: %{name}-shared.patch +Patch2: ftgl-2.1.2-same-variable-used-twice.patch Autoreqprov: on BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -97,6 +98,7 @@ Authors: %setup -n FTGL %patch %patch1 +%patch2 -p1 chmod -x include/* # Valid without doxygen: #tar -z -x -f docs/html.tar.gz -C docs @@ -146,6 +148,8 @@ rm -rf $RPM_BUILD_ROOT /usr/%_lib/pkgconfig/*.pc %changelog -n ftgl +* Mon Jan 22 2007 - ssommer@suse.de +- fixed same variable used twice build error * Wed Sep 13 2006 - sbrabec@suse.cz - Split devel subpackage. * Fri Sep 08 2006 - sbrabec@suse.cz