rpms/imlib2/FC-3 imlib2.spec,1.9,1.10
Michael Schwendt (mschwendt)
fedora-extras-commits at redhat.com
Tue Apr 5 19:07:56 UTC 2005
Author: mschwendt
Update of /cvs/extras/rpms/imlib2/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5570
Modified Files:
imlib2.spec
Log Message:
sync with devel tree and fix #153733
* Tue Apr 5 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.2.0-7.fc3
- Fix broken pkgconfig file.
* Fri Apr 1 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.2.0-6
- Include imlib2 directory in datadir and libdir.
Index: imlib2.spec
===================================================================
RCS file: /cvs/extras/rpms/imlib2/FC-3/imlib2.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- imlib2.spec 9 Feb 2005 22:06:39 -0000 1.9
+++ imlib2.spec 5 Apr 2005 19:07:53 -0000 1.10
@@ -1,24 +1,22 @@
-Summary: A graphic library for file loading, saving, rendering, and manipulation
-Name: imlib2
-Version: 1.2.0
-Release: 5
-Epoch: 0
-License: BSD
-Group: System Environment/Libraries
-URL: http://www.enlightenment.org/pages/imlib2.html
-Source0: http://download.sf.net/enlightenment/%{name}-%{version}.tar.gz
-Patch0: imlib2-1.2.0-configure-xlib64.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+Summary: Graphic library for file loading, saving, rendering, and manipulation
+Name: imlib2
+Version: 1.2.0
+Release: 7.fc3
+License: BSD
+Group: System Environment/Libraries
+URL: http://www.enlightenment.org/pages/imlib2.html
+Source0: http://download.sf.net/enlightenment/%{name}-%{version}.tar.gz
+Patch0: imlib2-1.2.0-configure-xlib64.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}
%package devel
-Summary: Development package for %{name}
-Group: Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Summary: Development package for %{name}
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
Requires: XFree86-devel freetype-devel pkgconfig
-# -----------------------------------------------------------------------------
%description
Imlib 2 is the successor to Imlib. It is NOT a newer version -- it is
@@ -36,7 +34,6 @@
which have very similar functionality. Please see the homepage for the
long description of the differences.
-# -----------------------------------------------------------------------------
%prep
%setup -q
@@ -48,7 +45,6 @@
's|^(\w+_la_LDFLAGS .*)|$1 -L\$(top_builddir)/src/lib| ;
s|^(\w+_la_LIBADD .*)|$1 -lImlib2|' src/modules/loaders/Makefile.*
-# -----------------------------------------------------------------------------
%build
%configure \
@@ -68,7 +64,6 @@
make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
-# -----------------------------------------------------------------------------
%install
rm -rf $RPM_BUILD_ROOT __doc
@@ -77,6 +72,9 @@
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}
@@ -84,15 +82,14 @@
# ship .la files due to a bug in kdelibs (see changelog):
# $RPM_BUILD_ROOT%{_libdir}/libImlib2.la \
-# -----------------------------------------------------------------------------
%clean
rm -rf $RPM_BUILD_ROOT
-# -----------------------------------------------------------------------------
%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
%files
%defattr(-,root,root,-)
@@ -104,7 +101,9 @@
%{_bindir}/imlib2_poly
%{_bindir}/imlib2_show
%{_libdir}/libImlib2.so.*
+%dir %{_datadir}/imlib2/
%{_datadir}/imlib2/data/
+%dir %{_libdir}/imlib2/
%dir %{_libdir}/imlib2/filters/
%{_libdir}/imlib2/filters/*.so
%{_libdir}/imlib2/filters/*.la
@@ -117,13 +116,18 @@
%{_bindir}/imlib2-config
%{_includedir}/Imlib2.h
%{_libdir}/libImlib2.a
-%{_libdir}/libImlib2.la
+%{_libdir}/libImlib2.la
%{_libdir}/libImlib2.so
%{_libdir}/pkgconfig/imlib2.pc
-# -----------------------------------------------------------------------------
%changelog
+* Tue Apr 5 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.2.0-7.fc3
+- Fix broken pkgconfig file.
+
+* Fri Apr 1 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.2.0-6
+- Include imlib2 directory in datadir and libdir.
+
* Wed Feb 9 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:1.2.0-5
- Link loaders with the main lib, fixes load/save problems with some apps.
@@ -131,7 +135,7 @@
- Really include libtool archives to fix fedora.us bug #2284.
* Fri Jan 14 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:1.2.0-3
-- Move filters and loaders back into main package where they belong
+- Move filters and loaders back into main package where they belong
* Mon Jan 10 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:1.2.0-2
- Don't ship *.?.a in {_libdir}/imlib/filters/ and loaders/
@@ -141,12 +145,12 @@
https://bugzilla.fedora.us/show_bug.cgi?id=2284
http://bugzilla.redhat.com/bugzilla/142244
http://bugs.kde.org/93359
-- Use make param LIBTOOL=/usr/bin/libtool - fixes hardcoded rpath on x86_64
+- Use make param LIBTOOL=/usr/bin/libtool - fixes hardcoded rpath on 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"
-- Update to 1.2.0 -- fixes several security issues
+- Update to 1.2.0 -- fixes several security issues
- remove explicit libdir=_libdir - 1.2.9 does not need it anymore
-- removeddemo compile/install;
+- removeddemo compile/install;
- use configure param --x-libraries={_prefix}/X11R6/{_lib} and patch to fix
"cannot find -lX11"
@@ -167,5 +171,5 @@
- Moved some binaries and loaders into main package
- Added missing Requires and BuildRequires
-* Sun Oct 26 2003 Dams <anvil[AT]livna.org>
+* Sun Oct 26 2003 Dams <anvil[AT]livna.org>
- Initial build.
More information about the fedora-extras-commits
mailing list