OBS User unknown 2007-01-23 00:16:00 +00:00 committed by Git OBS Bridge
parent ade06b0855
commit 7ae841c24d
3 changed files with 24 additions and 3 deletions

View File

@ -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;
}
}

View File

@ -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 Wed Sep 13 16:00:09 CEST 2006 - sbrabec@suse.cz

View File

@ -1,7 +1,7 @@
# #
# spec file for package ftgl (Version 2.1.2) # 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 # This file and all modifications and additions to the pristine
# package are under the same license as the package itself. # package are under the same license as the package itself.
# #
@ -13,14 +13,15 @@
Name: ftgl Name: ftgl
BuildRequires: doxygen freeglut-devel freetype2-devel gcc-c++ libdrm-devel BuildRequires: doxygen freeglut-devel freetype2-devel gcc-c++ libdrm-devel
Version: 2.1.2 Version: 2.1.2
Release: 22 Release: 41
URL: http://homepages.paradise.net.nz/henryj/code/index.html#FTGL URL: http://homepages.paradise.net.nz/henryj/code/index.html#FTGL
Group: System/Libraries 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 Summary: Library for Using Arbitrary Fonts in OpenGL Applications
Source: %{name}-%{version}.tar.bz2 Source: %{name}-%{version}.tar.bz2
Patch: %{name}-%{version}-qualification.patch Patch: %{name}-%{version}-qualification.patch
Patch1: %{name}-shared.patch Patch1: %{name}-shared.patch
Patch2: ftgl-2.1.2-same-variable-used-twice.patch
Autoreqprov: on Autoreqprov: on
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -97,6 +98,7 @@ Authors:
%setup -n FTGL %setup -n FTGL
%patch %patch
%patch1 %patch1
%patch2 -p1
chmod -x include/* chmod -x include/*
# Valid without doxygen: # Valid without doxygen:
#tar -z -x -f docs/html.tar.gz -C docs #tar -z -x -f docs/html.tar.gz -C docs
@ -146,6 +148,8 @@ rm -rf $RPM_BUILD_ROOT
/usr/%_lib/pkgconfig/*.pc /usr/%_lib/pkgconfig/*.pc
%changelog -n ftgl %changelog -n ftgl
* Mon Jan 22 2007 - ssommer@suse.de
- fixed same variable used twice build error
* Wed Sep 13 2006 - sbrabec@suse.cz * Wed Sep 13 2006 - sbrabec@suse.cz
- Split devel subpackage. - Split devel subpackage.
* Fri Sep 08 2006 - sbrabec@suse.cz * Fri Sep 08 2006 - sbrabec@suse.cz