Accepting request 47693 from X11:common:Factory

checked in (request 47693)

OBS-URL: https://build.opensuse.org/request/show/47693
OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/desktop-file-utils?expand=0&rev=14

desktop-file-utils-0.16.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7960be4bf7aa4b4698e8ea333cfa0bbfa7a169029e85d6a8b5390f625155c9a3
+size 282640

desktop-file-utils-0.17.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f1028fe6060575af4431cddc4c98dcf72bcdd3942b5fd5458ba36f5ab0ce3c0b
-size 280494

desktop-file-utils.changes

@@ -1,21 +1,3 @@
--------------------------------------------------------------------
-Fri Sep 10 12:34:14 CEST 2010 - vuntz@opensuse.org
-
-- Update to version 0.17:
-  + desktop-file-validate:
-    - accept chemical/* mime types as valid types
-    - make icon names with an extension for Icon key a non-fatal
-      error
-  + update-desktop-database:
-    - accept chemical/* mime types as valid types
-    - ignore --verbose if --quiet is also passed
-    - make sure to always output lists in the keyfile we generate
-  + misc:
-    - improve build system
-    - update documentation
-    - add man pages
-- Tag desktop-file-utils-suse-keys.patch.
-
 -------------------------------------------------------------------
 Wed Mar 10 04:21:26 CET 2010 - vuntz@opensuse.org
 

desktop-file-utils.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package desktop-file-utils (Version 0.17)
+# spec file for package desktop-file-utils (Version 0.16)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -15,25 +15,23 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+# norootforbuild
 
 
 Name:           desktop-file-utils
-Version:        0.17
-Release:        1
+BuildRequires:  glib2-devel pkg-config
 License:        GPLv2+
-Summary:        Utilities for Manipulating Desktop Files
-Url:            http://www.freedesktop.org/wiki/Software/desktop-file-utils
 Group:          Development/Tools/Other
+Version:        0.16
+Release:        1
 Source0:        %{name}-%{version}.tar.bz2
 Source1:        SuSEconfig.desktop-file-utils
-# PATCH-FEATURE-OPENSUSE desktop-file-utils-suse-keys.patch vuntz@opensuse.org -- Handle SUSE-specific keys in validator. This is not strictly necessary, since they are prefixed with X-, but we can verify that the value has the right type.
 Patch0:         desktop-file-utils-suse-keys.patch
-BuildRequires:  glib2-devel
-BuildRequires:  pkg-config
-PreReq:         /bin/rm
-PreReq:         /bin/rmdir
+PreReq:         /bin/rm /bin/rmdir
 Requires:       aaa_base
+Url:            http://www.freedesktop.org/wiki/Software/desktop-file-utils
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Summary:        Utilities for Manipulating Desktop Files
 
 %description
 This packages contains a couple of command line utilities for
@@ -43,13 +41,13 @@ More information about desktop files can be found at:
 http://freedesktop.org/wiki/Specifications/desktop-entry-spec
 
 %prep
-%setup -q
+%setup
 %patch0
 
 %build
 %configure \
         --with-lispdir=%{_datadir}/emacs/site-lisp
-%__make %{?_smp_mflags}
+make %{?jobs:-j%jobs}
 
 %install
 %makeinstall
@@ -59,14 +57,14 @@ http://freedesktop.org/wiki/Specifications/desktop-entry-spec
 test ! -f %{buildroot}%{_datadir}/emacs/site-lisp/desktop-entry-mode.el
 install -D -m644 misc/desktop-entry-mode.el %{buildroot}%{_datadir}/emacs/site-lisp/desktop-entry-mode.el
 # SuSEconfig script
-mkdir -p %{buildroot}/sbin/conf.d
-install %{S:1} %{buildroot}/sbin/conf.d
+mkdir -p $RPM_BUILD_ROOT/sbin/conf.d
+install %{S:1} $RPM_BUILD_ROOT/sbin/conf.d
 # Create ghosts based on default $XDG_DATA_DIRS:
-mkdir -p %{buildroot}%{_datadir}/applications
-touch %{buildroot}%{_datadir}/applications/mimeinfo.cache
+mkdir -p $RPM_BUILD_ROOT/usr/share/applications
+touch $RPM_BUILD_ROOT/usr/share/applications/mimeinfo.cache
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 %postun
 # It is not allowed by FHS to own this file in RPM package, but we can
@@ -80,17 +78,12 @@ fi
 %files
 %defattr(-, root, root)
 %doc AUTHORS COPYING ChangeLog NEWS README
-%{_bindir}/desktop-file-install
-%{_bindir}/desktop-file-validate
-%{_bindir}/update-desktop-database
-%ghost %{_datadir}/applications/mimeinfo.cache
-%{_mandir}/man1/desktop-file-install.1*
-%{_mandir}/man1/desktop-file-validate.1*
-%{_mandir}/man1/update-desktop-database.1*
+%{_bindir}/*
 # Own directories to not require emacs installed.
 %dir %{_datadir}/emacs
 %dir %{_datadir}/emacs/site-lisp
 %{_datadir}/emacs/site-lisp/*.el*
+%ghost %{_datadir}/applications/mimeinfo.cache
 /sbin/conf.d/SuSEconfig.*
 
 %changelog