[packages/yajl] - updated to 2.0.4 (note: new soname) - added pc patch (install pkgconfig file in proper dir)

qboosh qboosh at pld-linux.org
Mon Jan 7 17:55:33 CET 2013


commit d0214badc601548e8f7146bd0eb49cf930c73de5
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Jan 7 17:55:38 2013 +0100

    - updated to 2.0.4 (note: new soname)
    - added pc patch (install pkgconfig file in proper dir)

 yajl-pc.patch |  9 +++++++++
 yajl.spec     | 13 ++++++++-----
 2 files changed, 17 insertions(+), 5 deletions(-)
---
diff --git a/yajl.spec b/yajl.spec
index 5539aa6..ee3c5ca 100644
--- a/yajl.spec
+++ b/yajl.spec
@@ -1,12 +1,13 @@
 Summary:	Yet Another JSON Library
 Summary(pl.UTF-8):	Yet Another JSON Library - jeszcze jedna biblioteka JSON
 Name:		yajl
-Version:	1.0.11
+Version:	2.0.4
 Release:	1
 License:	BSD
 Group:		Libraries
-Source0:	http://github.com/lloyd/yajl/tarball/1.0.11/%{name}-%{version}.tar.gz
-# Source0-md5:	5b60f4d59b3b1fb42d7808d08460fb12
+Source0:	http://github.com/lloyd/yajl/tarball/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5:	ee6208e697c43dcccf798ce80d370379
+Patch0:		%{name}-pc.patch
 URL:		http://lloyd.github.com/yajl/
 BuildRequires:	cmake >= 2.6
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -44,7 +45,8 @@ Static YAJL library.
 Statyczna biblioteka YAJL.
 
 %prep
-%setup -q -n lloyd-yajl-f4baae0
+%setup -q -n lloyd-yajl-fee1ebe
+%patch0 -p1
 
 %build
 install -d build
@@ -78,12 +80,13 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/json_reformat
 %attr(755,root,root) %{_bindir}/json_verify
 %attr(755,root,root) %{_libdir}/libyajl.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libyajl.so.1
+%attr(755,root,root) %ghost %{_libdir}/libyajl.so.2
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libyajl.so
 %{_includedir}/yajl
+%{_pkgconfigdir}/yajl.pc
 
 %files static
 %defattr(644,root,root,755)
diff --git a/yajl-pc.patch b/yajl-pc.patch
new file mode 100644
index 0000000..3d62d44
--- /dev/null
+++ b/yajl-pc.patch
@@ -0,0 +1,9 @@
+--- lloyd-yajl-fee1ebe/src/CMakeLists.txt.orig	2011-12-20 01:23:22.000000000 +0100
++++ lloyd-yajl-fee1ebe/src/CMakeLists.txt	2013-01-07 17:52:20.962604523 +0100
+@@ -82,5 +82,5 @@
+   INSTALL(TARGETS yajl_s ARCHIVE DESTINATION lib${LIB_SUFFIX})
+   INSTALL(FILES ${PUB_HDRS} DESTINATION include/yajl)
+   INSTALL(FILES ${incDir}/yajl_version.h DESTINATION include/yajl)
+-  INSTALL(FILES ${shareDir}/yajl.pc DESTINATION share/pkgconfig)
++  INSTALL(FILES ${shareDir}/yajl.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig)
+ ENDIF()
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/yajl.git/commitdiff/d0214badc601548e8f7146bd0eb49cf930c73de5



More information about the pld-cvs-commit mailing list