rpms/MagicPoint/devel MagicPoint.spec,1.10,1.11

[Adam Jackson]

Author: ajax

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

Modified Files:
	MagicPoint.spec 
Log Message:
* Wed May 13 2009 Adam Jackson <ajax at redhat.com> 1.11b-9
- Use freetype, not freetype1, which is old and broken.



Index: MagicPoint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/MagicPoint/devel/MagicPoint.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- MagicPoint.spec	23 Feb 2009 22:00:09 -0000	1.10
+++ MagicPoint.spec	13 May 2009 20:15:56 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           MagicPoint
 Version:        1.11b
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        X based presentation software
 Group:          Applications/Productivity
 License:        BSD
@@ -16,7 +16,7 @@ Patch10:        magicpoint-1.10a-fix-usl
 Patch11:        magicpoint-1.10a-fix-gcc34.patch
 Patch12:        magicpoint-1.11b-missing-protos.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  freetype1-devel libungif-devel libpng-devel libmng-devel imake
+BuildRequires:  freetype-devel libungif-devel libpng-devel libmng-devel imake
 BuildRequires:  imlib-devel libXmu-devel libXft-devel bison flex perl sharutils
 Requires:       sharutils
 Obsoletes:      mgp < %{version}-%{release}, magicpoint < %{version}-%{release}
@@ -41,11 +41,10 @@ create presentation files quickly with y
 %patch12 -p1
 # fix hopelessly broken way configure searches for libttf
 sed -i 's:$dir/lib:%{_libdir}:g' configure
-sed -i 's:$dir/include/freetype:/usr/include/freetype1/freetype:g' configure
 
 
 %build
-export CFLAGS="$RPM_OPT_FLAGS -I/usr/include/freetype1/freetype"
+export CFLAGS="$RPM_OPT_FLAGS"
 # the --x-*= because this configure's X detection is broken beyond repair
 %configure --enable-locale --enable-freetype --enable-freetype-charset16 \
   --enable-xft2 --disable-vflib --enable-gif --enable-imlib \
@@ -77,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed May 13 2009 Adam Jackson <ajax at redhat.com> 1.11b-9
+- Use freetype, not freetype1, which is old and broken.
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.11b-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild