From 9ecd7e04ca80c82566d8c32b17cf0be4de1a606c Mon Sep 17 00:00:00 2001
From: Linus Walleij <linus.walleij@stericsson.com>
Date: Jan 08 2011 23:47:50 +0000
Subject: Update to 1.0.4


---

diff --git a/.gitignore b/.gitignore
index 0b3d3d4..833dcb6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 libmtp-1.0.3.tar.gz
+/libmtp-1.0.4.tar.gz
diff --git a/libmtp.spec b/libmtp.spec
index 63251dd..574ac2e 100644
--- a/libmtp.spec
+++ b/libmtp.spec
@@ -2,8 +2,8 @@
 # RPM repository.
 
 Name:           libmtp
-Version:        1.0.3
-Release:        7%{?dist}
+Version:        1.0.4
+Release:        1%{?dist}
 Summary:        A software library for MTP media players
 URL:            http://libmtp.sourceforge.net/
 
@@ -53,10 +53,8 @@ library for MTP media players.
 %setup -q
 
 %build
-%configure --disable-static --program-prefix=mtp-
+%configure --disable-static
 make %{?_smp_mflags}
-# Remove permissions from udev rules, but register for ACL management
-examples/hotplug -a"SYMLINK+=\"libmtp-%k\", ENV{ID_MTP_DEVICE}=\"1\", ENV{ID_MEDIA_PLAYER}=\"1\", TAG+=\"udev-acl\"" > libmtp.rules
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -108,6 +106,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-, root,root,-)
 %{_libdir}/*.so.*
 /lib/udev/rules.d/*
+/lib/udev/mtp-probe
 
 %files hal
 %defattr(-, root,root,-)
@@ -127,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Jan 9 2011 Linus Walleij <triad@df.lth.se> 1.0.4-1
+- New upstream version with mucho udev fixes.
+
 * Wed Dec 1 2010 Linus Walleij <triad@df.lth.se> 1.0.3-7
 - Now even with correct commas and stuff in udev actions.
 
diff --git a/sources b/sources
index 499936c..0a06418 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a972869860765476e52f2eba45f2b91e  libmtp-1.0.3.tar.gz
+a9ae962c72cc46988409ce19d60c5850  libmtp-1.0.4.tar.gz