From b9884df7151533e20de962d3cb7cb8a9a761a75fbbc05b3df9cb2ec9b1d0b3d1 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Mon, 17 Dec 2018 15:59:11 +0000
Subject: [PATCH] Accepting request 658052 from
 home:pluskalm:branches:devel:libraries:c_c++

- Small packaging cleanup

OBS-URL: https://build.opensuse.org/request/show/658052
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libmtp?expand=0&rev=100
---
 libmtp.changes |  5 +++++
 libmtp.spec    | 57 +++++++++++++++++++++-----------------------------
 2 files changed, 29 insertions(+), 33 deletions(-)

diff --git a/libmtp.changes b/libmtp.changes
index 3f5139a..b1f0231 100644
--- a/libmtp.changes
+++ b/libmtp.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Dec 14 13:25:50 UTC 2018 - Martin Pluskal <mpluskal@suse.com>
+
+- Small packaging cleanup
+
 -------------------------------------------------------------------
 Sat Oct 27 17:09:08 UTC 2018 - meissner@suse.com
 
diff --git a/libmtp.spec b/libmtp.spec
index 2c2d46c..643a35f 100644
--- a/libmtp.spec
+++ b/libmtp.spec
@@ -12,29 +12,28 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
-Name:           libmtp
-Url:            http://sf.net/projects/libmtp
-BuildRequires:  doxygen
-BuildRequires:  libgcrypt-devel
-BuildRequires:  libusb-1_0-devel
-BuildRequires:  pkg-config
-BuildRequires:  pkgconfig(udev)
-Summary:        Commandline utilities for access to MTP Players
-License:        LGPL-2.1+
-Group:          Productivity/Multimedia/Sound/Players
-Version:        1.1.16
-Release:        0
 %define sonum   9
-Source0:        http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/%{name}-%{version}.tar.gz
-Source1:        http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/%{name}-%{version}.tar.gz.asc
-Source2:        %name.keyring
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %{!?_udevrulesdir: %global _udevrulesdir %(pkg-config --variable=udevdir udev)/rules.d }
 %{!?_udevdir: %global _udevdir %(pkg-config --variable=udevdir udev) }
+Name:           libmtp
+Version:        1.1.16
+Release:        0
+Summary:        Commandline utilities for access to MTP Players
+License:        LGPL-2.1-or-later
+Group:          Productivity/Multimedia/Sound/Players
+URL:            http://sf.net/projects/libmtp
+Source0:        http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/%{name}-%{version}.tar.gz
+Source1:        http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/%{name}-%{version}.tar.gz.asc
+Source2:        %{name}.keyring
+BuildRequires:  doxygen
+BuildRequires:  libgcrypt-devel
+BuildRequires:  pkgconfig
+BuildRequires:  pkgconfig(libusb-1.0)
+BuildRequires:  pkgconfig(udev)
 
 %description
 This package contains binaries and documentation that allow access to
@@ -47,7 +46,7 @@ and others.
 %package     -n %{name}-udev
 Summary:        Udev rules for accessing MTP devices
 Group:          Hardware/Mobile
-Requires:       udev
+Requires:       pkgconfig(udev)
 
 %description -n %{name}-udev
 This package contains the udev rules that allow access to USB based media
@@ -95,39 +94,31 @@ echo 'HTML_TIMESTAMP=NO' >> doc/Doxyfile.in
 make %{?_smp_mflags}
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
+%make_install
 #install -d $RPM_BUILD_ROOT/usr/share/hal/fdi/information/20thirdparty/
 #install -c -m 644 libmtp.fdi $RPM_BUILD_ROOT/usr/share/hal/fdi/information/20thirdparty/10-usb-music-players-libmtp.fdi
-rm -rf %{buildroot}/usr/share/doc/libmtp*
-rm -rf %{buildroot}/%{_libdir}/*.la
+rm -rf %{buildroot}%{_datadir}/doc/libmtp*
+find %{buildroot} -type f -name "*.la" -delete -print
 
 %post -n   %{name}%{sonum} -p /sbin/ldconfig
 %postun -n %{name}%{sonum} -p /sbin/ldconfig
 
 %files -n mtp-tools
-%defattr(-, root, root)
-%{_prefix}/bin/*
+%{_bindir}/*
 
 %files -n %{name}%{sonum}
-%defattr(-, root, root)
-%doc COPYING README ChangeLog AUTHORS
+%license COPYING
+%doc README ChangeLog AUTHORS
 %{_libdir}/lib*.so.*
-#%dir /usr/share/hal
-#dir /usr/share/hal/fdi
-#dir /usr/share/hal/fdi/information
-#dir /usr/share/hal/fdi/information/20thirdparty/
-#usr/share/hal/fdi/information/20thirdparty/10-usb-music-players-libmtp.fdi
 
 %files -n %{name}-udev
-%defattr(-, root, root)
 %{_udevdir}
 %{_udevrulesdir}
 
 %files devel
-%defattr(-, root, root)
 %doc doc/html TODO
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/libmtp.pc
-%{_prefix}/include/libmtp.h
+%{_includedir}/libmtp.h
 
 %changelog