- Packaging issues: Remove unneeded desktop-file-utils requires Build with
--disable-static
This commit is contained in:
parent
8a878704d1
commit
6ec2074ace
@ -11,7 +11,7 @@
|
||||
Summary: File Roller is a tool for viewing and creating archives
|
||||
Name: file-roller
|
||||
Version: 2.17.90
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
|
||||
License: GPL
|
||||
Group: Applications/Archiving
|
||||
@ -34,13 +34,11 @@ BuildRequires: scrollkeeper
|
||||
BuildRequires: perl-XML-Parser
|
||||
|
||||
Requires(post): scrollkeeper
|
||||
Requires(post): desktop-file-utils >= %{desktop_file_utils_version}
|
||||
Requires(pre): GConf2
|
||||
Requires(post): GConf2
|
||||
Requires(preun): GConf2
|
||||
|
||||
Requires(postun): scrollkeeper
|
||||
Requires(postun): desktop-file-utils >= %{desktop_file_utils_version}
|
||||
|
||||
Requires: GConf2
|
||||
|
||||
@ -56,7 +54,7 @@ such as tar files.
|
||||
|
||||
%build
|
||||
autoconf
|
||||
%configure --disable-scrollkeeper
|
||||
%configure --disable-scrollkeeper --disable-static
|
||||
export tagname=CC
|
||||
make LIBTOOL=/usr/bin/libtool
|
||||
|
||||
@ -76,9 +74,6 @@ desktop-file-install --vendor gnome --delete-original \
|
||||
|
||||
rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
|
||||
|
||||
rm -f $RPM_BUILD_ROOT%{_libdir}/bonobo/*.la
|
||||
rm -f $RPM_BUILD_ROOT%{_libdir}/bonobo/*.a
|
||||
|
||||
rm -f $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-1.0/*.la
|
||||
rm -f $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-1.0/*.a
|
||||
|
||||
@ -90,7 +85,7 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/icon-theme.cache
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%post
|
||||
update-desktop-database -q
|
||||
update-desktop-database &> /dev/null || :
|
||||
scrollkeeper-update -q
|
||||
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
|
||||
gconftool-2 --makefile-install-rule \
|
||||
@ -115,7 +110,7 @@ if [ "$1" -eq 0 ]; then
|
||||
fi
|
||||
|
||||
%postun
|
||||
update-desktop-database -q
|
||||
update-desktop-database &> /dev/null || :
|
||||
scrollkeeper-update -q
|
||||
touch --no-create %{_datadir}/icons/hicolor
|
||||
if [ -x /usr/bin/gtk-update-icon-cache ]; then
|
||||
@ -137,6 +132,11 @@ fi
|
||||
%{_datadir}/icons/hicolor/scalable/apps/file-roller.svg
|
||||
|
||||
%changelog
|
||||
* Mon Feb 5 2007 Christopher Aillon <caillon@redhat.com> - 2.17.90-2
|
||||
- Packaging issues:
|
||||
Remove unneeded desktop-file-utils requires
|
||||
Build with --disable-static
|
||||
|
||||
* Mon Jan 22 2007 Matthias Clasen <mclasen@redhat.com> - 2.17.90-1
|
||||
- Update to 2.17.90
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user