- obsolete

[packages/fltk.git] / fltk.spec

diff --git a/fltk.spec b/fltk.spec
index 183ad2fe31dd2798da5f5c0e37c3684991503ecf..7d0b793fb3a08439d4d664cc88f9b3c6f4fb3b00 100644 (file)
--- a/fltk.spec
+++ b/fltk.spec
@@ -1,30 +1,31 @@
 #
 # Conditional build:
-# _without_gl  - without OpenGL libraries
-# _without_xft - without Xft support
+%bcond_without gl      # without OpenGL libraries
+%bcond_without xft     # without Xft support
 #
 Summary:       Fast Light Tool Kit
 Summary(pl):   FLTK - "lekki" X11 toolkit
 Summary(pt_BR):        Interface gráfica em C++ para X, OpenGL e Windows
 Name:          fltk
 Version:       1.1.3
-Release:       1
+Release:       3
 License:       LGPL with amendments (see COPYING)
 Group:         X11/Libraries
 Source0:       ftp://ftp.easysw.com/pub/%{name}/%{version}/%{name}-%{version}-source.tar.bz2
-# Source0-md5: f32b4acc456d567a6bd554ac03c24055
+# Source0-md5: f32b4acc456d567a6bd554ac03c24055
 Source1:       http://www.fltk.org/doc-1.1/%{name}.ps.gz
 # Source1-md5: eb8f5a4a02d8ca2111ff007daea601b6
 Patch0:                %{name}-link.patch
 Patch1:                %{name}-acfix.patch
+Patch2:                %{name}-fluid-color.patch
 URL:           http://www.fltk.org/
-%{!?_without_gl:BuildRequires: OpenGL-devel}
+%{?with_gl:BuildRequires:      OpenGL-devel}
 BuildRequires: XFree86-devel >= 3.3.6
 BuildRequires: autoconf
 BuildRequires: libstdc++-devel
-%{!?_without_xft:BuildRequires:        xft-devel}
-BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+%{?with_xft:BuildRequires:     xft-devel}
 Obsoletes:     libfltk1.1
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _noautoreqdep   libGL.so.1 libGLU.so.1
 
@@ -55,6 +56,7 @@ Summary(pl):  Narz
 Summary(pt_BR):        Arquivos de inclusão para o FLTK
 Group:         X11/Development/Libraries
 Requires:      %{name} = %{version}
+Requires:      libstdc++-devel
 Obsoletes:     libfltk1.1-devel
 
 %description devel
@@ -68,7 +70,7 @@ Arquivos de inclus
 
 %package static
 Summary:       FLTK static library
-Summary(pl):   Biblioteka FLTK linkowana statycznie
+Summary(pl):   Biblioteka FLTK konsolidowana statycznie
 Summary(pt_BR):        Bibliotecas estáticas para o FLTK
 Group:         X11/Development/Libraries
 Requires:      %{name}-devel = %{version}
@@ -77,7 +79,7 @@ Requires:     %{name}-devel = %{version}
 FLTK static library.
 
 %description static -l pl
-Biblioteka FLTK linkowana statycznie.
+Biblioteka FLTK konsolidowana statycznie.
 
 %description static -l pt_BR
 Bibliotecas estáticas para o FLTK.
@@ -125,6 +127,7 @@ Statyczna biblioteka FLTK GL.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 install %{SOURCE1} .
 
@@ -138,8 +141,8 @@ LDFLAGS=" "
 %configure \
        --enable-shared \
        --with-x \
-       %{?_without_gl:--disable-gl} \
-       %{!?_without_xft:--enable-xft}
+       %{!?with_gl:--disable-gl} \
+       %{?with_xft:--enable-xft}
 
 %{__make} depend
 %{__make}
@@ -148,11 +151,19 @@ LDFLAGS=" "
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_includedir}/FL,%{_libdir},%{_mandir}/man{1,3}}
 
+if [ "%{_lib}" != "lib" ] ; then
+       ln -sf $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_prefix}/lib
+fi
+
 %{__make} install \
        libdir=$RPM_BUILD_ROOT%{_libdir} \
        includedir=$RPM_BUILD_ROOT%{_includedir} \
        bindir=$RPM_BUILD_ROOT%{_bindir}
 
+if [ "%{_lib}" != "lib" ] ; then
+       rm $RPM_BUILD_ROOT%{_prefix}/lib
+fi
+
 install documentation/fltk-config.man $RPM_BUILD_ROOT%{_mandir}/man1/fltk-config.1
 install documentation/fluid.man $RPM_BUILD_ROOT%{_mandir}/man1/fluid.1
 install documentation/fltk.man $RPM_BUILD_ROOT%{_mandir}/man3/fltk.3
@@ -190,7 +201,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(644,root,root) %{_libdir}/libfltk_forms.a
 %attr(644,root,root) %{_libdir}/libfltk_images.a
 
-%if 0%{!?_without_gl:1}
+%if %{with gl}
 %files gl
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libfltk_gl.so.*.*