From 0c07662727bb514d5286722d5793420d84614a5567429bf0d16ea35199263be0 Mon Sep 17 00:00:00 2001 From: Marguerite Su Date: Thu, 10 Jul 2014 14:04:29 +0000 Subject: [PATCH] Accepting request 240209 from home:MargueriteSu:branches:hardware OBS-URL: https://build.opensuse.org/request/show/240209 OBS-URL: https://build.opensuse.org/package/show/hardware/libusbmuxd?expand=0&rev=4 --- libusbmuxd.changes | 5 +++++ libusbmuxd.spec | 22 +++++++--------------- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/libusbmuxd.changes b/libusbmuxd.changes index ab71d83..af023d1 100644 --- a/libusbmuxd.changes +++ b/libusbmuxd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jul 10 14:01:06 UTC 2014 - i@marguerite.su + +- clean specfile as DimStar suggested + ------------------------------------------------------------------- Mon Jun 16 17:14:14 UTC 2014 - i@marguerite.su diff --git a/libusbmuxd.spec b/libusbmuxd.spec index 68b48fd..cf6411e 100644 --- a/libusbmuxd.spec +++ b/libusbmuxd.spec @@ -1,7 +1,7 @@ # # spec file for package libusbmuxd # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,16 +24,12 @@ License: LGPL-2.1+ and GPL-2.0+ Group: System/Libraries Url: http://cgit.sukimashita.com/libusbmuxd.git/ Source: http://www.libimobiledevice.org/downloads/%{name}-%{version}.tar.bz2 -Source99: baselibs.conf +Source99: baselibs.conf BuildRequires: gcc-c++ BuildRequires: libplist-devel >= 1.11 BuildRequires: libusb-1_0-devel >= 1.0.3 BuildRequires: pkg-config -BuildRequires: pkgconfig(systemd) -BuildRequires: pkgconfig(udev) -Requires(pre): pwdutils BuildRoot: %{_tmppath}/%{name}-%{version}-build -%{?systemd_requires} %description 'usbmuxd' stands for "USB multiplexing daemon". This daemon is in charge of @@ -46,11 +42,8 @@ a virtual network device. This package contains the usbmuxd communication interface library 'libusbmuxd'. %package -n %{name}2 - Summary: A client library to multiplex connections from and to iOS devices Group: System/Libraries -Provides: %{name} = %{version} -Obsoletes: %{name} < %{version} %description -n %{name}2 'usbmuxd' stands for "USB multiplexing daemon". This daemon is in charge of @@ -62,13 +55,12 @@ a virtual network device. This package contains the usbmuxd communication interface library 'libusbmuxd'. -%package -n %{name}-devel - +%package devel Summary: Development files for %{name} Group: Development/Libraries/C and C++ -Requires: %{name} = %{version} +Requires: %{name}2 = %{version} -%description -n %{name}-devel +%description devel 'usbmuxd' stands for "USB multiplexing daemon". This daemon is in charge of multiplexing connections over USB to an iPhone or iPod touch. To users, it means you can sync your music, contacts, photos, etc. over USB. To developers, it @@ -106,7 +98,7 @@ notification and backup services running on the device). make %{?_smp_mflags} %install -make install DESTDIR=%{buildroot} +make DESTDIR=%{buildroot} install %{?_smp_mflags} rm %{buildroot}%{_libdir}/%{name}.*a @@ -119,7 +111,7 @@ rm %{buildroot}%{_libdir}/%{name}.*a %doc AUTHORS README %{_libdir}/libusbmuxd.so.* -%files -n %{name}-devel +%files devel %defattr(-,root,root,-) %{_includedir}/usbmuxd.h %{_includedir}/usbmuxd-proto.h