[qoauth] pkgconfig-style build deps, use %qmake_qt4 macro, tighten %files

Rex Dieter rdieter at fedoraproject.org
Mon Dec 1 16:50:37 UTC 2014


commit 04d209542ebfe59ed5497b2f27b4001d0dac16d2
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Dec 1 10:50:40 2014 -0600

    pkgconfig-style build deps, use %qmake_qt4 macro, tighten %files

 qoauth.spec |   27 +++++++++++++++------------
 1 files changed, 15 insertions(+), 12 deletions(-)
---
diff --git a/qoauth.spec b/qoauth.spec
index 5259066..354be21 100644
--- a/qoauth.spec
+++ b/qoauth.spec
@@ -4,8 +4,8 @@
 
 Name:		qoauth
 Version:	1.0.1
-Release:	9%{?posttag}%{?dist}
-Summary:	Qt-based C++ library for OAuth authorization scheme
+Release:	10%{?posttag}%{?dist}
+Summary:	Qt library OAuth authorization scheme
 License:	LGPLv2+
 URL:		http://github.com/ayoy/qoauth
 Source0:	http://files.ayoy.net/qoauth/release/%{version}/src/%{name}-%{version}-src.tar.bz2
@@ -15,7 +15,9 @@ Source0:	http://files.ayoy.net/qoauth/release/%{version}/src/%{name}-%{version}-
 ExcludeArch: ppc64
 %endif
 
-BuildRequires:	qt4-devel qca2-devel doxygen
+BuildRequires:	doxygen
+BuildRequires:	pkgconfig(QtCore) pkgconfig(QtNetwork)
+BuildRequires:	pkgconfig(qca2)
 BuildRequires:	qca-ossl
 Requires:	qca-ossl%{?_isa}
 
@@ -26,8 +28,6 @@ OAuth authorization scheme.
 %package devel
 Summary:	Development files for the Qt OAuth support library
 Requires:	%{name}%{?_isa} = %{version}-%{release}
-Requires:	qt4-devel%{?_isa}
-Requires:	qca2-devel%{?_isa}
 
 %description devel
 The %{name}-devel package contains libraries, header files and documentations 
@@ -41,7 +41,7 @@ sed -i -e 's\/lib\/%{_lib}\g' src/pcfile.sh
 
 %build
 export PATH=%{_qt4_bindir}:$PATH
-%{_qt4_qmake} PREFIX="%{_prefix}"
+%{qmake_qt4} PREFIX="%{_prefix}"
 make %{?_smp_mflags}
 
 doxygen Doxyfile
@@ -62,17 +62,20 @@ make check || :
 
 %files
 %doc README CHANGELOG LICENSE
-%{_libdir}/*.so.*
+%{_libdir}/libqoauth.so.1*
 
 %files devel
 %doc doc/html doc/examples
-%{_libdir}/*.so
-%{_libdir}/*.prl
-%{_libdir}/pkgconfig/*.pc
-%{_qt4_prefix}/mkspecs/features/*.prf
-%{_includedir}/*
+%{_libdir}/libqoauth.so
+%{_libdir}/libqoauth.prl
+%{_libdir}/pkgconfig/qoauth.pc
+%{_qt4_prefix}/mkspecs/features/oauth.prf
+%{_includedir}/QtOAuth/
 
 %changelog
+* Mon Dec 01 2014 Rex Dieter <rdieter at fedoraproject.org> 1.0.1-10
+- pkgconfig-style build deps, use %%qmake_qt4 macro, tighten %%files
+
 * Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 


More information about the scm-commits mailing list