rpms/aqsis/devel aqsis_config.h.in.cmake, NONE, 1.1 import.log, NONE, 1.1 intsize_detect_fix.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 aqsis.spec, 1.5, 1.6 sources, 1.2, 1.3 aqsis-1.2.0-gcc43.patch, 1.1, NONE

Tue Oct 7 23:35:44 UTC 2008

Author: kwizart

Update of /cvs/pkgs/rpms/aqsis/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27482/devel

Modified Files:
	.cvsignore aqsis.spec sources 
Added Files:
	aqsis_config.h.in.cmake import.log intsize_detect_fix.patch 
Removed Files:
	aqsis-1.2.0-gcc43.patch 
Log Message:
- backport patch for intsize problem
- Update to 1.4.1

--- NEW FILE aqsis_config.h.in.cmake ---
// Aqsis
// Copyright (C) 1997 - 2007, Paul C. Gregory
//
// Contact: pgregory at aqsis.org
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public
// License as published by the Free Software Foundation; either
// version 2 of the License, or (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
// General Public License for more details.
//
// You should have received a copy of the GNU General Public
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

#ifndef AQSIS_CONFIG_H_INCLUDED
#define AQSIS_CONFIG_H_INCLUDED

#cmakedefine AQSIS_HAVE_STDINT_H

#endif // AQSIS_CONFIG_H_INCLUDED



--- NEW FILE import.log ---
aqsis-1_4_1-2_fc8_kwizart:HEAD:aqsis-1.4.1-2.fc8.kwizart.src.rpm:1223422459

intsize_detect_fix.patch:

--- NEW FILE intsize_detect_fix.patch ---
Index: aqsistypes/aqsis_types.h
===================================================================
--- aqsistypes/aqsis_types.h	(revision 2507)
+++ aqsistypes/aqsis_types.h	(working copy)
@@ -19,41 +19,97 @@
 
 
 /** \file
-		\brief Declares typedefs for the basic types.
-		\author Paul C. Gregory (pgregory at aqsis.org)
-*/
+ * \brief Declares typedefs for the basic types.
+ * \author Paul C. Gregory (pgregory at aqsis.org)
+ * \author Chris Foster (chris42f (at) gmail (d0t) com)
+ *
+ * ===================================================================
+ * C-compatible header. C++ constructs must be preprocessor-protected.
+ * ===================================================================
+ */
 
 
-#ifndef	AQSIS_TYPES_INCLUDED
-#define	AQSIS_TYPES_INCLUDED
+#ifndef AQSIS_TYPES_INCLUDED
+#define AQSIS_TYPES_INCLUDED
 
-#include <boost/cstdint.hpp>
+#include "aqsis_config.h"
 
-typedef	char	TqChar;
-typedef	unsigned char	TqUchar;
-typedef	char*	TqPchar;
-typedef	unsigned char*	TqPuchar;
+/// \todo <b>Code review</b> Consider whether we can avoid polluting the global namespace with these typedefs.  C compatibility needs to be assured, so we may have to duplicate the header...
+//--------------------------------------------------------------------------------
+typedef char TqChar;
+typedef unsigned char TqUchar;
 
-typedef	int	TqInt;
-typedef	unsigned int	TqUint;
-typedef	long	TqLong;
-typedef	unsigned long	TqUlong;
+/// \todo <b>Code review</b> Deprecate these pointer types?  They're inconsistently used and of dubious usefulness anyway.
+typedef char* TqPchar;
+typedef unsigned char* TqPuchar;
 
-typedef	short	TqShort;
-typedef	unsigned short	TqUshort;
+typedef int TqInt;
+typedef unsigned int TqUint;
+typedef long TqLong;
+typedef unsigned long TqUlong;
 
-typedef	float	TqFloat;
-typedef	double	TqDouble;
+typedef short TqShort;
+typedef unsigned short TqUshort;
 
+typedef float TqFloat;
+typedef double TqDouble;
 
-// Integer types with specific size.
-typedef boost::int8_t TqInt8;
-typedef boost::int16_t TqInt16;
-typedef boost::int32_t TqInt32;
 
-typedef boost::uint8_t TqUint8;
-typedef boost::uint16_t TqUint16;
-typedef boost::uint32_t TqUint32;
+//--------------------------------------------------------------------------------
+// Typedefs for integer types with specific sizes.
+//
+// This approach - based on a combination of stdint.h and limit macros from
+// limits.h - is taken from boost/cstdint.hpp.  Unfortunately we have to use
+// our own version here for C compatibility.
 
+#ifdef AQSIS_HAVE_STDINT_H
 
-#endif	// AQSIS_TYPES_INCLUDED
+	// Use types from the C99 stdint.h header.
+#	include <stdint.h>
+
+	typedef int8_t  TqInt8;
+	typedef uint8_t TqUint8;
+
+	typedef int16_t  TqInt16;
+	typedef uint16_t TqUint16;
+
+	typedef int32_t  TqInt32;
+	typedef uint32_t TqUint32;
+
+#else // AQSIS_HAVE_STDINT_H
+
+	// If the stdint.h header is not present, fall back on using the limits
+	// macros from limits.h to guess the correct types.
+#	include <limits.h>
+
+#	if UCHAR_MAX == 0xff
+		typedef signed char   TqInt8;
+		typedef unsigned char TqUint8;
+#	else
+#		error 8 bit integers not autodetected - please modify aqsis_types.h \
+			or contact the aqsis team.
+#	endif
+
+#	if USHRT_MAX == 0xffff
+		typedef short          TqInt16;
+		typedef unsigned short TqUint16;
+#	else
+#		error 16 bit integers not autodetected - please modify aqsis_types.h \
+			or contact the aqsis team.
+#	endif
+
+#	if ULONG_MAX == 0xffffffff
+		typedef long          TqInt32;
+		typedef unsigned long TqUint32;
+#	elif UINT_MAX == 0xffffffff
+		typedef int           TqInt32;
+		typedef unsigned int  TqUint32;
+#	else
+#		error 32 bit integers not autodetected - please modify aqsis_types.h \
+			or contact the aqsis team.
+#	endif
+
+#endif // AQSIS_HAVE_STDINT_H
+
+
+#endif // AQSIS_TYPES_INCLUDED
Index: aqsistypes/export.cmake
===================================================================
--- aqsistypes/export.cmake	(revision 2507)
+++ aqsistypes/export.cmake	(working copy)
@@ -1,5 +1,6 @@
 INCLUDE_DIRECTORIES(${AQSISTYPES_SOURCE_DIR})
-# TODO: choose the right subdirectory
+INCLUDE_DIRECTORIES(${AQSISTYPES_BINARY_DIR})  # for aqsis_config.h
+
 IF(UNIX OR APPLE)
 	INCLUDE_DIRECTORIES(${AQSISTYPES_SOURCE_DIR}/posix)
 ELSE(UNIX OR APPLE)
Index: aqsistypes/CMakeLists.txt
===================================================================
--- aqsistypes/CMakeLists.txt	(revision 2507)
+++ aqsistypes/CMakeLists.txt	(working copy)
@@ -1,5 +1,17 @@
 PROJECT(AQSISTYPES)
 
+#----------------------------------------------------------------------
+# create aqsis_config.h
+INCLUDE (CheckIncludeFiles)
+
+CHECK_INCLUDE_FILES(stdint.h AQSIS_HAVE_STDINT_H)
+CONFIGURE_FILE("${PROJECT_SOURCE_DIR}/aqsis_config.h.in.cmake"
+	"${PROJECT_BINARY_DIR}/aqsis_config.h")
+
+
+#----------------------------------------------------------------------
+# Source files
+
 # NOTE: Not sure if this best, or we should exhaustively list the files.
 # The reason being, if we add a new file in this system, we need to 
 # manually re-run CMake to generate the source files, however, if we
@@ -7,7 +19,7 @@
 # re-run cmake.
 FILE(GLOB AQSISTYPES_SRCS ${PROJECT_SOURCE_DIR}/*.cpp)
 FILE(GLOB AQSISTYPES_HDRS ${PROJECT_SOURCE_DIR}/*.h)
-# TODO: choose the right subdirectory
+
 IF(UNIX OR APPLE)
 	FILE(GLOB AQSISTYPES_SYSTEM_SRCS ${PROJECT_SOURCE_DIR}/posix/*.cpp)
 	FILE(GLOB AQSISTYPES_SYSTEM_HDRS ${PROJECT_SOURCE_DIR}/posix/*.h)
@@ -19,12 +31,19 @@
 ENDIF(UNIX OR APPLE)
 
 SET(AQSISTYPES_SRCS ${AQSISTYPES_SRCS} ${AQSISTYPES_SYSTEM_SRCS})
-SET(AQSISTYPES_HDRS ${AQSISTYPES_HDRS} ${AQSISTYPES_SYSTEM_HDRS})
+SET(AQSISTYPES_HDRS
+	${AQSISTYPES_HDRS}
+	${AQSISTYPES_SYSTEM_HDRS}
+	"${PROJECT_BINARY_DIR}/aqsis_config.h"
+)
 
 FILE(GLOB AQSISTYPES_TEST_SRCS ${PROJECT_SOURCE_DIR}/*_test.cpp)
 
 FILTER_OUT("${AQSISTYPES_TEST_SRCS}" "${AQSISTYPES_SRCS}" AQSISTYPES_SRCS) 
 
+
+#------------------------------------------------------------------------------
+# Targets
 INCLUDE_DIRECTORIES(${AQSIS_BOOST_INCLUDE_DIR})
 
 # Internal dependencies
Index: aqsistypes/aqsis.h
===================================================================
--- aqsistypes/aqsis.h	(revision 2507)
+++ aqsistypes/aqsis.h	(working copy)
@@ -20,21 +20,25 @@
 /** \file
  * \brief Main Aqsis include for basic macros and types needed by all aqsis headers.
  *
- * This file should be included by every aqsis C++ source file.  Moreover, it
+ * \author Paul C. Gregory (pgregory at aqsis.org)
+ *
+ * This file should be included by every aqsis source file.  Moreover, it
  * should be included before any other headers, since aqsis_compiler.h defines
  * some constants which potentially modify the behaviour of other standard
  * includes.
  *
- * \author Paul C. Gregory (pgregory at aqsis.org)
+ * ===================================================================
+ * C-compatible header. C++ constructs must be preprocessor-protected.
+ * ===================================================================
  */
 
 #ifndef AQSIS_H_INCLUDED
-#define AQSIS_H_INCLUDED 1
+#define AQSIS_H_INCLUDED
 
-#include	<assert.h>
+#include <assert.h>
 
-#include	"aqsis_types.h"
-#include	"aqsis_compiler.h"
+#include "aqsis_types.h"
+#include "aqsis_compiler.h"
 
 // macro which stringizes the value held in another macro.
 #define AQSIS_XSTR(s) AQSIS_STR(s)
Index: renderer/ddmanager/ndspy.h
===================================================================
--- renderer/ddmanager/ndspy.h	(revision 2507)
+++ renderer/ddmanager/ndspy.h	(working copy)
@@ -34,7 +34,7 @@
 #ifndef	NDSPY_H_INCLUDED
 #define	NDSPY_H_INCLUDED
 
-#include "aqsis_compiler.h"
+#include "aqsis.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -50,21 +50,16 @@
 #	define PkDspyByteOrderNative PkDspyByteOrderLoHi
 #endif
 
-/// \todo Consider using TqUint32 etc from aqsis_types.h instead of the below.
-#if defined(__mips64) || defined(__alpha) || defined(__x86_64) || defined(_M_X64)
-typedef unsigned int PtDspyUnsigned32;
-typedef int PtDspySigned32;
-#else
-typedef unsigned long PtDspyUnsigned32;
-typedef long PtDspySigned32;
-#endif
+typedef TqUint32 PtDspyUnsigned32;
+typedef TqInt32 PtDspySigned32;
 
-typedef unsigned short PtDspyUnsigned16;
-typedef short PtDspySigned16;
+typedef TqUint16 PtDspyUnsigned16;
+typedef TqInt16 PtDspySigned16;
 
-typedef unsigned char PtDspyUnsigned8;
-typedef signed char PtDspySigned8;
+typedef TqUint8 PtDspyUnsigned8;
+typedef TqInt8 PtDspySigned8;
 
+
 typedef PtDspyUnsigned32 PtDspyMsgLen;
 typedef PtDspyUnsigned32 PtDspyServerMessage;
 



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/aqsis/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	4 Mar 2007 22:09:39 -0000	1.2
+++ .cvsignore	7 Oct 2008 23:35:13 -0000	1.3
@@ -1 +1 @@
-aqsis-1.2.0.tar.gz
+aqsis-1.4.1.tar.gz


Index: aqsis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/aqsis/devel/aqsis.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- aqsis.spec	9 Feb 2008 14:22:25 -0000	1.5
+++ aqsis.spec	7 Oct 2008 23:35:13 -0000	1.6
@@ -1,20 +1,33 @@
 Name:		aqsis
-Version:	1.2.0
-Release:	8%{?dist}
+Version:	1.4.1
+Release:	2%{?dist}
 Summary:	Open source RenderMan-compliant 3D rendering solution
 Group:		Applications/Multimedia
 
-License:	GPLv2+
+License:	GPLv2+ and LGPLv2+
 URL:		http://www.aqsis.org
-Source:		http://download.aqsis.org/stable/source/tar/%{name}-%{version}.tar.gz
-Patch0:         aqsis-1.2.0-gcc43.patch
+Source0:	http://downloads.sourceforge.net/aqsis/aqsis-%{version}.tar.gz
+Source1:        aqsis_config.h.in.cmake
+Patch0:         intsize_detect_fix.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  desktop-file-utils
 
-BuildRequires:	bison, boost-devel >= 1.32.0, flex >= 2.5.4, fltk-devel >= 1.1.0, 
-BuildRequires:	libjpeg-devel >= 6b, libtiff-devel >= 3.7.1, libxslt, 
-BuildRequires:	scons >= 0.96.1, zlib-devel >= 1.1.4
-BuildRequires:	OpenEXR-devel >= 1.6.0
+BuildRequires:  bison >= 1.35.0
+BuildRequires:  boost-devel >= 1.34.0
+BuildRequires:  cmake >= 2.4.6
+BuildRequires:  flex >= 2.5.4
+BuildRequires:  fltk-devel >= 1.1.0, fltk-fluid
+BuildRequires:  libjpeg-devel >= 6
+BuildRequires:  libtiff-devel >= 3.7.1
+BuildRequires:  libxslt
+BuildRequires:  tinyxml-devel
+BuildRequires:  OpenEXR-devel
+BuildRequires:  zlib-devel >= 1.1.4
+
+
+Requires: aqsis-core = %{version}-%{release}
+Requires: aqsis-data = %{version}-%{release}
 
 
 %description
@@ -26,18 +39,24 @@
 optimizing textures and a RIB processor.
 
 
-%package devel
-Requires:	%{name} = %{version}-%{release}
-Summary:	Development files for Aqsis
-Group:		Development/Libraries
-
+%package core
+Requires:	%{name}-libs = %{version}-%{release}
+Summary:	Example content for Aqsis
+Group:		Applications/Multimedia
 
-%description devel
+%description core
 Aqsis is a cross-platform photorealistic 3D rendering solution, based 
 on the RenderMan interface standard defined by Pixar Animation Studios.
 
-This package contains various developer libraries to enable integration with 
-third-party applications.
+This package contains example content, including additional scenes and shaders.
+
+
+%package libs
+Summary:        Libraries for %{name}
+Group:          System Environment/Libraries
+
+%description libs
+The %{name}-libs package contains shared libraries for %{name}.
 
 
 %package data
@@ -45,7 +64,6 @@
 Summary:	Example content for Aqsis
 Group:		Applications/Multimedia
 
-
 %description data
 Aqsis is a cross-platform photorealistic 3D rendering solution, based 
 on the RenderMan interface standard defined by Pixar Animation Studios.
@@ -53,90 +71,204 @@
 This package contains example content, including additional scenes and shaders.
 
 
+%package devel
+Requires:	%{name} = %{version}-%{release}
+Requires:	aqsis-core = %{version}-%{release}
+Requires:	aqsis-libs = %{version}-%{release}
+Requires:	aqsis-data = %{version}-%{release}
+Summary:	Development files for Aqsis
+Group:		Development/Libraries
+
+%description devel
+Aqsis is a cross-platform photorealistic 3D rendering solution, based 
+on the RenderMan interface standard defined by Pixar Animation Studios.
+
+This package contains various developer libraries to enable integration with 
+third-party applications.
+
+
 %prep
 %setup -q
-# wrong-script-end-of-line-encoding
-sed -i 's/\r//' thirdparty/dbo_plane/dbo_plane.c
-sed -i 's/\r//' thirdparty/dbo_plane/implicit.h
-# script-without-shebang
-find shadercompiler/slparse texturing/plugins/png2tif displays thirdparty/dbo_plane aqsistypes rib -type f -name \* -exec chmod 644 {} \;
-%patch0 -p1 -b .gcc43
+%patch0 -p0 -b .intsize
+install -pm 0644 %{SOURCE1} aqsistypes/
 
 
 %build
 ## Do not Enable pdiff=yes Because it will conflict with Printdiff :
 ## /usr/bin/pdiff  from package	a2ps
-export CFLAGS=$RPM_OPT_FLAGS
-export CXXFLAGS=$RPM_OPT_FLAGS
-scons %{?_smp_mflags} \
-		destdir=$RPM_BUILD_ROOT \
-		sysconfdir=%{_sysconfdir}/%{name} \
-		libdir=%{_libdir} \
-		tiff_lib_path=%{_libdir} \
-		jpeg_lib_path=%{_libdir} \
-		zlib_lib_path=%{_libdir} \
-		fltk_lib_path=%{_libdir} \
-		exr_lib_path=%{_libdir} \
-		install_prefix=%{_prefix} \
-		no_rpath=true \
-		build
+rm -rf build
+mkdir -p build
+pushd build
+%cmake \
+  -DSYSCONFDIR:STRING=%{_sysconfdir}/aqsis \
+  -DSCRIPTSDIR=share/aqsis/script \
+  -DAQSIS_MAIN_CONFIG_NAME=aqsisrc-%{_lib} \
+%if %{?_lib} == "lib64"
+  -DLIBDIR=%{_lib} \
+  -DDEFAULT_PLUGIN_PATH="%{_lib}/aqsis" \
+  -DPLUGINDIR=%{_lib}/aqsis/plugins \
+%endif
+  -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
+  -DCMAKE_SKIP_RPATH:BOOL=ON \
+  -DAQSIS_USE_RPATH:BOOL=OFF \
+  -DAQSIS_BOOST_FILESYSTEM_LIBRARY_NAME=boost_filesystem-mt \
+  -DAQSIS_BOOST_REGEX_LIBRARY_NAME=boost_regex-mt \
+  -DAQSIS_BOOST_THREAD_LIBRARY_NAME=boost_thread-mt \
+  -DAQSIS_BOOST_WAVE_LIBRARY_NAME=boost_wave-mt \
+  -DAQSIS_USE_EXTERNAL_TINYXML:BOOL=ON ..
+
+make VERBOSE=1 %{?_smp_mflags}
+
+popd
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-export CFLAGS=$RPM_OPT_FLAGS
-export CXXFLAGS=$RPM_OPT_FLAGS
-scons install
-chmod a+rx $RPM_BUILD_ROOT%{_datadir}/%{name}/scripts/mpanalyse.py
-chmod a+rx $RPM_BUILD_ROOT%{_datadir}/%{name}/content/ribs/scenes/vase/render.sh
-chmod a+rx $RPM_BUILD_ROOT%{_datadir}/%{name}/content/ribs/features/layeredshaders/render.sh
+pushd build
+make install DESTDIR=$RPM_BUILD_ROOT
+popd
+
+# Move aqsisrc
+mv $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/aqsisrc \
+  $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/aqsisrc-%{_lib}
+
+desktop-file-install --vendor "" --delete-original \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+  $RPM_BUILD_ROOT%{_datadir}/applications/aqsis.desktop
+
+desktop-file-install --vendor "" --delete-original \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+  $RPM_BUILD_ROOT%{_datadir}/applications/aqsl.desktop
+
+desktop-file-install --vendor "" --delete-original \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+  $RPM_BUILD_ROOT%{_datadir}/applications/aqsltell.desktop
+
+desktop-file-install --vendor "" --delete-original \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+  $RPM_BUILD_ROOT%{_datadir}/applications/eqsl.desktop
+
+desktop-file-install --vendor "" --delete-original \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+  $RPM_BUILD_ROOT%{_datadir}/applications/piqsl.desktop
+
+# Fix the scripts directory
+mv $RPM_BUILD_ROOT%{_datadir}/%{name}/script/ \
+ $RPM_BUILD_ROOT%{_datadir}/%{name}/scripts/
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%post	-p /sbin/ldconfig
-%postun	-p /sbin/ldconfig
+%post
+xdg-icon-resource install --novendor --size 192 %{_datadir}/pixmaps/aqsis.png aqsis
+xdg-icon-resource install --novendor --context mimetypes --size 192 %{_datadir}/pixmaps/aqsis-doc.png application-x-slx
+xdg-icon-resource install --novendor --context mimetypes --size 192 %{_datadir}/pixmaps/aqsis-doc.png model-x-rib
+xdg-icon-resource install --novendor --context mimetypes --size 192 %{_datadir}/pixmaps/aqsis-doc.png model-x-rib-gzip
+xdg-icon-resource install --novendor --context mimetypes --size 192 %{_datadir}/pixmaps/aqsis-doc.png text-x-sl
+xdg-desktop-menu install --novendor %{_datadir}/applications/aqsis.desktop
+xdg-desktop-menu install --novendor %{_datadir}/applications/aqsl.desktop
+xdg-desktop-menu install --novendor %{_datadir}/applications/aqsltell.desktop
+xdg-desktop-menu install --novendor %{_datadir}/applications/eqsl.desktop
+xdg-desktop-menu install --novendor %{_datadir}/applications/piqsl.desktop
+xdg-mime install --novendor %{_datadir}/mime/packages/aqsis.xml  || :
+
+%post libs -p /sbin/ldconfig
+
+%preun
+xdg-icon-resource uninstall --size 192 aqsis
+xdg-icon-resource uninstall --context mimetypes --size 192 application-x-slx
+xdg-icon-resource uninstall --context mimetypes --size 192 model-x-rib
+xdg-icon-resource uninstall --context mimetypes --size 192 model-x-rib-gzip
+xdg-icon-resource uninstall --context mimetypes --size 192 text-x-sl
+xdg-desktop-menu uninstall %{_datadir}/applications/aqsis.desktop
+xdg-desktop-menu uninstall %{_datadir}/applications/aqsl.desktop
+xdg-desktop-menu uninstall %{_datadir}/applications/aqsltell.desktop
+xdg-desktop-menu uninstall %{_datadir}/applications/eqsl.desktop
+xdg-desktop-menu uninstall %{_datadir}/applications/piqsl.desktop
+xdg-mime uninstall %{_datadir}/mime/packages/aqsis.xml || :
+
+%postun libs -p /sbin/ldconfig
 
 
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README ReleaseNotes
+%{_bindir}/eqsl
+%{_bindir}/piqsl
+# Do not use the name pdiff for PerceptualDiff
+# It is used by PrintDiff in a2ps
+#{_bindir}/pdiff
+%{_datadir}/applications/aqsis.desktop
+%{_datadir}/applications/aqsl.desktop
+%{_datadir}/applications/aqsltell.desktop
+%{_datadir}/applications/eqsl.desktop
+%{_datadir}/applications/piqsl.desktop
+%{_datadir}/pixmaps/aqsis-doc.png
+%{_datadir}/pixmaps/aqsis.png
+%{_datadir}/mime/packages/aqsis.xml
+
+
+%files core
+%defattr(-,root,root,-)
 %{_bindir}/aqsis
 %{_bindir}/aqsl
 %{_bindir}/aqsltell
 %{_bindir}/miqser
-# Do not use the name pdiff for PerceptualDiff
-# It is used by PrintDiff in a2ps
-#{_bindir}/pdiff
 %{_bindir}/teqser
-%{_libdir}/%{name}/
-%{_libdir}/*.so.*
+
+
+%files libs
+%defattr(-,root,root,-)
+%dir %{_sysconfdir}/%{name}
 ## Do not use noreplace with aqsis release
 ## This may definitly change in future releases.
-%config %{_sysconfdir}/%{name}/aqsisrc
-%dir %{_sysconfdir}/%{name}
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/shaders/
-%{_datadir}/%{name}/scripts/
+%config %{_sysconfdir}/%{name}/aqsisrc-%{_lib}
+%{_libdir}/%{name}/
+# Licensed under GPLv2+
+%{_libdir}/libaqsis.so.*
+%{_libdir}/libaqsisargparse.so.*
+%{_libdir}/libaqsistex.so.*
+%{_libdir}/libaqsistypes.so.*
+%{_libdir}/libshadervm.so.*
+%{_libdir}/libslxargs.so.*
+# Licensed under LGPLv2+
+%{_libdir}/libri2rib.so.*
 
 
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/%{name}/
-%{_libdir}/*.so
+# Licensed under GPLv2+
+%{_libdir}/libaqsis.so
+%{_libdir}/libaqsisargparse.so
+%{_libdir}/libaqsistex.so
+%{_libdir}/libaqsistypes.so
+%{_libdir}/libshadervm.so
+%{_libdir}/libslxargs.so
+# Licensed under LGPLv2+
+%{_libdir}/libri2rib.so
 
 
 %files data
 %defattr(-,root,root,-)
+%dir %{_datadir}/%{name}
 %{_datadir}/%{name}/content/
-%exclude %{_datadir}/%{name}/content/ribs/*/*/*.bat
+%{_datadir}/%{name}/shaders/
+%{_datadir}/%{name}/scripts/
+
 
 
 %changelog
-* Sat Feb  9 2008 kwizart < kwizart at gmail.com > - 1.2.0-8
-- Rebuild for gcc43
+* Wed Oct  8 2008 kwizart < kwizart at gmail.com > - 1.4.1-2
+- backport patch for intsize problem
+
+* Mon Sep 29 2008 kwizart < kwizart at gmail.com > - 1.4.1-1
+- Update to 1.4.1
+
+* Fri Jul 25 2008 kwizart < kwizart at gmail.com > - 1.4.0-1
+- Update to 1.4.0
 
 * Mon Jan  7 2008 kwizart < kwizart at gmail.com > - 1.2.0-7
 - Fix gcc43


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/aqsis/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Mar 2007 22:09:39 -0000	1.2
+++ sources	7 Oct 2008 23:35:13 -0000	1.3
@@ -1 +1 @@
-ae9bb1c4b22e396fd7ce84ee3e13cb86  aqsis-1.2.0.tar.gz
+524f1392d2c07fbd0c6accc1ffe9cffe  aqsis-1.4.1.tar.gz


--- aqsis-1.2.0-gcc43.patch DELETED ---


