rpms/gtk2
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Fight unnecessary library dependencies

Browse Source
This commit is contained in:
Matthias Clasen 2008-11-24 05:52:16 +00:00
parent 4f1767ea8a
commit 15ae31a42a
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gtk2.spec
View File

@ -16,7 +16,7 @@
Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
Name: gtk2 Name: gtk2
Version: %{base_version} Version: %{base_version}
Release: 3%{?dist} Release: 4%{?dist}
License: LGPLv2+ License: LGPLv2+
Group: System Environment/Libraries Group: System Environment/Libraries
Source: http://download.gnome.org/sources/gtk+/2.14/gtk+-%{version}.tar.bz2 Source: http://download.gnome.org/sources/gtk+/2.14/gtk+-%{version}.tar.bz2
@ -123,12 +123,8 @@ docs for the GTK+ widget toolkit.
%patch3 -p1 -b .randr-fix %patch3 -p1 -b .randr-fix
%patch4 -p0 -b .fallback-file-icon %patch4 -p0 -b .fallback-file-icon
for i in config.guess config.sub ; do
test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
done
%build %build
libtoolize --force libtoolize --force --copy
# Patch0 modifies gdk-pixbuf/Makefile.am # Patch0 modifies gdk-pixbuf/Makefile.am
aclocal-1.7 aclocal-1.7
@ -143,6 +139,9 @@ fi
%configure --with-xinput=xfree --disable-gtk-doc --disable-rebuilds --with-included-loaders=png %configure --with-xinput=xfree --disable-gtk-doc --disable-rebuilds --with-included-loaders=png
# fight unused direct deps
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
## smp_mflags doesn't work for now due to gdk-pixbuf.loaders, may be fixed ## smp_mflags doesn't work for now due to gdk-pixbuf.loaders, may be fixed
## past gtk 2.1.2 ## past gtk 2.1.2
make #%{?_smp_mflags} make #%{?_smp_mflags}
@ -153,7 +152,7 @@ make #%{?_smp_mflags}
# problems in our ia64 multilib infrastructure # problems in our ia64 multilib infrastructure
# See https://bugzilla.redhat.com/show_bug.cgi?id=253726 for more details # See https://bugzilla.redhat.com/show_bug.cgi?id=253726 for more details
echo 'int main (void) { return 0; }' > relocation-tag.c echo 'int main (void) { return 0; }' > relocation-tag.c
gcc -Os relocation-tag.c -o .relocation-tag gcc -Os relocation-tag.c -o relocation-tag
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
@ -239,7 +238,7 @@ mkdir -p $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/%{bin_version}/filesystems
# we need to install a binary in the immodules directory to make sure # we need to install a binary in the immodules directory to make sure
# that it gets properly relocated to /emul for ia64 emulation of x86 # that it gets properly relocated to /emul for ia64 emulation of x86
# See https://bugzilla.redhat.com/show_bug.cgi?id=253726 # See https://bugzilla.redhat.com/show_bug.cgi?id=253726
install -m 0644 .relocation-tag $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/immodules install -m 0755 relocation-tag $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/immodules
# #
# We need the substitution of $host so we use an external # We need the substitution of $host so we use an external
@ -257,8 +256,7 @@ rm -rf $RPM_BUILD_ROOT
/usr/bin/update-gdk-pixbuf-loaders %{_host} /usr/bin/update-gdk-pixbuf-loaders %{_host}
/usr/bin/update-gtk-immodules %{_host} /usr/bin/update-gtk-immodules %{_host}
%postun %postun -p /sbin/ldconfig
/sbin/ldconfig
%files -f gtk20.lang %files -f gtk20.lang
%defattr(-, root, root) %defattr(-, root, root)
@ -282,7 +280,7 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/themes/Emacs %{_datadir}/themes/Emacs
%{_datadir}/themes/Raleigh %{_datadir}/themes/Raleigh
%dir %{_sysconfdir}/gtk-2.0 %dir %{_sysconfdir}/gtk-2.0
%{_sysconfdir}/gtk-2.0/im-multipress.conf %config(noreplace) %{_sysconfdir}/gtk-2.0/im-multipress.conf
%files devel -f gtk20-properties.lang %files devel -f gtk20-properties.lang
%defattr(-, root, root) %defattr(-, root, root)
@ -303,6 +301,10 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/gtk-2.0 %{_datadir}/gtk-2.0
%changelog %changelog
* Sun Nov 23 2008 Matthias Clasen <mclasen@redhat.com> - 2.14.4-4
- Reduce rpmlint warnings produced by the ia64 multilib hack
- Fight unnecessary library dependencies
* Fri Oct 24 2008 Alexander Larsson <alexl@redhat.com> - 2.14.4-3 * Fri Oct 24 2008 Alexander Larsson <alexl@redhat.com> - 2.14.4-3
- Manually check for fallback file icon since we're not - Manually check for fallback file icon since we're not
always returning that from gio anymore (from upstream) always returning that from gio anymore (from upstream)