[packages/yajl] up to 2.1.0
glen
glen at pld-linux.org
Sat Jan 10 19:45:25 CET 2015
commit fcff2c30f9b0179b74aa299f3755a67589280bae
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Sat Jan 10 20:40:27 2015 +0200
up to 2.1.0
yajl-pc.patch | 17 ++++++++---------
yajl.spec | 11 +++++------
2 files changed, 13 insertions(+), 15 deletions(-)
---
diff --git a/yajl.spec b/yajl.spec
index 5b61799..a6adb23 100644
--- a/yajl.spec
+++ b/yajl.spec
@@ -1,14 +1,14 @@
Summary: Yet Another JSON Library
Summary(pl.UTF-8): Yet Another JSON Library - jeszcze jedna biblioteka JSON
Name: yajl
-Version: 2.0.4
+Version: 2.1.0
Release: 1
License: BSD
Group: Libraries
-Source0: http://github.com/lloyd/yajl/tarball/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: ee6208e697c43dcccf798ce80d370379
+Source0: https://github.com/lloyd/yajl/archive/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: 6887e0ed7479d2549761a4d284d3ecb0
Patch0: %{name}-pc.patch
-URL: http://lloyd.github.com/yajl/
+URL: http://lloyd.github.io/yajl/
BuildRequires: cmake >= 2.6
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -45,7 +45,7 @@ Static YAJL library.
Statyczna biblioteka YAJL.
%prep
-%setup -q -n lloyd-yajl-fee1ebe
+%setup -q
%patch0 -p1
%build
@@ -61,7 +61,6 @@ cd build
%install
rm -rf $RPM_BUILD_ROOT
-
%{__make} -C build install \
DESTDIR=$RPM_BUILD_ROOT
diff --git a/yajl-pc.patch b/yajl-pc.patch
index 3d62d44..a95265c 100644
--- a/yajl-pc.patch
+++ b/yajl-pc.patch
@@ -1,9 +1,8 @@
---- 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()
+--- yajl-2.1.0/src/CMakeLists.txt~ 2014-03-19 06:58:29.000000000 +0200
++++ yajl-2.1.0/src/CMakeLists.txt 2015-01-10 20:39:12.261521060 +0200
+@@ -84,4 +84,4 @@
+ 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)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/yajl.git/commitdiff/5c13d88b9f909a4119e88b6876a40074765ee0b9
More information about the pld-cvs-commit
mailing list