Hello community, here is the log from the commit of package json-c for openSUSE:Factory checked in at 2014-01-10 21:19:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/json-c (Old) and /work/SRC/openSUSE:Factory/.json-c.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "json-c" Changes: -------- --- /work/SRC/openSUSE:Factory/json-c/json-c.changes 2013-03-10 10:54:08.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.json-c.new/json-c.changes 2014-01-10 21:19:42.000000000 +0100 @@ -1,0 +2,9 @@ +Mon Jan 6 13:09:45 UTC 2014 - [email protected] + +- Upgrade to 0.11 version: + - SONAME change. + - Fix provides and obsoletes accordingly + - symlink the .pc file to the oldname for software that needs it +- Remove json-c-fix-headers.patch integrated upstream + +------------------------------------------------------------------- Old: ---- json-c-0.10.tar.gz json-c-fix-headers.patch New: ---- json-c-0.11.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ json-c.spec ++++++ --- /var/tmp/diff_new_pack.jREv4l/_old 2014-01-10 21:19:43.000000000 +0100 +++ /var/tmp/diff_new_pack.jREv4l/_new 2014-01-10 21:19:43.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package json-c # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -16,22 +16,21 @@ # -%define libname libjson -%define libsoname %{libname}0 +%define libname libjson-c +%define libsoname %{libname}2 +%define oldlibname libjson Name: json-c Summary: JSON implementation in C License: MIT Group: System/Libraries -Version: 0.10 +Version: 0.11 Release: 0 Url: https://gitub.com/%{name}/%{name}/wiki -Source0: https://github.com/downloads/json-c/json-c/%{name}-%{version}.tar.gz +Source0: https://s3.amazonaws.com/json-c_releases/releases/%{name}-%{version}.tar.gz Source1: baselibs.conf -#Redone 0.10 patches +#Redone 0.11 patches Patch0: %{name}-lfs.patch -# taken from master -Patch1: %{name}-fix-headers.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libtool BuildRequires: pkg-config @@ -53,6 +52,8 @@ Summary: Development headers and libraries for json-c Group: Development/Libraries/C and C++ Requires: %{libsoname} = %{version} +Provides: %{oldlibname}-devel = %{version} +Obsoletes: %{oldlibname}-devel < %{version} %description -n %{libname}-devel This package includes header files and scripts needed for developers @@ -61,6 +62,8 @@ %package -n %{libname}-doc Summary: Documentation files Group: Documentation/Other +Provides: %{oldlibname}-doc = %{version} +Obsoletes: %{oldlibname}-doc < %{version} %if 0%{suse_version} >= 1120 BuildArch: noarch %endif @@ -72,11 +75,10 @@ %setup -q -n %{name}-%{version} # Redone patches %patch0 -p1 -%patch1 -p1 %build autoreconf -fiv -%configure --disable-static --with-pic +%configure --disable-static --with-pic --disable-oldname-compat %{__make} %{?_smp_mflags} %check @@ -85,6 +87,8 @@ %install %makeinstall DESTDIR=$RPM_BUILD_ROOT libdir=%{_libdir} mandir=%{_mandir} +# create a compatibilty pkg-config file for software needing it +(cd $RPM_BUILD_ROOT%{_libdir}/pkgconfig && ln -s json-c.pc json.pc) %post -n %{libsoname} -p /sbin/ldconfig @@ -97,7 +101,7 @@ %files -n %{libname}-devel %defattr(-,root,root) %{_libdir}/%{libname}.so -%{_includedir}/json +%{_includedir}/json-c %{_libdir}/pkgconfig/*.pc %files -n %{libname}-doc ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.jREv4l/_old 2014-01-10 21:19:43.000000000 +0100 +++ /var/tmp/diff_new_pack.jREv4l/_new 2014-01-10 21:19:43.000000000 +0100 @@ -1 +1 @@ -libjson0 +libjson-c2 ++++++ json-c-0.10.tar.gz -> json-c-0.11.tar.gz ++++++ ++++ 33904 lines of diff (skipped) ++++++ json-c-lfs.patch ++++++ --- /var/tmp/diff_new_pack.jREv4l/_old 2014-01-10 21:19:43.000000000 +0100 +++ /var/tmp/diff_new_pack.jREv4l/_new 2014-01-10 21:19:43.000000000 +0100 @@ -1,39 +1,27 @@ -diff --git a/Makefile.am.inc b/Makefile.am.inc -index b1ebce8..5886498 100644 ---- a/Makefile.am.inc -+++ b/Makefile.am.inc -@@ -1,2 +1,2 @@ --AM_CFLAGS = -Wall -Wwrite-strings -Werror -std=gnu99 -D_GNU_SOURCE -D_REENTRANT -+AM_CFLAGS = -Wall -Wwrite-strings -D_REENTRANT - -diff --git a/configure.in b/configure.in -index bcb9027..eadf4f9 100644 ---- a/configure.in -+++ b/configure.in -@@ -1,14 +1,17 @@ +--- a/configure.in 2013-04-01 04:30:51.000000000 +0200 ++++ b/configure.in 2014-01-06 13:14:22.551626326 +0100 +@@ -1,7 +1,7 @@ AC_PREREQ(2.52) # Process this file with autoconf to produce a configure script. --AC_INIT([json-c], 0.10, [[email protected]]) -+AC_INIT([json-c], [0.10], [[email protected]]) +-AC_INIT([json-c], 0.11, [[email protected]]) ++AC_INIT([json-c], [0.11], [[email protected]]) AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) - AC_PROG_MAKE_SET +@@ -16,6 +16,10 @@ + AM_CONDITIONAL(ENABLE_OLDNAME_COMPAT, [test "x${enable_oldname_compat}" != "xno"]) # Checks for programs. -- +AC_PROG_CC_STDC +AC_USE_SYSTEM_EXTENSIONS +AC_SYS_LARGEFILE -+ ++ + # Checks for libraries. - # Checks for header files. -diff --git a/linkhash.c b/linkhash.c -index ddedc12..7f9426d 100644 ---- a/linkhash.c -+++ b/linkhash.c +--- a/linkhash.c 2013-04-01 04:01:09.000000000 +0200 ++++ b/linkhash.c 2014-01-06 13:10:22.077585077 +0100 @@ -17,6 +17,7 @@ #include <stddef.h> #include <limits.h> @@ -42,28 +30,28 @@ #include "linkhash.h" void lh_abort(const char *msg, ...) -diff --git a/tests/test1.c b/tests/test1.c -index 9802eb1..71582c8 100644 ---- a/tests/test1.c -+++ b/tests/test1.c +--- a/Makefile.am.inc 2013-04-01 04:01:09.000000000 +0200 ++++ b/Makefile.am.inc 2014-01-06 13:12:32.199360740 +0100 +@@ -1,2 +1,2 @@ +-AM_CFLAGS = -Wall -Werror -Wextra -Wwrite-strings -Wno-unused-parameter -std=gnu99 -D_GNU_SOURCE -D_REENTRANT ++AM_CFLAGS = -Wall -Wextra -Wwrite-strings -Wno-unused-parameter -D_REENTRANT + +--- a/tests/test1.c 2013-04-01 04:01:09.000000000 +0200 ++++ b/tests/test1.c 2014-01-06 13:10:22.077585077 +0100 @@ -1,3 +1,4 @@ +#include "config.h" #include <stdio.h> #include <stdlib.h> #include <stddef.h> -diff --git a/tests/test2.c b/tests/test2.c -index 4a6b660..73afb5b 100644 ---- a/tests/test2.c -+++ b/tests/test2.c +--- a/tests/test2.c 2013-04-01 04:01:09.000000000 +0200 ++++ b/tests/test2.c 2014-01-06 13:10:22.077585077 +0100 @@ -1,3 +1,4 @@ +#include "config.h" #include <stdio.h> #include <stdlib.h> #include <stddef.h> -diff --git a/tests/test_printbuf.c b/tests/test_printbuf.c -index ee3f80d..c704e22 100644 ---- a/tests/test_printbuf.c -+++ b/tests/test_printbuf.c +--- a/tests/test_printbuf.c 2013-04-01 04:01:09.000000000 +0200 ++++ b/tests/test_printbuf.c 2014-01-06 13:10:22.078585055 +0100 @@ -1,3 +1,4 @@ +#include "config.h" #include <assert.h> -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
