rpms/MagicPoint/devel MagicPoint.spec,1.5,1.6
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Thu Jan 11 14:56:31 UTC 2007
Author: jwrdegoede
Update of /cvs/extras/rpms/MagicPoint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10720
Modified Files:
MagicPoint.spec
Log Message:
* Sat Oct 21 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.11b-4
- Unorphan
- Take some patches from Debian
- Actually make ./configure detect and use freetype1, it was testing for it
but the test failed
- Package mgp2html and mgp2latex from the contrib dir
Index: MagicPoint.spec
===================================================================
RCS file: /cvs/extras/rpms/MagicPoint/devel/MagicPoint.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MagicPoint.spec 21 Oct 2006 14:39:38 -0000 1.5
+++ MagicPoint.spec 11 Jan 2007 14:56:01 -0000 1.6
@@ -16,7 +16,7 @@
Patch11: magicpoint-1.10a-fix-gcc34.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: freetype1-devel libungif-devel libpng-devel libmng-devel imake
-BuildRequires: imlib-devel libXt-devel libXft-devel bison flex perl sharutils
+BuildRequires: imlib-devel libXmu-devel libXft-devel bison flex perl sharutils
Requires: sharutils
Obsoletes: mgp < %{version}-%{release}, magicpoint < %{version}-%{release}
Provides: mgp = %{version}-%{release}, magicpoint = %{version}-%{release}
@@ -44,8 +44,10 @@
%build
export CFLAGS="$RPM_OPT_FLAGS -I/usr/include/freetype1/freetype"
+# 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
+ --enable-xft2 --disable-vflib --enable-gif --enable-imlib \
+ --x-includes=%{_includedir} --x-libraries=%{_libdir}
xmkmf -a
# LIBDIR is used by the makefile to determine where to install data files
make CDEBUGFLAGS="$RPM_OPT_FLAGS" LIBDIR=%{_datadir}
More information about the scm-commits
mailing list