rpms/graphviz/devel graphviz.spec,1.25,1.26

[Oliver Falk (oliver)]

Author: oliver

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

Modified Files:
	graphviz.spec 
Log Message:

* Wed Mar 01 2006 Oliver Falk <oliver at linux-kernel.at>                - 2.8-3
- Add libtool-ltdl, libtool-ltdl-devel
- Fix fixes



Index: graphviz.spec
===================================================================
RCS file: /cvs/extras/rpms/graphviz/devel/graphviz.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- graphviz.spec	24 Feb 2006 07:14:16 -0000	1.25
+++ graphviz.spec	1 Mar 2006 08:30:07 -0000	1.26
@@ -45,7 +45,7 @@
 Summary:	Graph Visualization Tools
 Name:		graphviz
 Version:	2.8
-Release:	2%{?dist}
+Release:	3%{?dist}
 Group:		Applications/Multimedia
 License:	CPL
 URL:		http://www.graphviz.org/
@@ -59,9 +59,10 @@
 BuildRequires:	zlib-devel libpng-devel libjpeg-devel expat-devel freetype-devel >= 2
 BuildRequires:	/bin/ksh bison m4 flex tk tcl >= 8.3 swig
 BuildRequires:	tcl-devel tk-devel
-%{?fc5:BuildRequires: fontconfig-devel libtool-ltdl-devel}
+BuildRequires:	libtool-ltdl-devel  libtool-ltdl
+%{?fc5:BuildRequires: fontconfig-devel}
 %{?fc5:BuildRequires: libXaw-devel libSM-devel libICE-devel libXpm-devel libXt-devel libXmu-devel libXext-devel libX11-devel}
-%{?fc4:BuildRequires: fontconfig-devel xorg-x11-devel libtool-ltdl-devel} 
+%{?fc4:BuildRequires: fontconfig-devel xorg-x11-devel}
 %{?fc3:BuildRequires: fontconfig-devel xorg-x11-devel} 
 
 %description
@@ -307,7 +308,7 @@
 %setup -q
 
 %build
-%configure
+%configure --disable-static --with-mylibgd
 %__make %{?_smp_mflags}
 
 %install
@@ -318,15 +319,11 @@
     pkgconfigdir=%{_libdir}/pkgconfig \
     install
 find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
-find ${RPM_BUILD_ROOT} -type f -name "*.a" -exec rm -f {} ';'
+#find ${RPM_BUILD_ROOT} -type f -name "*.a" -exec rm -f {} ';'
 chmod -x $RPM_BUILD_ROOT%{_datadir}/%{name}/lefty/*
 cp -a $RPM_BUILD_ROOT%{_datadir}/%{name}/doc __doc
 rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/doc
 
-# There files are crated on x86_64 for what reason? I don't know...
-rm -f %{_includedir}/ltdl.h
-rm -f %{_libdir}/libltdl*
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -339,6 +336,10 @@
 if ! test -x %{_bindir}/dot; then rm -f %{_libdir}/%{name}/config; fi
 
 %changelog
+* Wed Mar 01 2006 Oliver Falk <oliver at linux-kernel.at>		- 2.8-3
+- Add libtool-ltdl, libtool-ltdl-devel
+- Fix fixes
+
 * Fri Feb 24 2006 Oliver Falk <oliver at linux-kernel.at>		- 2.8-2
 - Fix unpackaged files on x86_64