rpms/imlib2/devel .cvsignore, 1.3, 1.4 imlib2.spec, 1.14, 1.15 sources, 1.4, 1.5 imlib2-1.2.0-configure-xlib64.patch, 1.1, NONE imlib2-1.2.0-xpmcescape.patch, 1.1, NONE
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Tue Sep 20 19:09:41 UTC 2005
- Previous message (by thread): rpms/TeXmacs/FC-3 TeXmacs.spec,1.9,1.10 sources,1.9,1.10
- Next message (by thread): rpms/imlib2/FC-4 .cvsignore, 1.3, 1.4 imlib2.spec, 1.14, 1.15 sources, 1.4, 1.5 imlib2-1.2.0-configure-xlib64.patch, 1.1, NONE imlib2-1.2.0-xpmcescape.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: scop
Update of /cvs/extras/rpms/imlib2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6372
Modified Files:
.cvsignore imlib2.spec sources
Removed Files:
imlib2-1.2.0-configure-xlib64.patch
imlib2-1.2.0-xpmcescape.patch
Log Message:
* Sun Aug 28 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.2.1-2
- 1.2.1, patches applied/obsoleted upstream.
- Improve summary and description, fix URL.
- Move HTML docs to -devel.
- Build with dependency tracking disabled.
- Drop x86_64 freetype rpath hack, require a fixed freetype-devel.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/imlib2/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 8 Nov 2004 04:35:58 -0000 1.3
+++ .cvsignore 20 Sep 2005 19:09:39 -0000 1.4
@@ -1 +1 @@
-imlib2-1.1.2.tar.gz
+imlib2-1.2.1.tar.gz
Index: imlib2.spec
===================================================================
RCS file: /cvs/extras/rpms/imlib2/devel/imlib2.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- imlib2.spec 9 May 2005 19:28:56 -0000 1.14
+++ imlib2.spec 20 Sep 2005 19:09:39 -0000 1.15
@@ -1,87 +1,74 @@
-Summary: Graphic library for file loading, saving, rendering, and manipulation
+Summary: Image loading, saving, rendering, and manipulation library
Name: imlib2
-Version: 1.2.0
-Release: 8.fc4
+Version: 1.2.1
+Release: 2%{?dist}
License: BSD
Group: System Environment/Libraries
-URL: http://www.enlightenment.org/pages/imlib2.html
+URL: http://www.enlightenment.org/Libraries/Imlib2/
Source0: http://download.sf.net/enlightenment/%{name}-%{version}.tar.gz
-Patch0: imlib2-1.2.0-configure-xlib64.patch
-Patch1: imlib2-1.2.0-xpmcescape.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
BuildRequires: XFree86-devel libjpeg-devel libpng-devel libtiff-devel
-BuildRequires: libungif-devel freetype-devel libtool bzip2-devel %{__perl}
+BuildRequires: libungif-devel freetype-devel >= 2.1.9-4 libtool bzip2-devel
%package devel
Summary: Development package for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: XFree86-devel freetype-devel pkgconfig
+Requires: XFree86-devel freetype-devel >= 2.1.9-4 pkgconfig
%description
-Imlib 2 is the successor to Imlib. It is NOT a newer version -- it is
-a completely new library. Imlib 2 can be installed alongside Imlib 1.x
-without any problems since they are effectively different libraries
-which have very similar functionality. Please see the homepage for the
-long description of the differences.
+Imlib 2 is a library that does image file loading and saving as well
+as rendering, manipulation, arbitrary polygon support, etc. It does
+ALL of these operations FAST. Imlib2 also tries to be highly
+intelligent about doing them, so writing naive programs can be done
+easily, without sacrificing speed. This is a complete rewrite over
+the Imlib 1.x series. The architecture is more modular, simple, and
+flexible.
%description devel
This package contains development files for %{name}.
-Imlib 2 is the successor to Imlib. It is NOT a newer version -- it is
-a completely new library. Imlib 2 can be installed alongside Imlib 1.x
-without any problems since they are effectively different libraries
-which have very similar functionality. Please see the homepage for the
-long description of the differences.
+Imlib 2 is a library that does image file loading and saving as well
+as rendering, manipulation, arbitrary polygon support, etc. It does
+ALL of these operations FAST. Imlib2 also tries to be highly
+intelligent about doing them, so writing naive programs can be done
+easily, without sacrificing speed. This is a complete rewrite over
+the Imlib 1.x series. The architecture is more modular, simple, and
+flexible.
%prep
%setup -q
-%ifarch x86_64
-%patch0 -b .patch0
-%endif
-%patch1 -p1 -b .xpmcescape
-# loaders need to link with the main lib
-%{__perl} -pi -e \
- 's|^(\w+_la_LDFLAGS .*)|$1 -L\$(top_builddir)/src/lib| ;
- s|^(\w+_la_LIBADD .*)|$1 -lImlib2|' src/modules/loaders/Makefile.*
%build
-%configure \
- --x-libraries=%{_prefix}/X11R6/%{_lib} \
- --with-pic \
+asmopts="--disable-mmx --disable-amd64"
%ifarch %{ix86} ia64
- --enable-mmx
-%else
- --disable-mmx
+asmopts="--enable-mmx --disable-amd64"
%endif
%ifarch x86_64
-# fix hardcoded rpath im Makefiles on x86_64 due to freetype-config --libs
-# returning "-L/usr/lib64 -Wl,--rpath -Wl,/usr/lib64 -lfreetype -lz":
-%{__perl} -pi.orig -e 's|-Wl,--rpath -Wl,/usr/lib64||g;' \
- Makefile */Makefile */*/Makefile imlib2-config
+asmopts="--disable-mmx --enable-amd64"
%endif
+# Note: --disable-static doesn't work as of 1.2.1.
+%configure --disable-dependency-tracking \
+ --x-libraries=%{_prefix}/X11R6/%{_lib} \
+ --with-pic \
+ $asmopts
+
make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
%install
-rm -rf $RPM_BUILD_ROOT __doc
+rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool
-cp -a doc __doc
-rm -f __doc/Makefile*
-
-# remove unexpanded variable in pkgconfig file
-sed -i -e 's!@requirements@!!g' ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/imlib2.pc
-
rm -f \
$RPM_BUILD_ROOT%{_libdir}/imlib2/{loaders,filters}/*.a \
- $RPM_BUILD_ROOT%{_bindir}/{color_spaces,imlib2,*test}
+ $RPM_BUILD_ROOT%{_bindir}/imlib2_test
-# ship .la files due to a bug in kdelibs (see changelog):
+# ship .la files due to a bug in kdelibs (bugzilla.fedora.us #2284):
# $RPM_BUILD_ROOT%{_libdir}/libImlib2.la \
@@ -95,7 +82,7 @@
%files
%defattr(-,root,root,-)
-%doc COPYING AUTHORS README ChangeLog TODO __doc/*
+%doc COPYING AUTHORS README ChangeLog TODO
%{_bindir}/imlib2_view
%{_bindir}/imlib2_bumpmap
%{_bindir}/imlib2_colorspace
@@ -115,6 +102,7 @@
%files devel
%defattr(-,root,root,-)
+%doc doc/*.gif doc/*.html
%{_bindir}/imlib2-config
%{_includedir}/Imlib2.h
%{_libdir}/libImlib2.a
@@ -124,6 +112,13 @@
%changelog
+* Sun Aug 28 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.2.1-2
+- 1.2.1, patches applied/obsoleted upstream.
+- Improve summary and description, fix URL.
+- Move HTML docs to -devel.
+- Build with dependency tracking disabled.
+- Drop x86_64 freetype rpath hack, require a fixed freetype-devel.
+
* Mon May 9 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.2.0-8.fc4
- Fix segfault in XPM loader (#156058).
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/imlib2/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 17 Jan 2005 09:43:09 -0000 1.4
+++ sources 20 Sep 2005 19:09:39 -0000 1.5
@@ -1 +1 @@
-853fb77100ee3c3ca944f52c892ab49b imlib2-1.2.0.tar.gz
+e32970d03d8aee2885782312d0a7f15f imlib2-1.2.1.tar.gz
--- imlib2-1.2.0-configure-xlib64.patch DELETED ---
--- imlib2-1.2.0-xpmcescape.patch DELETED ---
- Previous message (by thread): rpms/TeXmacs/FC-3 TeXmacs.spec,1.9,1.10 sources,1.9,1.10
- Next message (by thread): rpms/imlib2/FC-4 .cvsignore, 1.3, 1.4 imlib2.spec, 1.14, 1.15 sources, 1.4, 1.5 imlib2-1.2.0-configure-xlib64.patch, 1.1, NONE imlib2-1.2.0-xpmcescape.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list