rpms/DevIL/devel DevIL.spec,1.5,1.6

[Ian Chapman (oddsocks)]

Author: oddsocks

Update of /cvs/extras/rpms/DevIL/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7461

Modified Files:
	DevIL.spec 
Log Message:



Index: DevIL.spec
===================================================================
RCS file: /cvs/extras/rpms/DevIL/devel/DevIL.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DevIL.spec	2 Jan 2007 21:16:55 -0000	1.5
+++ DevIL.spec	8 Aug 2007 16:42:13 -0000	1.6
@@ -1,10 +1,9 @@
 Name:           DevIL
 Version:        1.6.8
-Release:        0.11.rc2%{?dist}
+Release:        0.12.rc2%{?dist}
 Summary:        A cross-platform image library
-
 Group:          System Environment/Libraries
-License:        LGPL
+License:        LGPLv2
 URL:            http://openil.sourceforge.net/
 Source0:        http://dl.sf.net/openil/%{name}-%{version}-rc2.tar.bz2
 Patch0:         DevIL-1.6.8-rc2-allegropicfix.patch
@@ -13,18 +12,16 @@
 Patch3:         DevIL-1.6.8-rc2-ilu_region.patch
 Patch4:         DevIL-1.6.8-rc2-il_endian_h.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  allegro-devel
+BuildRequires:  lcms-devel
+BuildRequires:  libGLU-devel
+BuildRequires:  libICE-devel
 BuildRequires:  libjpeg-devel
+BuildRequires:  libmng-devel
 BuildRequires:  libpng-devel
 BuildRequires:  libtiff-devel
-BuildRequires:  lcms-devel
-BuildRequires:  libmng-devel
-BuildRequires:  SDL-devel => 1.2.5
-BuildRequires:  allegro-devel
 BuildRequires:  libtool
-BuildRequires:  libGLU-devel
-BuildRequires:  libICE-devel
-Provides:       openil = %{version}-%{release}
-Provides:       devil = %{version}-%{release}
+BuildRequires:  SDL-devel => 1.2.5
 
 %description
 Developer's Image Library (DevIL) is a programmer's library to develop
@@ -39,15 +36,32 @@
 Summary:        Development files for DevIL
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:       allegro-devel
-Requires:       libGLU-devel
-Provides:       openil-devel = %{version}-%{release}
-Provides:       devil-devel = %{version}-%{release}
 
 %description devel
 Development files for DevIL
 
 
+%package ILUT
+Summary:        The libILUT component of DevIL
+Group:          System Environment/Libraries
+Requires:       %{name} = %{version}-%{release}
+
+%description ILUT
+The libILUT component of DevIL
+
+
+%package ILUT-devel
+Summary:        Development files for the libILUT component of DevIL
+Group:          Development/Libraries
+Requires:       %{name}-ILUT = %{version}-%{release}
+Requires:       %{name}-devel = %{version}-%{release}
+Requires:       allegro-devel
+Requires:       libGLU-devel
+
+%description ILUT-devel
+Development files for the libILUT component of DevIL
+
+
 %prep
 %setup -q
 %patch0 -p1
@@ -56,6 +70,10 @@
 %patch3 -p1
 %patch4 -p1
 
+# Convert to UTF8
+iconv -f iso8859-1 CREDITS -t utf8 > CREDITS.conv \
+    && /bin/mv -f CREDITS.conv CREDITS
+
 
 %build
 %configure
@@ -91,14 +109,14 @@
 %postun -p /sbin/ldconfig
 
 
+%post ILUT -p /sbin/ldconfig
+%postun ILUT -p /sbin/ldconfig
+
+
 %files
 %defattr(-,root,root,-)
-%{_libdir}/libIL.so.1
-%{_libdir}/libIL.so.1.0.0
-%{_libdir}/libILU.so.1
-%{_libdir}/libILU.so.1.0.0
-%{_libdir}/libILUT.so.1
-%{_libdir}/libILUT.so.1.0.0
+%{_libdir}/libIL.so.*
+%{_libdir}/libILU.so.*
 %doc AUTHORS ChangeLog COPYING CREDITS README TODO
 
 
@@ -106,26 +124,46 @@
 %defattr(-,root,root,-)
 %{_libdir}/libIL.so
 %{_libdir}/libILU.so
+%dir %{_includedir}/IL
+%{_includedir}/IL/devil_internal_exports.h
+%{_includedir}/IL/il.h
+%{_includedir}/IL/ilu.h
+%{_includedir}/IL/ilu_region.h
+
+
+%files ILUT
+%{_libdir}/libILUT.so.*
+
+
+%files ILUT-devel
 %{_libdir}/libILUT.so
-%{_includedir}/IL
+%{_includedir}/IL/config.h
+%{_includedir}/IL/ilut.h
+%{_includedir}/IL/il_wrap.h
 
 
 %changelog
-* Tue Jan 02 2007 Ian Chapman <packages at amiga-hardware.com> 1.6.8-0.11.rc2%{?dist}
+* Tue Aug 07 2007 Ian Chapman <packages at amiga-hardware.com> 1.6.8-0.12.rc2
+- Split libILUT into separate package. See BZ #250734
+- Removed some old provides:
+- Convert the CREDITS to UTF8
+- Updated license field due to new guidelines
+
+* Tue Jan 02 2007 Ian Chapman <packages at amiga-hardware.com> 1.6.8-0.11.rc2
 - Added patch to fix endian issues with some SGI files. Courtesy of Scott A.
   Friedman (BZ #220417)
 
-* Thu Sep 07 2006 Ian Chapman <packages at amiga-hardware.com> 1.6.8-0.10.rc2%{?dist}
+* Thu Sep 07 2006 Ian Chapman <packages at amiga-hardware.com> 1.6.8-0.10.rc2
 - Upgrade to 1.6.8-rc2
 - Added libICE-devel buildrequire
 - Dropped DevIL-1.6.8-rc1-64bit.patch, fixed upstream
 - Updated allegropicfix.patch for new version
 - Updated and split header fixes into separate files for easier maintenance
 
-* Mon Aug 28 2006 Ian Chapman <packages at amiga-hardware.com> 1.6.8-0.9.rc1%{?dist}
+* Mon Aug 28 2006 Ian Chapman <packages at amiga-hardware.com> 1.6.8-0.9.rc1
 - Release bump for FC6 mass rebuild
 
-* Fri Jun 09 2006 Ian Chapman <packages at amiga-hardware.com> 1.6.8-0.8.rc1%{?dist}
+* Fri Jun 09 2006 Ian Chapman <packages at amiga-hardware.com> 1.6.8-0.8.rc1
 - Added patch courtesy of Hans de Goede to fix crashes on 64bit systems
 
 * Wed May 31 2006 Ian Chapman <packages at amiga-hardware.com> 1.6.8-0.7.rc1