[packages/QtIOCompressor] cleanups

[glen]

commit 105a26c0eb0f96ffcae1379de85cdf5c5c357bc1
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Tue Feb 24 23:57:53 2015 +0200

    cleanups

 QtIOCompressor.spec | 29 ++++++++---------------------
 1 file changed, 8 insertions(+), 21 deletions(-)
---
diff --git a/QtIOCompressor.spec b/QtIOCompressor.spec
index 307d814..ba89205 100644
--- a/QtIOCompressor.spec
+++ b/QtIOCompressor.spec
@@ -4,11 +4,11 @@ Version:	2.3
 Release:	1
 License:	GPL v3 or LGPL v2 with exceptions
 Group:		Libraries
-URL:		http://qt.nokia.com/products/appdev/add-on-products/catalog/4/Utilities/qtiocompressor
 Source0:	http://get.qt.nokia.com/qt/solutions/lgpl/qtiocompressor-%{version}_1-opensource.tar.gz
 # Source0-md5:	73bbde56cf705602b4f180b379756a40
 Source1:	qtiocompressor.prf
 Patch0:		libs.patch
+URL:		http://doc.qt.digia.com/solutions/4/qtiocompressor/qtiocompressor.html
 BuildRequires:	QtCore-devel
 BuildRequires:	QtGui-devel
 BuildRequires:	qt4-build
@@ -16,7 +16,7 @@ BuildRequires:	qt4-qmake
 BuildRequires:	sed >= 4.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_qt4_datadir	%{_datadir}/qt4
+%define		qt4dir	%{_datadir}/qt4
 
 %description
 The class works on top of a QIODevice subclass, compressing data
@@ -49,28 +49,17 @@ touch .licenseAccepted
 # Does not use GNU configure
 ./configure \
 	-library
-
 qmake-qt4
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-# libraries
-install -d $RPM_BUILD_ROOT%{_libdir}
+install -d $RPM_BUILD_ROOT{%{_libdir},%{_includedir}/qt4/QtSolutions,%{qt4dir}/mkspecs/features}
 cp -a lib/* $RPM_BUILD_ROOT%{_libdir}
 rm $RPM_BUILD_ROOT%{_libdir}/lib*.so.1.0
-
-# headers
-install -d $RPM_BUILD_ROOT%{_includedir}/QtSolutions
-cp -a \
-    src/qtiocompressor.h \
-    src/QtIOCompressor \
-    $RPM_BUILD_ROOT%{_includedir}/QtSolutions
-
-# specs
-install -d $RPM_BUILD_ROOT%{_qt4_datadir}/mkspecs/features
-cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_qt4_datadir}/mkspecs/features
+cp -p src/qtiocompressor.h src/QtIOCompressor $RPM_BUILD_ROOT%{_includedir}/qt4/QtSolutions
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{qt4dir}/mkspecs/features
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -88,8 +77,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc doc examples
 %{_libdir}/libQtSolutions_IOCompressor-%{version}.so
-%{_qt4_datadir}/mkspecs/features/qtiocompressor.prf
-# XXX dir shared dir with QtLockedFile.spec, add to qt4.spec
-%dir %{_includedir}/QtSolutions
-%{_includedir}/QtSolutions/QtIOCompressor
-%{_includedir}/QtSolutions/qtiocompressor.h
+%{qt4dir}/mkspecs/features/qtiocompressor.prf
+%{_includedir}/qt4/QtSolutions/QtIOCompressor
+%{_includedir}/qt4/QtSolutions/qtiocompressor.h
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/QtIOCompressor.git/commitdiff/fa03d4cab18527b39ddab0770402bb6b4327817f