- Fixed build

- Fixed paths setting
- TODO update
- Cosmetics
- Still NFY

Changed files:
    aqsis.spec -> 1.16

diff --git a/aqsis.spec b/aqsis.spec
index 5a6d39e5422f6fc37d0190f0aa00d778462f937a..92b7acb702fcd779d1851acc00e691b5aa12fc70 100644 (file)
--- a/aqsis.spec
+++ b/aqsis.spec
@@ -1,19 +1,13 @@
 # TODO:
 # TODO:

-# - Check to see if splitting plugins into several packages makes any sense
-#   (probably not).

 # - Check that everything works as expected.
 # - Remove duplications in %files section.
 # - Check that everything works as expected.
 # - Remove duplications in %files section.

-# - Fix aqsis-scons-paths.patch so modyfing it after sysconfdir change will
-#   not be needed.
-# - Check why the second stage of compilation ignores CXX and CXXFLAGS and
-#   fix it of course :)

 # - Proper configuration files handling by SPEC.
 # - Fix paths in configuration file.
 Summary:       Aqsis Rendering System
 Summary(pl.UTF-8):     System Renderujący Aqsis
 Name:          aqsis
 Version:       1.2.0
 # - Proper configuration files handling by SPEC.
 # - Fix paths in configuration file.
 Summary:       Aqsis Rendering System
 Summary(pl.UTF-8):     System Renderujący Aqsis
 Name:          aqsis
 Version:       1.2.0

-Release:       0.1
+Release:       0.2

 License:       GPL v2 / LGPL v2.1
 Group:         Applications/Graphics
 Source0:       http://dl.sourceforge.net/aqsis/%{name}-%{version}.tar.gz
 License:       GPL v2 / LGPL v2.1
 Group:         Applications/Graphics
 Source0:       http://dl.sourceforge.net/aqsis/%{name}-%{version}.tar.gz


@@ -42,9 +36,9 @@ applications for creating high-quality computer imagery using the
 Pixar RenderMan Interface.
 
 %description -l pl.UTF-8
 Pixar RenderMan Interface.
 
 %description -l pl.UTF-8

-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.
+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
 
 %package devel
 Summary:       Header files for Aqsis Rendering System


@@ -60,31 +54,35 @@ Requires:   zlib-devel
 Header files for Aqsis Rendering System.
 
 %description devel -l pl.UTF-8
 Header files for Aqsis Rendering System.
 
 %description devel -l pl.UTF-8

-Pliki nagłówkowe systemu renderującego Aqsis.
+Pliki nagłówkowe Systemu Renderującego Aqsis.

 
 %prep
 %setup -q
 %patch0 -p1
 
 %build
 
 %prep
 %setup -q
 %patch0 -p1
 
 %build

+# We cannot build the targets here, because 'scons install' fires the entire
+# compilation from the start.
+
+%install
+rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT{/etc/%{name},%{name},%{_bindir},%{_libdir},%{_datadir}/%{name}}
+
+# @LIBDIR@, @SHAREDIR@ and @CONFDIR@ comes from the aqsis-scons-paths patch
+sed -e 's:@LIBDIR@:%{_libdir}:g' -i SConstruct
+sed -e 's:@SHAREDIR@:%{_datadir}/%{name}:g' \
+    -e 's:@CONFDIR@:/etc/%{name}:g' \
+    -i platform/default/SConscript
+

 export CXX='%{__cxx}'
 export CXXFLAGS='%{rpmcflags}'
 export CC='%{__cc}'
 export CFLAGS='%{rpmcflags}'
 export CXX='%{__cxx}'
 export CXXFLAGS='%{rpmcflags}'
 export CC='%{__cc}'
 export CFLAGS='%{rpmcflags}'

-# WARNING! If you'll change the sysconfdir argument below, remember to
-# make apriopriate change in aqsis-scons-paths.patch!

 %scons \
        install_prefix=$RPM_BUILD_ROOT%{_prefix} \
 %scons \
        install_prefix=$RPM_BUILD_ROOT%{_prefix} \

-       sysconfdir=$RPM_BUILD_ROOT/etc/%{name}
-
-%install
-rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/etc/%{name},%{name},%{_bindir},%{_libdir},%{_datadir}/%{name}}
-
-%scons install_prefix=$RPM_BUILD_ROOT%{_prefix} \
+       sysconfdir=$RPM_BUILD_ROOT/etc/%{name} \

        install
 #rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lib*.la
        install
 #rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lib*.la

-#mv $RPM_BUILD_ROOT%{_usr}/etc $RPM_BUILD_ROOT

 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT