From 11f633ccb42b80b8d8c88024739a8e8e8c9a86cf8338c06a2ff042e3b5a8b421 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 16 Jan 2007 16:14:07 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/desktop-file-utils?expand=0&rev=2 --- SuSEconfig.desktop-file-utils | 2 +- desktop-file-utils.changes | 6 ++++++ desktop-file-utils.spec | 24 ++++++++++-------------- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/SuSEconfig.desktop-file-utils b/SuSEconfig.desktop-file-utils index f74e69e..2034c4a 100644 --- a/SuSEconfig.desktop-file-utils +++ b/SuSEconfig.desktop-file-utils @@ -8,7 +8,7 @@ if test -z "$XDG_DATA_DIRS" ; then . /etc/profile.d/xdg-enviroment.sh fi -/opt/gnome/bin/update-desktop-database +/usr/bin/update-desktop-database # # end diff --git a/desktop-file-utils.changes b/desktop-file-utils.changes index ec61ea7..7361b46 100644 --- a/desktop-file-utils.changes +++ b/desktop-file-utils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jan 15 18:07:26 CET 2007 - sbrabec@suse.cz + +- Spec file cleanup. +- Fixed path in SuSEconfig.desktop-file-utils. + ------------------------------------------------------------------- Mon Jan 8 00:08:19 CET 2007 - ro@suse.de diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index bf53474..2405777 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -12,12 +12,11 @@ Name: desktop-file-utils BuildRequires: emacs-nox glib2-devel pkg-config popt-devel update-desktop-files -%define prefix /usr License: GNU General Public License (GPL) Group: Development/Tools/Other Autoreqprov: on Version: 0.11 -Release: 19 +Release: 22 Source: %{name}-%{version}.tar.bz2 Source1: SuSEconfig.desktop-file-utils PreReq: /bin/rm /bin/rmdir @@ -42,19 +41,13 @@ Authors: %prep %setup -%{?suse_update_config:%{suse_update_config}} %build -export CFLAGS="$RPM_OPT_FLAGS" -./configure \ - --prefix=%{prefix} \ - --libdir=%{prefix}/%_lib \ - --sysconfdir=/etc \ - --with-lispdir=/usr/share/emacs/site-lisp -make +%configure\ + --with-lispdir=/usr/share/emacs/site-lisp +make %{?jobs:-j%jobs} %install -rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install mkdir -p $RPM_BUILD_ROOT/sbin/conf.d install %{S:1} $RPM_BUILD_ROOT/sbin/conf.d @@ -83,10 +76,10 @@ fi %files %defattr(-, root, root) %doc AUTHORS COPYING ChangeLog NEWS README -%prefix/bin/* -/usr/share/emacs/site-lisp/*.el* +%{_bindir}/* +%{_datadir}/emacs/site-lisp/*.el* +%ghost %{_datadir}/applications/mimeinfo.cache /sbin/conf.d/SuSEconfig.* -%ghost /usr/share/applications/mimeinfo.cache # Own directories to not require KDE installed. %dir /etc/opt/kde3 %dir /etc/opt/kde3/share @@ -100,6 +93,9 @@ fi %ghost /usr/share/applications/mimeinfo.cache %changelog -n desktop-file-utils +* Mon Jan 15 2007 - sbrabec@suse.cz +- Spec file cleanup. +- Fixed path in SuSEconfig.desktop-file-utils. * Mon Jan 08 2007 - ro@suse.de - GNOME moved to /usr * Fri Oct 20 2006 - sbrabec@suse.cz