rpms/MagicPoint/devel MagicPoint.spec,1.2,1.3

[Colin Charles (byte)]

Author: byte

Update of /cvs/extras/rpms/MagicPoint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2344

Modified Files:
	MagicPoint.spec 
Log Message:
* Fri Aug 5 2005 Colin Charles <colin at fedoraproject.org> - 1.11b-3
- Re-enable debuginfo builds
- Ralf Corsepius watchful eyes fixes - cleaning up the spec




Index: MagicPoint.spec
===================================================================
RCS file: /cvs/extras/rpms/MagicPoint/devel/MagicPoint.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MagicPoint.spec	4 Aug 2005 12:15:39 -0000	1.2
+++ MagicPoint.spec	13 Aug 2005 07:09:02 -0000	1.3
@@ -5,7 +5,7 @@
 
 Name:		MagicPoint
 Version:	1.11b
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	X based presentation software
 
 Group:		Applications/Productivity
@@ -21,9 +21,7 @@
 Patch11:	magicpoint-1.10a-fix-gcc34.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildPrereq: freetype-devel
-BuildRequires: fontconfig-devel xorg-x11-devel libungif-devel libpng-devel libmng-devel imlib-devel autoconf automake libtool byacc flex
-#Requires: VFlib2 >= 2.25.6-8 VFlib2-conf-ja >= 2.25.6-8
+BuildRequires: freetype-devel fontconfig-devel xorg-x11-devel libungif-devel libpng-devel libmng-devel imlib-devel autoconf automake libtool byacc flex
 Requires: imlib
 Obsoletes: mgp,magicpoint
 Provides: mgp,magicpoint
@@ -43,7 +41,7 @@
 %patch11 -p1 -b .gcc34
 
 %build
-CFLAGS=-I/usr/include/freetype1/freetype
+CPPFLAGS=-I/usr/include/freetype1/freetype
 autoconf
 cp /usr/share/libtool/config.{sub,guess} .
 %configure --prefix=/usr/X11R6 --enable-gif --disable-vflib --enable-imlib
@@ -52,12 +50,11 @@
 rm -rf $RPM_BUILD_DIR/magicpoint-%{version}/sample/.cvsignore
 
 %install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 make install install.man DESTDIR=$RPM_BUILD_ROOT
-strip `file $RPM_BUILD_ROOT/%{x11bindir}/* | grep ELF | cut -d : -f 1`
 
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(755,root,root,755)
@@ -68,6 +65,10 @@
 %{x11mandir}/*/*
 
 %changelog
+* Fri Aug 5 2005 Colin Charles <colin at fedoraproject.org> - 1.11b-3
+- Re-enable debuginfo builds
+- Ralf Corsepius watchful eyes fixes - cleaning up the spec
+
 * Thu Aug 4 2005 Colin Charles <colin at fedoraproject.org> - 1.11b-2
 - Removed Patch12 to fix undefined operation
 - Bump spec to somewhat match work from Rui Miguel Silva Seabra <rms at 1407.org>