commit b0fdf0676653f6418d13c396e90775c81614dedc
Author: Jan Palus <[email protected]>
Date: Wed Oct 8 21:30:08 2014 +0200
- up to 1.1.8
- patches applied upstream
libmtp-jolla.patch | 19 ------------
libmtp.spec | 10 ++-----
stdout-pollution.patch | 78 --------------------------------------------------
3 files changed, 3 insertions(+), 104 deletions(-)
---
diff --git a/libmtp.spec b/libmtp.spec
index 1c2219c..63ce3fd 100644
--- a/libmtp.spec
+++ b/libmtp.spec
@@ -5,14 +5,12 @@
Summary: Implementation of Microsoft's Media Transfer Protocol (MTP)
Summary(pl.UTF-8): Implementacja protokołu MTP (Media Transfer Protocol)
Microsoftu
Name: libmtp
-Version: 1.1.6
-Release: 2
+Version: 1.1.8
+Release: 1
License: LGPL v2+
Group: Libraries
Source0:
http://downloads.sourceforge.net/libmtp/%{name}-%{version}.tar.gz
-# Source0-md5: 87835626dbcf39e62bfcdd4ae6da2063
-Patch0: stdout-pollution.patch
-Patch1: %{name}-jolla.patch
+# Source0-md5: f76abc22fdbe96e96f0066e0f2dc0efd
URL: http://libmtp.sourceforge.net/
BuildRequires: automake
%{?with_apidocs:BuildRequires: doxygen}
@@ -85,8 +83,6 @@ Reguły UDEV dla urządzeń libmtp.
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
%build
cp -f /usr/share/automake/config.sub .
diff --git a/libmtp-jolla.patch b/libmtp-jolla.patch
deleted file mode 100644
index 5fc3d3c..0000000
--- a/libmtp-jolla.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/src/music-players.h b/src/music-players.h
-index 1732197..845fbd4 100644
---- a/src/music-players.h
-+++ b/src/music-players.h
-@@ -2416,6 +2433,14 @@
- DEVICE_FLAGS_ANDROID_BUGS },
-
- /*
-+ * Jolla
-+ */
-+ { "Jolla", 0x2931, "Sailfish", 0x0a01,
-+ DEVICE_FLAGS_ANDROID_BUGS },
-+ { "Jolla", 0x2931, "Sailfish", 0x0a05,
-+ DEVICE_FLAGS_ANDROID_BUGS },
-+
-+ /*
- * Other strange stuff.
- */
- { "Isabella", 0x0b20, "Her Prototype", 0xddee, DEVICE_FLAG_NONE }
diff --git a/stdout-pollution.patch b/stdout-pollution.patch
deleted file mode 100644
index 785e6b2..0000000
--- a/stdout-pollution.patch
+++ /dev/null
@@ -1,78 +0,0 @@
---- libmtp-1.1.6/src/mtpz.c.orig 2013-05-14 18:57:23.417319178 +0200
-+++ libmtp-1.1.6/src/mtpz.c 2013-05-14 18:58:24.777318734 +0200
-@@ -119,7 +119,7 @@
- char *home = getenv("HOME");
- if (!home)
- {
-- LIBMTP_INFO("Unable to determine user's home directory, MTPZ
disabled");
-+ LIBMTP_ERROR("Unable to determine user's home directory, MTPZ
disabled");
- return -1;
- }
-
-@@ -130,7 +130,7 @@
- FILE *fdata = fopen(path, "r");
- if (!fdata)
- {
-- LIBMTP_INFO("Unable to open ~/.mtpz-data for reading, MTPZ
disabled.");
-+ LIBMTP_ERROR("Unable to open ~/.mtpz-data for reading, MTPZ
disabled.");
- return -1;
- }
-
-@@ -138,7 +138,7 @@
- MTPZ_PUBLIC_EXPONENT = (unsigned char *)fgets_strip((char *)malloc(8),
8, fdata);
- if (!MTPZ_PUBLIC_EXPONENT)
- {
-- LIBMTP_INFO("Unable to read MTPZ public exponent from
~/.mtpz-data, MTPZ disabled");
-+ LIBMTP_ERROR("Unable to read MTPZ public exponent from
~/.mtpz-data, MTPZ disabled");
- return -1;
- }
-
-@@ -146,20 +146,20 @@
- char *hexenckey = (unsigned char *)fgets_strip((char *)malloc(35), 35,
fdata);
- if (!hexenckey)
- {
-- LIBMTP_INFO("Unable to read MTPZ encryption key from
~/.mtpz-data, MTPZ disabled");
-+ LIBMTP_ERROR("Unable to read MTPZ encryption key from
~/.mtpz-data, MTPZ disabled");
- return -1;
- }
- MTPZ_ENCRYPTION_KEY = hex_to_bytes(hexenckey, strlen(hexenckey));
- if (!MTPZ_ENCRYPTION_KEY)
- {
-- LIBMTP_INFO("Unable to read MTPZ encryption key from
~/.mtpz-data, MTPZ disabled");
-+ LIBMTP_ERROR("Unable to read MTPZ encryption key from
~/.mtpz-data, MTPZ disabled");
- }
-
- // Should only be 256 characters in length, but fgets will encounter a
newline and stop.
- MTPZ_MODULUS = (unsigned char *)fgets_strip((char *)malloc(260), 260,
fdata);
- if (!MTPZ_MODULUS)
- {
-- LIBMTP_INFO("Unable to read MTPZ modulus from ~/.mtpz-data,
MTPZ disabled");
-+ LIBMTP_ERROR("Unable to read MTPZ modulus from ~/.mtpz-data,
MTPZ disabled");
- return -1;
- }
-
-@@ -167,7 +167,7 @@
- MTPZ_PRIVATE_KEY = (unsigned char *)fgets_strip((char *)malloc(260),
260, fdata);
- if (!MTPZ_PRIVATE_KEY)
- {
-- LIBMTP_INFO("Unable to read MTPZ private key from ~/.mtpz-data,
MTPZ disabled");
-+ LIBMTP_ERROR("Unable to read MTPZ private key from
~/.mtpz-data, MTPZ disabled");
- return -1;
- }
-
-@@ -175,13 +175,13 @@
- char *hexcerts = fgets_strip((char *)malloc(1260), 1260, fdata);
- if (!hexcerts)
- {
-- LIBMTP_INFO("Unable to read MTPZ certificates from
~/.mtpz-data, MTPZ disabled");
-+ LIBMTP_ERROR("Unable to read MTPZ certificates from
~/.mtpz-data, MTPZ disabled");
- return -1;
- }
- MTPZ_CERTIFICATES = hex_to_bytes(hexcerts, strlen(hexcerts));
- if (!MTPZ_CERTIFICATES)
- {
-- LIBMTP_INFO("Unable to parse MTPZ certificates from
~/.mtpz-data, MTPZ disabled");
-+ LIBMTP_ERROR("Unable to parse MTPZ certificates from
~/.mtpz-data, MTPZ disabled");
- return -1;
- }
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libmtp.git/commitdiff/b0fdf0676653f6418d13c396e90775c81614dedc
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
