From 674112b1cb8eccab6ef843e67df7cf80a1a1b711770c662d94f8c20dd2b00c99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= Date: Wed, 13 Apr 2011 22:38:19 +0000 Subject: [PATCH] Accepting request 67238 from Virtualization OBS-URL: https://build.opensuse.org/request/show/67238 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libyajl?expand=0&rev=7 --- libyajl-lib_suffix.patch | 2 +- libyajl-rpmlintrc | 2 + libyajl.changes | 6 +++ libyajl.spec | 93 ++++++++++++++++++++++++---------------- 4 files changed, 64 insertions(+), 39 deletions(-) diff --git a/libyajl-lib_suffix.patch b/libyajl-lib_suffix.patch index cfcc1d9..44aae80 100644 --- a/libyajl-lib_suffix.patch +++ b/libyajl-lib_suffix.patch @@ -2,7 +2,7 @@ Index: src/CMakeLists.txt =================================================================== --- src/CMakeLists.txt.orig +++ src/CMakeLists.txt -@@ -42,7 +42,7 @@ SET (PUB_HDRS api/yajl_parse.h api/yajl_ +@@ -44,7 +44,7 @@ SET (PUB_HDRS api/yajl_parse.h api/yajl_ ADD_DEFINITIONS(-DYAJL_BUILD) # set up some paths diff --git a/libyajl-rpmlintrc b/libyajl-rpmlintrc index 632a467..2c4fbcc 100644 --- a/libyajl-rpmlintrc +++ b/libyajl-rpmlintrc @@ -1,2 +1,4 @@ addFilter("no-dependency-on libyajl/libyajl-libs/liblibyajl") addFilter("libyajl-devel-static..*: W: shlib-policy-missing-lib") +addFilter("no-manual-page-for-binary .*") +addFilter("macro-in-comment .*") diff --git a/libyajl.changes b/libyajl.changes index 8d26b79..30b9c87 100644 --- a/libyajl.changes +++ b/libyajl.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Apr 13 10:43:49 MDT 2011 - jfehlig@novell.com + +- Add filters to rpmlintrc +- spec file: Document githash usage in tarbal name + ------------------------------------------------------------------- Fri Apr 8 20:43:36 UTC 2011 - coolo@novell.com diff --git a/libyajl.spec b/libyajl.spec index 919cfd9..453bd56 100644 --- a/libyajl.spec +++ b/libyajl.spec @@ -15,47 +15,65 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +# norootforbuild +Name: libyajl +Version: 1.0.11 +# +# NB, upstream does not provide pre-built tar.gz downloads. Instead +# they make you use the 'on the fly' generated tar.gz from GITHub's +# web interface +# +# The Source for any version is obtained by a URL +# +# http://github.com/lloyd/yajl/tarball/1.0.7 +# +# Which causes a download of a archive named after +# the GIT hash corresponding to the version tag +# +# eg lloyd-yajl-45a1bdb.tar.gz +# +# NB even though the tar.gz is generated on the fly by GITHub it +# will always have identical md5sum +# +# So for new versions, update 'githash' to match the hash of the +# GIT tag associated with updated 'Version:' field just above +%global githash f4baae0 -Name: libyajl -Version: 1.0.11 -Release: 5 %define soname 1 -%define tag f4baae0 -Summary: Yet Another JSON Library -# http://download.github.com/lloyd-yajl-%{version}-0-g%{tag}.tar.gz -Source: lloyd-yajl-%{version}-0-g%{tag}.tar.bz2 -Source1: baselibs.conf -Patch1: libyajl-optflags.patch -Patch2: libyajl-lib_suffix.patch -Source99: %{name}-rpmlintrc -Url: http://lloyd.github.com/yajl/ -Group: System/Libraries -License: BSD3c -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: bison flex -BuildRequires: cmake -BuildRequires: gcc-c++ libstdc++-devel -BuildRequires: glibc-devel make +Release: 0 +Summary: Yet Another JSON Library +# http://download.github.com/lloyd-yajl-%{version}-0-g%{githash}.tar.gz +Source: lloyd-yajl-%{version}-0-g%{githash}.tar.bz2 +Source1: baselibs.conf +Patch1: libyajl-optflags.patch +Patch2: libyajl-lib_suffix.patch +Source99: %{name}-rpmlintrc +URL: http://lloyd.github.com/yajl/ +Group: System/Libraries +License: BSD3c +BuildRoot: %{_tmppath}/build-%{name}-%{version} +BuildRequires: bison flex +BuildRequires: cmake +BuildRequires: gcc-c++ libstdc++-devel +BuildRequires: make glibc-devel %description YAJL is a small event-driven (SAX-style) JSON parser written in ANSI C, and a small validating JSON generator. %package -n %{name}%{soname} - -Summary: Yet Another JSON Library -Group: System/Libraries +Summary: Yet Another JSON Library +Group: System/Libraries %description -n %{name}%{soname} YAJL is a small event-driven (SAX-style) JSON parser written in ANSI C, and a small validating JSON generator. %package -n %{name}-devel - -Summary: Yet Another JSON Library (Development Environment) -Group: Development/Libraries/C and C++ -Requires: %{name}%{soname} = %{version} +Summary: Yet Another JSON Library (Development Environment) +Group: Development/Libraries/C and C++ +Requires: %{name}%{soname} = %{version} %description -n %{name}-devel YAJL is a small event-driven (SAX-style) JSON parser written in ANSI C, and a @@ -65,10 +83,9 @@ This package provides the necessary environment for compiling and linking against %{name}. %package -n %{name}-devel-static - -Summary: Yet Another JSON Library (Static Library) -Group: Development/Libraries/C and C++ -Requires: %{name}-devel = %{version} +Summary: Yet Another JSON Library (Static Library) +Group: Development/Libraries/C and C++ +Requires: %{name}-devel = %{version} %description -n %{name}-devel-static YAJL is a small event-driven (SAX-style) JSON parser written in ANSI C, and a @@ -78,10 +95,9 @@ This package provides the necessary environment for linking statically against %{name}. %package -n yajl -License: BSD3c -Summary: Yet Another JSON Library Tools -Group: Productivity/Text/Utilities -Requires: %{name}%{soname} = %{version} +Summary: Yet Another JSON Library Tools +Group: Productivity/Text/Utilities +Requires: %{name}%{soname} = %{version} %description -n yajl YAJL is a small event-driven (SAX-style) JSON parser written in ANSI C, and a @@ -90,7 +106,7 @@ small validating JSON generator. This package provides a few command-line utilities for processing JSON files. %prep -%setup -q -n "lloyd-yajl-%{tag}" +%setup -q -n "lloyd-yajl-%{githash}" %patch1 %patch2 @@ -120,10 +136,10 @@ pushd build popd build %check -%__make test +cd test +./run_tests.sh %post -n %{name}%{soname} -p /sbin/ldconfig - %postun -n %{name}%{soname} -p /sbin/ldconfig %clean @@ -148,4 +164,5 @@ popd build %defattr(-,root,root) %{_bindir}/json_reformat %{_bindir}/json_verify -%changelog + +