rpms/imlib2/devel imlib2.spec,1.26,1.27

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

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

Modified Files:
	imlib2.spec 
Log Message:
* Wed Aug  8 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4.0-2
- put the id3tag loader in its own imlib2-id3tag-loader subpackage as it links
  to libid3tag, which is GPLv2+, and we don't want the imlib2 main package to
  become GPLv2+ (bz 251054) (WIP) (*)
- fix the URL tag (bz 251277)
- Update License tag for new Licensing Guidelines compliance (WIP) (*)
(*) waiting for feedback from Spot, do not build yet!!



Index: imlib2.spec
===================================================================
RCS file: /cvs/extras/rpms/imlib2/devel/imlib2.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- imlib2.spec	27 May 2007 20:34:16 -0000	1.26
+++ imlib2.spec	9 Aug 2007 06:13:30 -0000	1.27
@@ -1,10 +1,10 @@
 Summary:        Image loading, saving, rendering, and manipulation library
 Name:           imlib2
 Version:        1.4.0
-Release:        1%{?dist}
-License:        BSD
+Release:        2%{?dist}
+License:        MIT with advertising??
 Group:          System Environment/Libraries
-URL:            http://www.enlightenment.org/Libraries/Imlib2/
+URL:            http://docs.enlightenment.org/api/imlib2/html/
 Source0:        http://downloads.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz
 Patch0:         imlib2-1.2.1-X11-path.patch
 Patch1:         imlib2-1.3.0-multilib.patch
@@ -14,13 +14,6 @@
 BuildRequires:  giflib-devel freetype-devel >= 2.1.9-4 libtool bzip2-devel
 BuildRequires:  libX11-devel libXext-devel libid3tag-devel pkgconfig
 
-%package devel
-Summary:        Development package for %{name}
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-Requires:       libX11-devel libXext-devel freetype-devel >= 2.1.9-4 pkgconfig
-
-
 %description
 Imlib 2 is a library that does image file loading and saving as well
 as rendering, manipulation, arbitrary polygon support, etc.  It does
@@ -30,6 +23,13 @@
 the Imlib 1.x series. The architecture is more modular, simple, and
 flexible.
 
+
+%package devel
+Summary:        Development package for %{name}
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       libX11-devel libXext-devel freetype-devel >= 2.1.9-4 pkgconfig
+
 %description devel
 This package contains development files for %{name}.
 
@@ -42,6 +42,19 @@
 flexible.
 
 
+%package id3tag-loader
+Summary:        id3tag-loader for %{name}
+License:        GPLv2+
+Group:          System Environment/Libraries
+Requires:       %{name} = %{version}-%{release}
+
+%description id3tag-loader
+This package contains a plugin which makes imlib2 capable of parsing id3 tags
+of mp3 files. This plugin is packaged separately because it links with
+libid3tag which is GPLv2+, thus making imlib2 and apps using it subject to the
+conditions of the GPL version 2 (or at your option) any later version.
+
+
 %prep
 %setup -q
 %patch0 -p1 -b .x11-path
@@ -103,6 +116,7 @@
 %dir %{_libdir}/imlib2/loaders/
 %{_libdir}/imlib2/loaders/*.so
 %{_libdir}/imlib2/loaders/*.la
+%exclude %{_libdir}/imlib2/loaders/id3.*
 
 %files devel
 %defattr(-,root,root,-)
@@ -114,8 +128,18 @@
 %{_libdir}/libImlib2.so
 %{_libdir}/pkgconfig/imlib2.pc
 
+%files id3tag-loader
+%{_libdir}/imlib2/loaders/id3.*
 
 %changelog
+* Wed Aug  8 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4.0-2
+- put the id3tag loader in its own imlib2-id3tag-loader subpackage as it links
+  to libid3tag, which is GPLv2+, and we don't want the imlib2 main package to
+  become GPLv2+ (bz 251054) (WIP) (*)
+- fix the URL tag (bz 251277)
+- Update License tag for new Licensing Guidelines compliance (WIP) (*)
+(*) waiting for feedback from Spot, do not build yet!!
+
 * Sun May 27 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.4.0-1
 - New upstream release 1.4.0