rebuild (libpng)

pkgconfig-style deps
This commit is contained in:
Rex Dieter 2011-11-07 12:56:27 -06:00
parent c0d7d96199
commit 9606aac46a

View File

@ -5,7 +5,7 @@
Summary: C++ user interface toolkit
Name: fltk
Version: 1.3.0
Release: 2%{?dist}
Release: 3%{?dist}
# see COPYING (or http://www.fltk.org/COPYING.php ) for exceptions details
License: LGPLv2+ with exceptions
@ -28,13 +28,14 @@ Patch5: fltk-1.1.8-fluid_desktop.patch
Patch8: fltk-1.3.0-rh708185.patch
BuildRequires: desktop-file-utils
BuildRequires: libICE-devel
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
BuildRequires: libGL-devel libGLU-devel
BuildRequires: libSM-devel
BuildRequires: libXext-devel libXinerama-devel libXft-devel libXt-devel libX11-devel
BuildRequires: xorg-x11-proto-devel xorg-x11-utils
BuildRequires: pkgconfig(libpng)
BuildRequires: pkgconfig(gl) pkgconfig(glu)
BuildRequires: pkgconfig(ice)
BuildRequires: pkgconfig(sm)
BuildRequires: pkgconfig(xext) pkgconfig(xinerama) pkgconfig(xft) pkgconfig(xt) pkgconfig(x11)
BuildRequires: pkgconfig(xproto)
BuildRequires: xorg-x11-utils
BuildRequires: zlib-devel
%description
@ -47,9 +48,8 @@ It provides modern GUI functionality without the bloat, and supports
Summary: Development files for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: libstdc++-devel
Requires: libGL-devel libGLU-devel
Requires: libXft-devel libXext-devel
Requires: libX11-devel libSM-devel libICE-devel
Requires: pkgconfig(ice) pkgconfig(sm)
Requires: pkgconfig(xft) pkgconfig(xt) pkgconfig(x11)
%description devel
%{summary}.
@ -132,24 +132,8 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/fluid.desktop
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%post fluid
touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
%postun fluid
if [ $1 -eq 0 ] ; then
update-desktop-database -q &> /dev/null
touch --no-create %{_datadir}/icons/hicolor &> /dev/null
gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
fi
%posttrans fluid
update-desktop-database -q &> /dev/null
gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
%files
%defattr(-,root,root,-)
%doc ANNOUNCEMENT CHANGES COPYING CREDITS README
@ -179,6 +163,20 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
%{_libdir}/libfltk_gl.a
%{_libdir}/libfltk_images.a
%post fluid
touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
%postun fluid
if [ $1 -eq 0 ] ; then
update-desktop-database -q &> /dev/null
touch --no-create %{_datadir}/icons/hicolor &> /dev/null
gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
fi
%posttrans fluid
update-desktop-database -q &> /dev/null
gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
%files fluid
%defattr(-,root,root,-)
%{_bindir}/fluid
@ -190,6 +188,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
%changelog
* Mon Nov 07 2011 Rex Dieter <rdieter@fedoraproject.org> 1.3.0-3
- rebuild (libpng)
- pkgconfig-style deps
* Thu Aug 25 2011 Rex Dieter <rdieter@fedoraproject.org> 1.3.0-2
- fltk-config inconsistency on ARM (#733421)