Accepting request 50779 from GNOME:Factory

checked in (request 50779)

OBS-URL: https://build.opensuse.org/request/show/50779
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/shared-mime-info?expand=0&rev=15

macros.shared-mime-info

@@ -1,40 +0,0 @@
-# RPM macros for packages installing a MIME type according to the XDG specification
-#
-###
-#
-# When a package installs a MIME type as per the XDG specification, it should
-# use both macros:
-#
-#  - %mime_database_post in %post
-#  - %mime_database_postun in %postun
-#
-# Note that these macros can optionally take as argument the directory
-# where the MIME type is installed. If no argument is passed, then
-# %{_datadir}/mime will be used (which is where applications usually install
-# the MIME type information).
-#
-###
-
-# On install, update the mime database
-%mime_database_post()                                          \
-if test -x %{_bindir}/update-mime-database; then               \
-%if "x%1" != "x%%1"                                            \
-  %{_bindir}/update-mime-database "%1" || true                 \
-%else                                                          \
-  %{_bindir}/update-mime-database "%{_datadir}/mime" || true   \
-%endif                                                         \
-fi 
-
-# On uninstall, update the mime database. Note: we ignore upgrades (already
-# handled in %post of the new package).
-%mime_database_postun()                                        \
-if [ $1 -eq 0 ]; then                                          \
-  if test -x %{_bindir}/update-mime-database; then             \
-    %{_bindir}/update-mime-database "${MIME_DIR}" || true      \
-%if "x%1" != "x%%1"                                            \
-    %{_bindir}/update-mime-database "%1" || true               \
-%else                                                          \
-    %{_bindir}/update-mime-database "%{_datadir}/mime" || true \
-%endif                                                         \
-  fi                                                           \
-fi

shared-mime-info-0.71.tar.bz2

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

shared-mime-info-0.80.tar.bz2

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

shared-mime-info.changes

@@ -1,58 +1,3 @@
--------------------------------------------------------------------
-Thu Oct  7 14:09:38 CEST 2010 - vuntz@opensuse.org
-
-- Add rpm macros to update the mime database: %mime_database_post
-  and %mime_database_postun.
-- Update %post to never fail, and to not redirect the output to
-  /dev/null: if there is output, then it's important.
-
--------------------------------------------------------------------
-Fri Oct  1 19:40:56 CEST 2010 - vuntz@opensuse.org
-
-- Update to version 0.80:
-  + Mime-type Changes:
-    - Add magic for F4V (Flash) video files
-    - Add mime-type for Dia shapes
-    - Bump priority for KOffice magics to give them precedence over
-      gzip and zip
-    - Add mime-type for Verilog and SystemVerilog source files and
-      headers
-    - Add Qt Linguist translation file
-    - Add application/x-xspf+xml alias for XSPF playlists
-    - Use audio/flac for FLAC files, make audio/x-flac an alias of
-      it
-    - Add mime-type for HDF files
-    - Add mime-type for Mozilla Extension packages
-    - Add mime-type for text/cache-manifest
-    - Add YAML mime-type
-    - Add application/relax-ng-compact-syntax mime-type
-    - Add more tests for Matlab and Octave files
-    - Improve translator comments for VCD, SVCD and PictureCD
-    - Add application/pkcs8 mime-type
-    - Add audio and video WebM mime-types
-    - Add video/mp2t mime-type
-    - Use generic video icon for application/x-matroska
-    - Improve magic for Matroska files
-    - Add magic for audio/x-stm
-    - Update magic for Apple HTTP Streaming playlists
-    - Add Lrzip archive mime-type
-    - Fix PDF detection for some pesky files
-    - Add details about 3GPP and 3GPP2 files
-    - Add JavaFX video format
-    - Add Windows Imaging Format Disk Image mime-type
-    - Add application/x-apple-diskimage mime-type
-    - Add e-book reader content-type
-    - Add application/x-tex as an alias for text/x-tex
-    - Use application/oxps mime-type for XPS files
-    - Add magic to BibTeX files
-  + Other:
-    - Fix malformed D source test
-    - Avoid using ~/.local data when running the test suite
-    - Make sure that update-mime-info doesn't get called before
-      installed
-- Remove workaround for ar locale (which was renamed from ara):
-  fixed upstream.
-
 -------------------------------------------------------------------
 Sat Aug  7 15:01:19 CEST 2010 - vuntz@opensuse.org
 

shared-mime-info.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package shared-mime-info (Version 0.80)
+# spec file for package shared-mime-info (Version 0.71)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -23,15 +23,14 @@ BuildRequires:  glib2-devel
 BuildRequires:  intltool
 BuildRequires:  libxml2-devel
 BuildRequires:  translation-update-upstream
-Version:        0.80
+Version:        0.71
-Release:        1
+Release:        7
 Url:            http://freedesktop.org/wiki/Software/shared-mime-info
 Group:          System/X11/Utilities
 License:        GPLv2+
 Summary:        Shared MIME Database
 Source:         %{name}-%{version}.tar.bz2
 Source1:        mime-info-to-mime
-Source2:        macros.shared-mime-info
 # needed by mime-info-to-mime:
 Requires:       /bin/rm /bin/mkdir /usr/bin/fgrep
 # needed by update-mime-database
@@ -50,6 +49,9 @@ This package contains:
 
 %prep
 %setup -q
+# Fix issue with locale arabic locale (fdo#26519)
+mv po/ara.po po/ar.po
+sed -i s/ara/ar/ po/LINGUAS
 translation-update-upstream
 
 %build
@@ -60,14 +62,12 @@ translation-update-upstream
 %makeinstall
 install %{S:1} $RPM_BUILD_ROOT%{_bindir}/
 %find_lang %{name}
-# Install rpm macros
-install -D -m644 %{S:2} %{buildroot}%{_sysconfdir}/rpm/macros.shared-mime-info
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%{_bindir}/update-mime-database %{_datadir}/mime || true
+usr/bin/update-mime-database usr/share/mime >/dev/null
 
 %files -f %{name}.lang
 %defattr (-, root, root)
@@ -77,6 +77,5 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pkgconfig/*.pc
 %ghost %{_datadir}/mime/[a-ms-vxX]*
 %{_mandir}/man?/*.*
-%{_sysconfdir}/rpm/macros.shared-mime-info
 
 %changelog