- fixed package,

- changed library version from 1 to 1.0.7.

Changed files:
    fltk.spec -> 1.5

diff --git a/fltk.spec b/fltk.spec
index 6af97e4d79b4336f68f0d0e0d24177f6479cd7e6..186d18d259b06aba276296a7fe254faca8aaf817 100644 (file)
--- a/fltk.spec
+++ b/fltk.spec
@@ -4,49 +4,40 @@ Name:         fltk
 Version:       1.0.7
 Release:       1
 License:       GPL
-Group:         WindowManagers
-######         Unknown group!
-Group(pl):     Menad¿erOkien
+Group:         X11/Window Manager
+Group(pl):     X11/Zarz±dcy Okien
 Source0:       ftp://ftp.easysw.com/pub/%{name}/%{version}/%name-%version-source.tar.bz2
 Source1:       http://www.fltk.org/doc/%name.ps.gz
 Source2:       http://www.fltk.org/doc/%name.pdf
 URL:           http://www.fltk.org/
-BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+#Patch0:               
+BuildRequires: XFree86-devel >= 3.3.6
+Buildroot:     /tmp/%{name}-%{version}-root
 
 %define        _prefix /usr/X11R6
 
 %description
 
-%description -l pl
-
-%package       doc
-Summary:       FLTK Documentation
-Summary(pl):   FLTK Dokumentacja
-Group:         Documentation
-######         Unknown group!
-Group(pl):     Dokumentacja
 
-%description doc
+%description -l pl
 
-%description -l pl doc
 
 %package static
 Summary:       FLTK static library.
 Summary(pl):   Biblioteka FLTK linkowana statycznie
-Group:         Libraries/Development
-######         Unknown group!
-Group(pl):     Biblioteki/Programowanie
+Group:         X11/Development/Libraries
+Group(pl):     X11/Programowanie/Biblioteki
 
 %description static
 
 %description -l pl static
 
+
 %package devel
 Summary:       FLTK development.
 Summary(pl):   Narzêdzia programistyczne dla FLTK.
-Group:         Libraries/Development
-######         Unknown group!
-Group(pl):     Biblioteki/Programowanie
+Group:         X11/Development/Libraries
+Group(pl):     X11/Programowanie/Biblioteki
 
 %description devel
 
@@ -56,30 +47,50 @@ Group(pl):  Biblioteki/Programowanie
 %setup -q
 
 %build
-./configure --prefix=%{_prefix} \
+CXXFLAGS="-O2 -mpentium -shared"
+export CXXFLAGS
+%configure \
            --enable-shared \
            --with-x
+
 make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" depend
 make RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
 
 install %{SOURCE1} $RPM_BUILD_DIR/%name-%version/
 install %{SOURCE2} $RPM_BUILD_DIR/%name-%version/
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
-make prefix=$RPM_BUILD_ROOT%{_prefix} install
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_includedir}/FL,%{_libdir}}
+make libdir=$RPM_BUILD_ROOT%{_libdir} \
+     includedir=$RPM_BUILD_ROOT%{_includedir} \
+     bindir=$RPM_BUILD_ROOT%{_bindir} \
+     install
+
+cd $RPM_BUILD_ROOT%{_includedir}
+    rm -f FL/*.h
+    for file in FL/*.H; do \
+    newfile="`basename $file H`h";\
+    mv $file FL/$newfile
+    done 
+
+rm $RPM_BUILD_ROOT%{_libdir}/*.so
+mv $RPM_BUILD_ROOT%{_libdir}/libfltk.so.1 \
+    $RPM_BUILD_ROOT%{_libdir}/libfltk.so.%{version}
+
+%post devel
+/sbin/ldconfig
+
+%postun devel
+/sbin/ldconfig
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc
-%attr(644,root,root) %{_libdir}/*.so*
-
-%files doc
-%defattr(644,root,root,755)
-%doc documentation/* fltk.pdf fltk.ps.gz
+%attr(644,root,root) %{_libdir}/*.so.*.*.*
 
 %files static
 %defattr(644,root,root,755)
@@ -87,4 +98,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
+%doc documentation/* fltk.pdf fltk.ps.gz
+%attr(755,root,root) %{_bindir}/fluid
 %attr(644,root,root) %{_includedir}/FL/*