commit json-c for openSUSE:Factory

23 Apr 2012

Hello community,

here is the log from the commit of package json-c for openSUSE:Factory checked in at 2012-04-23 16:11:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/json-c (Old)
 and      /work/SRC/openSUSE:Factory/.json-c.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "json-c", Maintainer is ""

Changes:
--------

--- /work/SRC/openSUSE:Factory/json-c/json-c.changes	2011-11-21 15:45:49.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.json-c.new/json-c.changes	2012-04-23 16:11:26.000000000 +0200
@@ -1,0 +2,9 @@
+Sun Apr 22 00:34:03 UTC 2012 - crrodriguez@opensuse.org
+
+- Fix LFS support in x86.
+- Do not build with -Werror
+- Remove "la" files
+- tune up autotools scripts as well ensure config.h is included
+  everywhere
+
+-------------------------------------------------------------------

New:
----
  jsonc-lfs.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ json-c.spec ++++++
--- /var/tmp/diff_new_pack.sPQUHU/_old	2012-04-23 16:11:28.000000000 +0200
+++ /var/tmp/diff_new_pack.sPQUHU/_new	2012-04-23 16:11:28.000000000 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package json-c
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -21,19 +21,21 @@
 
 Name:           json-c
 Summary:        JSON implementation in C
-Version:        0.9
-Release:        3
 License:        MIT
 Group:          System/Libraries
-URL:            http://oss.metaparadigm.com/%{name}
+Version:        0.9
+Release:        0
+Url:            http://oss.metaparadigm.com/%{name}
 Source0:        http://oss.metaparadigm.com/json-c/json-c-0.9.tar.gz
 Source1:        baselibs.conf
 Patch0:         %{name}-0.9-base.patch
 Patch1:         %{name}-0.9-json_object_from_file.patch
 Patch2:         %{name}-0.9-json_tokener.patch
 Patch3:         %{name}-0.9-linkhash.patch
+Patch4:         jsonc-lfs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  libtool pkg-config
+BuildRequires:  libtool
+BuildRequires:  pkg-config
 
 %description
 JSON-C implements a reference counting object model that allows you to
@@ -73,14 +75,16 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
-autoreconf -fi
+autoreconf -fiv
 %configure --disable-static --with-pic
 %{__make} %{?_smp_mflags}
 
 %check
 %{__make} %{?_smp_mflags} check
+rm -rf %{buildroot}%{_libdir}/*.la
 
 %install
 make DESTDIR=$RPM_BUILD_ROOT install libdir=%{_libdir} mandir=%{_mandir}  
@@ -96,7 +100,6 @@
 %files -n %{libname}-devel
 %defattr(-,root,root)
 %{_libdir}/%{libname}.so
-%{_libdir}/%{libname}.*a
 %{_includedir}/json
 %{_libdir}/pkgconfig/*.pc
 

++++++ jsonc-lfs.patch ++++++
Index: json-c-0.9/configure.in
===================================================================
--- json-c-0.9.orig/configure.in
+++ json-c-0.9/configure.in
@@ -6,6 +6,9 @@ AC_INIT([json-c], [0.9], [michael@metapa
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 
 # Checks for programs.
+AC_PROG_CC_STDC
+AC_USE_SYSTEM_EXTENSIONS
+AC_SYS_LARGEFILE
 
 # Checks for libraries.
 
@@ -25,7 +28,7 @@ AC_FUNC_MALLOC
 AC_FUNC_REALLOC
 AC_CHECK_FUNCS(strndup strerror vsnprintf vasprintf open vsyslog strncasecmp)
 
-AM_PROG_LIBTOOL
+LT_INIT([disable-static pic-only])
 
 AC_OUTPUT([
 Makefile
Index: json-c-0.9/Makefile.am
===================================================================
--- json-c-0.9.orig/Makefile.am
+++ json-c-0.9/Makefile.am
@@ -1,4 +1,4 @@
-AM_CFLAGS = -Wall -Wwrite-strings -Werror -std=gnu99 -D_GNU_SOURCE -D_REENTRANT
+AM_CFLAGS = -Wall -Wwrite-strings -D_REENTRANT
 
 EXTRA_DIST = README.html README-WIN32.html config.h.win32 doc
 
@@ -20,7 +20,7 @@ libjsoninclude_HEADERS = \
         json_object_private.h \
 	json_tokener.h
 
-libjson_la_LDFLAGS = -version-info 0:1:0
+libjson_la_LDFLAGS = -no-undefined -version-info 0:1:0
 
 libjson_la_SOURCES = \
 	arraylist.c \
Index: json-c-0.9/linkhash.c
===================================================================
--- json-c-0.9.orig/linkhash.c
+++ json-c-0.9/linkhash.c
@@ -9,6 +9,7 @@
  *
  */
 
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
Index: json-c-0.9/test1.c
===================================================================
--- json-c-0.9.orig/test1.c
+++ json-c-0.9/test1.c
@@ -1,3 +1,4 @@
+#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>
Index: json-c-0.9/test2.c
===================================================================
--- json-c-0.9.orig/test2.c
+++ json-c-0.9/test2.c
@@ -1,3 +1,4 @@
+#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>
Index: json-c-0.9/test3.c
===================================================================
--- json-c-0.9.orig/test3.c
+++ json-c-0.9/test3.c
@@ -1,3 +1,4 @@
+#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠hilbert.suse.de

tags

participants (1)