[qjson] 0.7.1-8

[Rex Dieter]

commit ff12bd13df09bd3d62381bd0a0d40ccdd47c4e0d
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Jul 21 20:51:23 2012 -0500

    0.7.1-8
    
    - skip stripping some compiler flags (undocumented)
    - %files: track files closer (lib soname in particular)
    - -devel: avoid dep on cmake
    - %check: +make test, pkgconfig check

 qjson.spec |   49 ++++++++++++++++++++++++++++---------------------
 1 files changed, 28 insertions(+), 21 deletions(-)
---
diff --git a/qjson.spec b/qjson.spec
index b3c22d9..6bf9060 100644
--- a/qjson.spec
+++ b/qjson.spec
@@ -1,6 +1,6 @@
 Name:           qjson
 Version:        0.7.1
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        A qt-based library that maps JSON data to QVariant objects
 
 Group:          Development/Languages
@@ -9,9 +9,9 @@ URL:            http://sourceforge.net/projects/qjson/
 Source0:        http://downloads.sourceforge.net/project/qjson/qjson/0.7.1/qjson-0.7.1.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  qt4-devel
 BuildRequires:  cmake >= 2.6
 BuildRequires:  doxygen
+BuildRequires:  pkgconfig(QtCore)
 
 %description
 JSON is a lightweight data-interchange format. It can represents integer, real
@@ -22,11 +22,7 @@ QVariant objects.
 %package devel
 Summary:  Development files for qjson
 Group:    Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: qt-devel >= 4.0
-Requires: pkgconfig
-Requires: cmake
-
+Requires: %{name}%{?_isa} = %{version}-%{release}
 %description devel
 The %{name}-devel package contains the libraries and header files required for
 developing applications that use %{name}.
@@ -37,26 +33,27 @@ developing applications that use %{name}.
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake} -DQJSON_BUILD_TESTS=1  -DCMAKE_MODULES_INSTALL_DIR=%{_datadir}/cmake/Modules/  ..
-cd %{_builddir}/%{buildsubdir}/doc
-doxygen
+%{cmake} \
+  -DQJSON_BUILD_TESTS:BOOL=ON \
+  -DCMAKE_MODULES_INSTALL_DIR:PATH=%{_datadir}/cmake/Modules/ \
+  ..
 popd
 
-sed -i -e 's/-fno-exceptions -fno-check-new -fno-common//' \
--e 's/-fno-threadsafe-statics -fvisibility=hidden -fvisibility-inlines-hidden//' \
--e 's/-ansi//' %{_target_platform}/src/CMakeFiles/qjson.dir/flags.make
-
 make %{?_smp_mflags} -C %{_target_platform}
 
+# build docs
+pushd doc
+doxygen
+popd
+
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
 %check
-LD_PRELOAD=%{_target_platform}/%{_lib}/libqjson.so \
-           %{_target_platform}/tests/testparser
-LD_PRELOAD=%{_target_platform}/%{_lib}/libqjson.so \
-           %{_target_platform}/tests/testserializer
+export PKG_CONFIG_PATH=%{buildroot}%{_datadir}/pkgconfig:%{buildroot}%{_libdir}/pkgconfig
+test "$(pkg-config --modversion QJson)" = "%{version}"
+make test -C %{_target_platform}
 
 %clean
 rm -rf %{buildroot}
@@ -67,17 +64,27 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc COPYING
-%{_libdir}/*.so.*
+%doc README
+%{_libdir}/libqjson.so.0*
 
 %files devel
 %defattr(-,root,root,-)
 %doc doc/html
 %{_includedir}/qjson/
-%{_libdir}/pkgconfig/*.pc
+%{_libdir}/libqjson.so
+%{_libdir}/pkgconfig/QJson.pc
+# own parent dir(s), avoid dep on cmake
+%dir %{_datadir}/cmake
+%dir %{_datadir}/cmake/Modules
 %{_datadir}/cmake/Modules/FindQJSON.cmake
-%{_libdir}/*.so
 
 %changelog
+* Sat Jul 21 2012 Rex Dieter <rdieter at fedoraproject.org> - 0.7.1-8
+- skip stripping some compiler flags (undocumented)
+- %%files: track files closer (lib soname in particular)
+- -devel: avoid dep on cmake 
+- %%check: +make test, pkgconfig check
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.1-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild