[packages/qjson] - updated to 0.8.1, pl, cleanup

[qboosh]

commit d2c4d4e90433078eb04866b3eb0aa7a7453813c4
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Jan 1 11:52:41 2014 +0100

    - updated to 0.8.1, pl, cleanup

 qjson.spec | 50 ++++++++++++++++++++++++++------------------------
 1 file changed, 26 insertions(+), 24 deletions(-)
---
diff --git a/qjson.spec b/qjson.spec
index 361c041..499e5de 100644
--- a/qjson.spec
+++ b/qjson.spec
@@ -1,51 +1,52 @@
-#
 Summary:	Qt implementation of JSON
 Summary(pl.UTF-8):	Implementacja Qt formatu JSON
 Name:		qjson
-Version:	0.7.1
+Version:	0.8.1
 Release:	1
-License:	GPL
-Group:		Applications
-Source0:	http://downloads.sourceforge.net/project/qjson/qjson/%{version}/%{name}-%{version}.tar.bz2
-# Source0-md5:	5a833ad606c164ed8aa69f0873366ace
+License:	LGPL v2.1
+Group:		Libraries
+Source0:	http://downloads.sourceforge.net/qjson/%{name}-%{version}.tar.bz2
+# Source0-md5:	323fbac54a5a20c0b8fe45c1ced03e2d
 URL:		http://qjson.sourceforge.net/
-BuildRequires:	QtCore-devel
+BuildRequires:	QtCore-devel >= 4
 BuildRequires:	cmake >= 2.8.0
 BuildRequires:	libstdc++-devel
 BuildRequires:	pkgconfig
-BuildRequires:	qt4-build
-BuildRequires:	qt4-qmake
+BuildRequires:	qt4-build >= 4
+BuildRequires:	qt4-qmake >= 4
+BuildRequires:	rpmbuild(macros) >= 1.605
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-QJson is a qt-based library that maps JSON data to QVariant objects:
+QJson is a Qt-based library that maps JSON data to QVariant objects:
 JSON arrays will be mapped to QVariantList instances, while JSON
 objects will be mapped to QVariantMap.
 
+%description -l pl.UTF-8
+QJson to oparta na Qt biblioteka odwzorowująca dane JSON na obiekty
+QVariant: tablice JSON na instancje QVariantList, a obiekty JSON na
+QVariantMap.
+
 %package devel
-Summary:	Header files for qjson
-Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki qjson
+Summary:	Header files for QJson library
+Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki QJson
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+Requires:	QtCore-devel >= 4
 
 %description devel
-Header files for qjson.
+Header files for QJson library.
 
 %description devel -l pl.UTF-8
-Pliki nagłówkowe dla qjson.
+Pliki nagłówkowe biblioteki QJson.
 
 %prep
-%setup -q -n %{name}
+%setup -q
 
 %build
 install -d build
 cd build
-%cmake .. \
-	-DCMAKE_BUILD_TYPE=%{!?debug:Release}%{?debug:Debug} \
-	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
-%if "%{_lib}" == "lib64"
-	-DLIB_SUFFIX=64
-%endif
+%cmake ..
 
 %{__make}
 
@@ -63,12 +64,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
+%doc ChangeLog README.md
+%attr(755,root,root) %{_libdir}/libqjson.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libqjson.so.0
-%attr(755,root,root) %{_libdir}/libqjson.so.0.7.1
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libqjson.so
-%{_libdir}/pkgconfig/QJson.pc
+%{_pkgconfigdir}/QJson.pc
 %{_includedir}/qjson
-%{_datadir}/apps/cmake/modules/FindQJSON.cmake
+%{_libdir}/cmake/qjson
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/qjson.git/commitdiff/d2c4d4e90433078eb04866b3eb0aa7a7453813c4