- added link patch, fixed libtool issues, separated -devel

Changed files:
    aqsis.spec -> 1.2

diff --git a/aqsis.spec b/aqsis.spec
index ec3da4a6d49f24375bfe46708f73128495bbb2ad..8d0b610a2511808c1b83d61f7a5f45ba20a914cf 100644 (file)
--- a/aqsis.spec
+++ b/aqsis.spec
@@ -1,35 +1,67 @@
-# TODO:
-#      - fix relinking of libaqsis.so.0.0 !!!
-#      - break into subpackages
-
 Summary:       Aqsis Rendering System
 Summary(pl):   System renderuj±cy Aqsis
 Name:          aqsis
 Version:       0.9.0
 Release:       0.1
 License:       GPL v2
-Group:         Applications
+Group:         Applications/Graphics
 Source0:       http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 # Source0-md5: c4b3bb773f2016d24ec5659b43fa50cf
+Patch0:                %{name}-link.patch
 URL:           http://aqsis.sourceforge.net/
+BuildRequires: OpenGL-devel
+BuildRequires: autoconf >= 2.50
+BuildRequires: automake
+BuildRequires: glut-devel
+BuildRequires: libjpeg-devel
+BuildRequires: libstdc++-devel
+BuildRequires: libtiff-devel
+BuildRequires: libtool >= 2:1.5
 BuildRequires: log4cpp-devel
+BuildRequires: zlib-devel
 Provides:      renderman-engine
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-The Aqsis Rendering System consists of a set of libraries and applications 
-for creating high-quality computer imagery using the Pixar RenderMan Interface.
+The Aqsis Rendering System consists of a set of libraries and
+applications for creating high-quality computer imagery using the
+Pixar RenderMan Interface.
 
 %description -l pl
-System renderuj±cy Aqsis sk³ada siê z zestawu bibliotek i programów do tworzenia
-wysokiej jako¶ci obrazów komputerowych u¿ywaj±c interfejsu RenderMan firmy Pixar.
+System renderuj±cy Aqsis sk³ada siê z zestawu bibliotek i programów do
+tworzenia wysokiej jako¶ci obrazów komputerowych z u¿yciem interfejsu
+RenderMan firmy Pixar.
+
+%package devel
+Summary:       Header files for Aqsis Rendering System
+Summary(pl):   Pliki nag³ówkowe systemu renderuj±cego Aqsis
+Group:         Development/Libraries
+Requires:      %{name} = %{version}-%{release}
+Requires:      libstdc++-devel
+Requires:      libtiff-devel
+Requires:      log4cpp-devel
+Requires:      zlib-devel
+
+%description devel
+Header files for Aqsis Rendering System.
+
+%description devel -l pl
+Pliki nag³ówkowe systemu renderuj±cego Aqsis.
 
 %prep
 %setup -q
+%patch0 -p1
+
+# kill libtool.m4 - extract HAVE_LIBTIFF, HAVE_LIBZLIB, MDL_HAVE_OPENGL
+head -n 48 acinclude.m4 > acinc.tmp
+tail -n +3787 acinclude.m4 >> acinc.tmp
+mv -f acinc.tmp acinclude.m4
 
 %build
+%{__libtoolize}
 %{__aclocal}
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 %configure \
        --disable-log4cpptest
@@ -41,15 +73,26 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lib*.la
+
 %clean
-#rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
+
+%post  -p /sbin/ldconfig
+%postun        -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README
 %attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_libdir}/lib*.so.*.*.*
+%dir %{_libdir}/%{name}
+%{_libdir}/%{name}/lib*.so*
 %{_datadir}/%{name}
+%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/ddmsock.ini
+
+%files devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/lib*.so
+%{_libdir}/lib*.la
 %{_includedir}/%{name}
-%{_libdir}/lib*
-%{_libdir}/%{name}
-%{_sysconfdir}/*