[arch-commits] Commit in shared-mime-info/repos (4 files)

[Eric Bélanger]

    Date: Saturday, February 6, 2010 @ 03:33:20
  Author: eric
Revision: 67312

Merged revisions 67311 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/shared-mime-info/trunk

........
  r67311 | eric | 2010-02-06 03:33:01 -0500 (Sat, 06 Feb 2010) | 2 lines
  
  upgpkg: shared-mime-info 0.71-1
      Upstream update, Fixed freedesktop.org.xml for portable pixmaps (close FS#17253), Removed leading slash in install scriptlet
........

Added:
  shared-mime-info/repos/extra-i686/pbm.patch
    (from rev 67311, shared-mime-info/trunk/pbm.patch)
Modified:
  shared-mime-info/repos/extra-i686/	(properties)
  shared-mime-info/repos/extra-i686/PKGBUILD
  shared-mime-info/repos/extra-i686/shared-mime-info.install

--------------------------+
 PKGBUILD                 |   10 +++++----
 pbm.patch                |   49 +++++++++++++++++++++++++++++++++++++++++++++
 shared-mime-info.install |    2 -
 3 files changed, 56 insertions(+), 5 deletions(-)


Property changes on: shared-mime-info/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /shared-mime-info/trunk:1-57078
   + /shared-mime-info/trunk:1-67311

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2010-02-06 08:33:01 UTC (rev 67311)
+++ extra-i686/PKGBUILD	2010-02-06 08:33:20 UTC (rev 67312)
@@ -2,8 +2,8 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=shared-mime-info
-pkgver=0.70
-pkgrel=2
+pkgver=0.71
+pkgrel=1
 pkgdesc="Freedesktop.org Shared MIME Info"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -11,11 +11,13 @@
 makedepends=('intltool' 'pkgconfig')
 install=shared-mime-info.install
 url="http://freedesktop.org/Software/shared-mime-info"
-source=(http://freedesktop.org/~hadess/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('9032d98f14b8e13e0fea4bf45ca23401')
+source=(http://freedesktop.org/~hadess/${pkgname}-${pkgver}.tar.bz2 pbm.patch)
+md5sums=('0a90508234d415f761a79fbffdff74f4' '39fcc08fbd33145684ba97f1f64644c2')
+sha1sums=('6f3d3379662857646b0c5b95d5d26e47c0b6250a' '1e8f1cf027e0ce4b5a88f0e36f4bab3ff2d320a5')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 -i "${srcdir}/pbm.patch" || return 1
   ./configure --prefix=/usr --disable-update-mimedb || return 1
   make || return 1
   make DESTDIR="${pkgdir}" install || return 1

Copied: shared-mime-info/repos/extra-i686/pbm.patch (from rev 67311, shared-mime-info/trunk/pbm.patch)
===================================================================
--- extra-i686/pbm.patch	                        (rev 0)
+++ extra-i686/pbm.patch	2010-02-06 08:33:20 UTC (rev 67312)
@@ -0,0 +1,49 @@
+diff -Naur shared-mime-info-0.70-orig/freedesktop.org.xml shared-mime-info-0.70/freedesktop.org.xml
+--- shared-mime-info-0.70-orig/freedesktop.org.xml	2010-02-06 02:39:24.000000000 -0500
++++ shared-mime-info-0.70/freedesktop.org.xml	2010-02-06 02:48:01.000000000 -0500
+@@ -17025,12 +17025,10 @@
+     <magic priority="50">
+       <match value="P1" type="string" offset="0">
+         <match value="0x0a" type="byte" offset="2">
+-	  <match value="#" type="string" offset="3"/>
+         </match>
+       </match>
+       <match value="P4" type="string" offset="0">
+         <match value="0x0a" type="byte" offset="2">
+-	  <match value="#" type="string" offset="3"/>
+         </match>
+       </match>
+     </magic>
+@@ -17074,12 +17072,10 @@
+     <magic priority="50">
+       <match value="P2" type="string" offset="0">
+         <match value="0x0a" type="byte" offset="2">
+-	  <match value="#" type="string" offset="3"/>
+         </match>
+       </match>
+       <match value="P5" type="string" offset="0">
+         <match value="0x0a" type="byte" offset="2">
+-	  <match value="#" type="string" offset="3"/>
+         </match>
+       </match>
+     </magic>
+@@ -17123,12 +17119,10 @@
+     <magic priority="50">
+       <match value="P3" type="string" offset="0">
+         <match value="0x0a" type="byte" offset="2">
+-	  <match value="#" type="string" offset="3"/>
+         </match>
+       </match>
+       <match value="P6" type="string" offset="0">
+         <match value="0x0a" type="byte" offset="2">
+-	  <match value="#" type="string" offset="3"/>
+ 	</match>
+       </match>
+     </magic>
+@@ -23926,4 +23920,4 @@
+     </treemagic>
+   </mime-type>
+ 
+-</mime-info>
+\ No newline at end of file
++</mime-info>

Modified: extra-i686/shared-mime-info.install
===================================================================
--- extra-i686/shared-mime-info.install	2010-02-06 08:33:01 UTC (rev 67311)
+++ extra-i686/shared-mime-info.install	2010-02-06 08:33:20 UTC (rev 67312)
@@ -1,5 +1,5 @@
 post_install() {
-  update-mime-database /usr/share/mime > /dev/null 2>&1
+  update-mime-database usr/share/mime > /dev/null 2>&1
 }
 
 post_upgrade() {