rpms/ftgl/devel ftgl-2.1.3-rc5-ttf_font.patch, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.3, 1.4 ftgl.spec, 1.7, 1.8 sources, 1.3, 1.4 ftgl-2.1.2-Glyph-g++_41.patch, 1.1, NONE ftgl-2.1.2-destdir.patch, 1.1, NONE ftgl-2.1.2-pc_req.patch, 1.1, NONE ftgl-2.1.2-rpath_FTGLDemo.patch, 1.1, NONE ftgl-2.1.2-ttf_font.patch, 1.2, NONE

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/pkgs/rpms/ftgl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1670/devel

Modified Files:
	.cvsignore ftgl.spec sources 
Added Files:
	ftgl-2.1.3-rc5-ttf_font.patch import.log 
Removed Files:
	ftgl-2.1.2-Glyph-g++_41.patch ftgl-2.1.2-destdir.patch 
	ftgl-2.1.2-pc_req.patch ftgl-2.1.2-rpath_FTGLDemo.patch 
	ftgl-2.1.2-ttf_font.patch 
Log Message:
Update to 2.1.3-rc5


ftgl-2.1.3-rc5-ttf_font.patch:

--- NEW FILE ftgl-2.1.3-rc5-ttf_font.patch ---
diff -up ftgl-2.1.3~rc5/demo/FTGLDemo.cpp.ttf_font ftgl-2.1.3~rc5/demo/FTGLDemo.cpp
--- ftgl-2.1.3~rc5/demo/FTGLDemo.cpp.ttf_font	2008-06-08 17:49:10.000000000 +0200
+++ ftgl-2.1.3~rc5/demo/FTGLDemo.cpp	2009-05-21 02:18:42.000000000 +0200
@@ -48,7 +48,7 @@
 #       define FONT_FILE "C:\\WINNT\\Fonts\\arial.ttf"
 #   else
         // Put your font file here if configure did not find it.
-#       define FONT_FILE 0
+#       define FONT_FILE "/usr/share/fonts/dejavu/DejaVuSans.ttf"
 #   endif
 #endif
 


--- NEW FILE import.log ---
ftgl-2_1_3-0_1_rc5_fc10:HEAD:ftgl-2.1.3-0.1.rc5.fc10.src.rpm:1242981722


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ftgl/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	15 Dec 2007 12:36:22 -0000	1.3
+++ .cvsignore	22 May 2009 08:42:51 -0000	1.4
@@ -1 +1 @@
-ftgl-2.1.2.tar.bz2
+ftgl-2.1.3-rc5.tar.bz2


Index: ftgl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ftgl/devel/ftgl.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- ftgl.spec	27 Feb 2009 17:25:43 -0000	1.7
+++ ftgl.spec	22 May 2009 08:42:52 -0000	1.8
@@ -1,17 +1,13 @@
 Name:           ftgl
-Version:        2.1.2
-Release:        10%{?dist}
+Version:        2.1.3
+Release:        0.1.rc5%{?dist}
 Summary:        OpenGL frontend to Freetype 2
 
 Group:          System Environment/Libraries
 License:        LGPLv2
 URL:            http://ftgl.wiki.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/ftgl/ftgl-%{version}.tar.bz2
-Patch0:         ftgl-2.1.2-destdir.patch
-Patch1:         ftgl-2.1.2-Glyph-g++_41.patch
-Patch2:         ftgl-2.1.2-pc_req.patch
-Patch3:         ftgl-2.1.2-ttf_font.patch
-Patch4:         ftgl-2.1.2-rpath_FTGLDemo.patch
+Source0:        http://downloads.sourceforge.net/ftgl/ftgl-%{version}-rc5.tar.bz2
+Patch0:         ftgl-2.1.3-rc5-ttf_font.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  doxygen
@@ -20,6 +16,9 @@ BuildRequires:  freeglut-devel
 BuildRequires:  freetype-devel
 BuildRequires:  libXi-devel
 BuildRequires:  libXmu-devel
+BuildRequires:  cppunit-devel
+
+Obsoletes: ftgl-utils < %{version}
 
 
 %description
@@ -38,29 +37,11 @@ Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       pkgconfig
 Requires:       freetype-devel
-Requires:       libGLU-devel
-Requires:       libGL-devel
 
 %description    devel
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
-%package        utils
-Summary:        Test binary for %{name}
-Group:          Applications/System
-Requires:       %{name} = %{version}-%{release}
-Requires:       dejavu-sans-fonts
-
-%description    utils
-FTGL is a free open source library to enable developers to use arbitrary
-fonts in their OpenGL (www.opengl.org)  applications.
-Unlike other OpenGL font libraries FTGL uses standard font file formats
-so doesn't need a preprocessing step to convert the high quality font data
-into a lesser quality, proprietary format.
-FTGL uses the Freetype (www.freetype.org) font library to open and 'decode'
-the fonts. It then takes that output and stores it in a format most 
-efficient for OpenGL rendering.
-
 %package docs
 Summary:        Documentation for %{name}
 Group:          Documentation
@@ -70,25 +51,12 @@ This package contains documentation file
 
 
 %prep
-%setup -q -n FTGL
+%setup -q -n ftgl-%{version}~rc5
 %patch0 -p1 -b .destdir
-%patch1 -p1 -b .Glyph
-%patch2 -p1 -b .req
-%patch3 -p1 -b .ttf_font
-%patch4 -p1 -b .rpath
-
-chmod 0644 README.txt
-chmod 0644 include/*
-chmod 0644 src/*
 
-install -pm 0644 demo/README.txt README-demo.txt
-
-# Fix version of the package
-sed -i.fixed_version -e 's|2.0.5|%{version}|g' unix/configure.ac unix/configure
 
 
 %build
-cd unix
 %configure \
   --enable-shared \
   --disable-static \
@@ -102,18 +70,16 @@ make all %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT unix/__doc
-cd unix
+rm -rf $RPM_BUILD_ROOT __doc
 make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
-chmod 0755 $RPM_BUILD_ROOT%{_libdir}/libftgl.so.0.*
-
 # Doc fixes
 mkdir -p __doc/html
 install -pm 0644 $RPM_BUILD_ROOT%{_datadir}/doc/ftgl/html/* __doc/html
 rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -124,7 +90,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING.txt HISTORY.txt license.txt README.txt
+%doc AUTHORS BUGS ChangeLog COPYING NEWS README TODO
 %{_libdir}/*.so.*
 
 %files devel
@@ -133,17 +99,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*
 
-%files utils
-%defattr(-,root,root,-)
-%doc README-demo.txt
-%{_bindir}/FTGLDemo
-
 %files docs
 %defattr(-,root,root,-)
-%doc unix/__doc/*
+%doc __doc/*
 
 
 %changelog
+* Thu May 21 2009 kwizart < kwizart at gmail.com > - 2.1.3-0.1.rc5
+- Update to 2.1.3-rc5
+- Obsoletes -utils sub-package
+
 * Fri Feb 27 2009 kwizart < kwizart at gmail.com > - 2.1.2-10
 - Switch from freefont to dejavu-sans-fonts - #480455
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ftgl/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	15 Dec 2007 12:36:22 -0000	1.3
+++ sources	22 May 2009 08:42:52 -0000	1.4
@@ -1 +1 @@
-e0736841ce273eddbdb64617621b75f4  ftgl-2.1.2.tar.bz2
+c7879018cde844059495b3029b0b6503  ftgl-2.1.3-rc5.tar.bz2


--- ftgl-2.1.2-Glyph-g++_41.patch DELETED ---


--- ftgl-2.1.2-destdir.patch DELETED ---


--- ftgl-2.1.2-pc_req.patch DELETED ---


--- ftgl-2.1.2-rpath_FTGLDemo.patch DELETED ---


--- ftgl-2.1.2-ttf_font.patch DELETED ---