- updated to 1.0.11 and bunch final cleanups.

Changed files:
    fltk.spec -> 1.12

diff --git a/fltk.spec b/fltk.spec
index 5a0f986b7934ebc5c4554094e05d1968e50bffb4..36973d119c6df0f0e298493437f5e39c0a83a533 100644 (file)
--- a/fltk.spec
+++ b/fltk.spec
@@ -1,7 +1,7 @@
 Summary:       Fast Light Tool Kit 
-Summary(pl):   FLTK
+Summary(pl):   FLTK - "lekki" X11 toolkit 
 Name:          fltk
-Version:       1.0.9
+Version:       1.0.11
 Release:       1
 License:       GPL
 Group:         X11/Libraries
@@ -24,49 +24,51 @@ Microsoft(r) Windows(r) NT 4.0, 95, or 98. It was originally developed
 by Mr. Bill Spitzak and is currently maintained by a small group of
 developers across the world with a central repository in the US.
 
-%description -l pl
 
-
-%package static
-Summary:       FLTK static library.
-Summary(pl):   Biblioteka FLTK linkowana statycznie
+%package devel
+Summary:       FLTK development files
+Summary(pl):   Narzêdzia programistyczne dla FLTK
 Group:         X11/Development/Libraries
 Group(de):     X11/Entwicklung/Libraries
 Group(pl):     X11/Programowanie/Biblioteki
+Requires:      %{name} = %{version}
 
-%description static
-
-%description -l pl static
+%description devel
+FLTK development files.
 
+%description -l pl devel
+Narzêdzia programistyczne dla FLTK.
 
-%package devel
-Summary:       FLTK development.
-Summary(pl):   Narzêdzia programistyczne dla FLTK.
+%package static
+Summary:       FLTK static library.
+Summary(pl):   Biblioteka FLTK linkowana statycznie
 Group:         X11/Development/Libraries
 Group(de):     X11/Entwicklung/Libraries
 Group(pl):     X11/Programowanie/Biblioteki
+Requires:      %{name}-devel = %{version}
 
-%description devel
+%description static
+FLTK static library.
 
-%description -l pl devel
+%description -l pl static
+Biblioteka FLTK linkowana statycznie.
 
 %prep
 %setup -q
 
+install %{SOURCE1} %{SOURCE2} .
+
 %build
 %configure \
        --libdir=$RPM_BUILD_ROOT%{_libdir} \
        --includedir=$RPM_BUILD_ROOT%{_includedir} \
        --bindir=$RPM_BUILD_ROOT%{_bindir} \
-           --enable-shared \
-           --with-x
+       --enable-shared \
+       --with-x
 
 %{__make} depend
 %{__make}
 
-install %{SOURCE1} $RPM_BUILD_DIR/%name-%version/
-install %{SOURCE2} $RPM_BUILD_DIR/%name-%version/
-
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_includedir}/FL,%{_libdir}}
@@ -84,6 +86,7 @@ done
 rm $RPM_BUILD_ROOT%{_libdir}/*.so
 mv $RPM_BUILD_ROOT%{_libdir}/libfltk.so.1 \
        $RPM_BUILD_ROOT%{_libdir}/libfltk.so.%{version}
+ln -sf libfltk.so.%{version} RPM_BUILD_ROOT%{_libdir}/libfltk.so
 
 %post   -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -93,14 +96,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%attr(644,root,root) %{_libdir}/*.so.*.*.*
-
-%files static
-%defattr(644,root,root,755)
-%attr(644,root,root) %{_libdir}/*.a
+%attr(755,root,root) %{_libdir}/*.so.*.*.*
 
 %files devel
 %defattr(644,root,root,755)
 %doc documentation/* fltk.pdf fltk.ps.gz
+%attr(75,root,root) %{_libdir}/libfltk.so
 %attr(755,root,root) %{_bindir}/fluid
-%attr(644,root,root) %{_includedir}/FL/*
+%{_includedir}/FL
+
+%files static
+%defattr(644,root,root,755)
+%attr(644,root,root) %{_libdir}/*.a