- Add libtool-ltdl, libtool-ltdl-devel
- Fix fixes
This commit is contained in:
parent
8a6e06730c
commit
78b16fa1fe
@ -45,7 +45,7 @@
|
|||||||
Summary: Graph Visualization Tools
|
Summary: Graph Visualization Tools
|
||||||
Name: graphviz
|
Name: graphviz
|
||||||
Version: 2.8
|
Version: 2.8
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
Group: Applications/Multimedia
|
Group: Applications/Multimedia
|
||||||
License: CPL
|
License: CPL
|
||||||
URL: http://www.graphviz.org/
|
URL: http://www.graphviz.org/
|
||||||
@ -59,9 +59,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
|||||||
BuildRequires: zlib-devel libpng-devel libjpeg-devel expat-devel freetype-devel >= 2
|
BuildRequires: zlib-devel libpng-devel libjpeg-devel expat-devel freetype-devel >= 2
|
||||||
BuildRequires: /bin/ksh bison m4 flex tk tcl >= 8.3 swig
|
BuildRequires: /bin/ksh bison m4 flex tk tcl >= 8.3 swig
|
||||||
BuildRequires: tcl-devel tk-devel
|
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}
|
%{?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}
|
%{?fc3:BuildRequires: fontconfig-devel xorg-x11-devel}
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -307,7 +308,7 @@ Provides some additional PDF and HTML documentation for %{name}.
|
|||||||
%setup -q
|
%setup -q
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure
|
%configure --disable-static --with-mylibgd
|
||||||
%__make %{?_smp_mflags}
|
%__make %{?_smp_mflags}
|
||||||
|
|
||||||
%install
|
%install
|
||||||
@ -318,15 +319,11 @@ rm -rf $RPM_BUILD_ROOT __doc
|
|||||||
pkgconfigdir=%{_libdir}/pkgconfig \
|
pkgconfigdir=%{_libdir}/pkgconfig \
|
||||||
install
|
install
|
||||||
find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
|
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/*
|
chmod -x $RPM_BUILD_ROOT%{_datadir}/%{name}/lefty/*
|
||||||
cp -a $RPM_BUILD_ROOT%{_datadir}/%{name}/doc __doc
|
cp -a $RPM_BUILD_ROOT%{_datadir}/%{name}/doc __doc
|
||||||
rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/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
|
%clean
|
||||||
rm -rf $RPM_BUILD_ROOT
|
rm -rf $RPM_BUILD_ROOT
|
||||||
|
|
||||||
@ -339,6 +336,10 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
if ! test -x %{_bindir}/dot; then rm -f %{_libdir}/%{name}/config; fi
|
if ! test -x %{_bindir}/dot; then rm -f %{_libdir}/%{name}/config; fi
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Mar 01 2006 Oliver Falk <oliver@linux-kernel.at> - 2.8-3
|
||||||
|
- Add libtool-ltdl, libtool-ltdl-devel
|
||||||
|
- Fix fixes
|
||||||
|
|
||||||
* Fri Feb 24 2006 Oliver Falk <oliver@linux-kernel.at> - 2.8-2
|
* Fri Feb 24 2006 Oliver Falk <oliver@linux-kernel.at> - 2.8-2
|
||||||
- Fix unpackaged files on x86_64
|
- Fix unpackaged files on x86_64
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user