From: Sam hartman <hartmans@painless-security.com>
Date: Wed, 17 Apr 2013 11:26:04 +0000 (+0100)
Subject: Merge commit 'v2.4' into HEAD
X-Git-Tag: v2.4-moonshot~1
X-Git-Url: http://www.project-moonshot.org/gitweb/?a=commitdiff_plain;h=292ff8f6da2fb3ad3686029946a6d77fdb11aa6f;hp=3279aacdeed2aac96741c02e2ddecbb5ae087ff8;p=jansson.git

Merge commit 'v2.4' into HEAD

Conflicts:
	Makefile.am
---

diff --git a/Makefile.am b/Makefile.am
index a40aa46..5b4fb98 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,5 @@
-EXTRA_DIST = CHANGES LICENSE README.rst win32
+EXTRA_DIST = CHANGES LICENSE README.rst win32 jansson.spec
+
 SUBDIRS = doc src test
 
 # "make distcheck" builds the dvi target, so use it to check that the
diff --git a/jansson.spec b/jansson.spec
new file mode 100644
index 0000000..37c8ec4
--- /dev/null
+++ b/jansson.spec
@@ -0,0 +1,57 @@
+Name:		jansson
+Version:	2.0
+Release:	1%{?dist}
+Summary:	Javascript Object Notation parsing library
+
+Group:		System Environment/Libraries
+License:	2-clause BSD
+URL:		http://www.digip.org/jansson/doc/
+Source0:	%{name}-%{version}.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
+
+
+%description
+A JSON parser.
+
+
+%prep
+%setup -q
+
+
+%build
+%configure
+make %{?_smp_mflags}
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+%package devel
+Summary: Development files for %{name}
+
+%description devel
+Development files for jansson.
+
+
+
+%files
+%defattr(-,root,root,-)
+%doc README.rst 
+%doc LICENSE
+%{_libdir}/*.so.*
+
+%files devel
+%defattr(-,root,root,-)
+%{_includedir}/*
+%exclude %{_libdir}/*.la
+%{_libdir}/*.so
+%{_libdir}/*.a
+%{_libdir}/pkgconfig/*
+
+
+
+%changelog