|
|
@@ -1,10 +1,10 @@
|
|
|
Name: yajl
|
|
|
Summary: Yet Another JSON Library (YAJL)
|
|
|
-Version: 2.0.1
|
|
|
-Release: 2%{?_dist_release}
|
|
|
+Version: 2.0.4
|
|
|
+Release: 1%{?_dist_release}
|
|
|
|
|
|
Group: System Environment/Libraries
|
|
|
-License: BSD
|
|
|
+License: ISC
|
|
|
URL: http://lloyd.github.com/yajl/
|
|
|
|
|
|
#
|
|
|
@@ -26,8 +26,10 @@ URL: http://lloyd.github.com/yajl/
|
|
|
#
|
|
|
# So for new versions, update 'githash' to match the hash of the
|
|
|
# GIT tag associated with updated 'Version:' field just above
|
|
|
-%global githash f4b2b1a
|
|
|
+%global githash fee1ebe
|
|
|
Source0: lloyd-%{name}-%{version}-0-g%{githash}.tar.gz
|
|
|
+Patch1: lloyd-%{name}-%{version}-pkgconfig-location.patch
|
|
|
+Patch2: lloyd-%{name}-%{version}-pkgconfig-includedir.patch
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
|
BuildRequires: cmake
|
|
|
@@ -52,6 +54,8 @@ necessary for developing against the YAJL library
|
|
|
|
|
|
%prep
|
|
|
%setup -q -n lloyd-%{name}-%{githash}
|
|
|
+%patch1 -p1
|
|
|
+%patch2 -p1
|
|
|
|
|
|
%build
|
|
|
# NB, we are not using upstream's 'configure'/'make'
|
|
|
@@ -64,13 +68,13 @@ make VERBOSE=1 %{?_smp_mflags}
|
|
|
|
|
|
|
|
|
%install
|
|
|
-rm -rf $RPM_BUILD_ROOT
|
|
|
+rm -rf %{buildroot}
|
|
|
cd build
|
|
|
-make install DESTDIR=$RPM_BUILD_ROOT
|
|
|
+make install DESTDIR=%{buildroot}
|
|
|
|
|
|
|
|
|
# No static libraries
|
|
|
-rm -f $RPM_BUILD_ROOT%{_libdir}/libyajl_s.a
|
|
|
+rm -f %{buildroot}%{_libdir}/libyajl_s.a
|
|
|
|
|
|
|
|
|
%check
|
|
|
@@ -78,7 +82,7 @@ cd test
|
|
|
./run_tests.sh
|
|
|
|
|
|
%clean
|
|
|
-rm -rf $RPM_BUILD_ROOT
|
|
|
+rm -rf %{buildroot}
|
|
|
|
|
|
%post -p /sbin/ldconfig
|
|
|
|
|
|
@@ -102,9 +106,15 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
%{_includedir}/yajl/yajl_tree.h
|
|
|
%{_includedir}/yajl/yajl_version.h
|
|
|
%{_libdir}/libyajl.so
|
|
|
+%{_libdir}/pkgconfig/yajl.pc
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Tue Oct 29 2013 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 2.0.4-1
|
|
|
+- updated to 2.0.4 release
|
|
|
+- Patch1 and Patch2 imported from Fedora
|
|
|
+- fix License tag: s/BSD/ISC/
|
|
|
+
|
|
|
* Wed Mar 28 2012 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 2.0.1-2
|
|
|
- rebuild
|
|
|
|
shaolin